Adds support for element style stroke widths (re: https://github.com/structurizr/structurizr/issues/124).

Author: simonbrowndotje

build.gradle

@@ -8,7 +8,7 @@ subprojects { proj ->
 
     description = 'Structurizr'
     group = 'com.structurizr'
-    version = '1.15.3'
+    version = '1.16.0'
 
     repositories {
         mavenCentral()

docs/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.16.0 (unreleased to Maven Central)
+
+- Adds support for element style stroke widths.
+
 ## 1.15.3 (11th October 2022)
 
 - Updates some transitive dependencies.

structurizr-core/src/com/structurizr/view/ElementStyle.java

@@ -26,6 +26,9 @@ public final class ElementStyle extends AbstractStyle {
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     private String stroke;
 
+    @JsonInclude(value = JsonInclude.Include.NON_NULL)
+    private Integer strokeWidth;
+
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     private String color;
 
@@ -164,6 +167,30 @@ public ElementStyle stroke(String color) {
         return this;
     }
 
+    /**
+     * Gets the stroke width, in pixels, between 1 and 10.
+     *
+     * @return  the stroke width
+     */
+    public Integer getStrokeWidth() {
+        return strokeWidth;
+    }
+
+    public void setStrokeWidth(Integer strokeWidth) {
+        if (strokeWidth == null) {
+            this.strokeWidth = null;
+        } else if (strokeWidth < 1) {
+            this.strokeWidth = 1;
+        } else {
+            this.strokeWidth = Math.min(10, strokeWidth);
+        }
+    }
+
+    public ElementStyle strokeWidth(Integer strokeWidth) {
+        setStrokeWidth(strokeWidth);
+        return this;
+    }
+
     /**
      * Gets the foreground (text) colour of the element, as a HTML RGB hex string (e.g. #123456).
      *
@@ -352,6 +379,10 @@ void copyFrom(ElementStyle elementStyle) {
             this.setStroke(elementStyle.getStroke());
         }
 
+        if (elementStyle.getStrokeWidth() != null) {
+            this.setStrokeWidth(elementStyle.getStrokeWidth());
+        }
+
         if (!StringUtils.isNullOrEmpty(elementStyle.getColor())) {
             this.setColor(elementStyle.getColor());
         }

structurizr-core/test/unit/com/structurizr/view/ElementStyleTests.java

@@ -294,4 +294,40 @@ void setProperties_SetsTheProperties_WhenANonEmptyMapIsSpecified() {
         assertEquals("value", style.getProperties().get("name"));
     }
 
+    @Test
+    void setStrokeWidth_WhenNullIsSpecified() {
+        ElementStyle style = new ElementStyle();
+        style.setStrokeWidth(10);
+        style.setStrokeWidth(null);
+        assertNull(style.getStrokeWidth());
+    }
+
+    @Test
+    void setStrokeWidth_WhenANegativeIntegerIsSpecified() {
+        ElementStyle style = new ElementStyle();
+        style.setStrokeWidth(-1);
+        assertEquals(1, style.getStrokeWidth());
+    }
+
+    @Test
+    void setStrokeWidth_WhenZeroIsSpecified() {
+        ElementStyle style = new ElementStyle();
+        style.setStrokeWidth(0);
+        assertEquals(1, style.getStrokeWidth());
+    }
+
+    @Test
+    void setStrokeWidth_WhenAPositiveIntegerIsSpecified() {
+        ElementStyle style = new ElementStyle();
+        style.setStrokeWidth(10);
+        assertEquals(10, style.getStrokeWidth());
+    }
+
+    @Test
+    void setStrokeWidth_WhenAPositiveIntegerOver10IsSpecified() {
+        ElementStyle style = new ElementStyle();
+        style.setStrokeWidth(20);
+        assertEquals(10, style.getStrokeWidth());
+    }
+
 }

structurizr-core/test/unit/com/structurizr/view/StylesTests.java

@@ -22,6 +22,7 @@ void findElementStyle_ReturnsTheDefaultStyle_WhenPassedNull() {
         assertNull(style.getIcon());
         assertEquals(Border.Solid, style.getBorder());
         assertEquals("#9a9a9a", style.getStroke());
+        assertNull(style.getStrokeWidth());
         assertEquals(Integer.valueOf(100), style.getOpacity());
         assertEquals(true, style.getMetadata());
         assertEquals(true, style.getDescription());
@@ -40,6 +41,7 @@ void findElementStyle_ReturnsTheDefaultStyle_WhenNoStylesAreDefined() {
         assertNull(style.getIcon());
         assertEquals(Border.Solid, style.getBorder());
         assertEquals("#9a9a9a", style.getStroke());
+        assertNull(style.getStrokeWidth());
         assertEquals(Integer.valueOf(100), style.getOpacity());
         assertEquals(true, style.getMetadata());
         assertEquals(true, style.getDescription());
@@ -51,7 +53,7 @@ void findElementStyle_ReturnsTheCorrectStyle_WhenStylesAreDefined() {
         element.addTags("Some Tag");
 
         styles.addElementStyle(Tags.SOFTWARE_SYSTEM).background("#ff0000").color("#ffffff");
-        styles.addElementStyle("Some Tag").color("#0000ff").stroke("#00ff00").shape(Shape.RoundedBox).width(123).height(456);
+        styles.addElementStyle("Some Tag").color("#0000ff").stroke("#00ff00").strokeWidth(2).shape(Shape.RoundedBox).width(123).height(456);
 
         ElementStyle style = styles.findElementStyle(element);
         assertEquals(Integer.valueOf(123), style.getWidth());
@@ -63,6 +65,7 @@ void findElementStyle_ReturnsTheCorrectStyle_WhenStylesAreDefined() {
         assertNull(style.getIcon());
         assertEquals(Border.Solid, style.getBorder());
         assertEquals("#00ff00", style.getStroke());
+        assertEquals(2, style.getStrokeWidth());
         assertEquals(Integer.valueOf(100), style.getOpacity());
         assertEquals(true, style.getMetadata());
         assertEquals(true, style.getDescription());
@@ -89,6 +92,7 @@ void findElementStyle_ReturnsTheCorrectStyleForAnElementInstance_WhenStylesAreDe
         assertNull(style.getIcon());
         assertEquals(Border.Solid, style.getBorder());
         assertEquals("#00ff00", style.getStroke());
+        assertNull(style.getStrokeWidth());
         assertEquals(Integer.valueOf(100), style.getOpacity());
         assertEquals(true, style.getMetadata());
         assertEquals(true, style.getDescription());