fix nfe (=NumberFormatException) when using inner-border on a mj-column (#10)

Co-authored-by: Peter Caluwaert <peter.caluwaert.ext@bosa.fgov.be>

Author: caluwaertp

data/bug-mj-column-inner-border.mjml

@@ -0,0 +1,9 @@
+<mjml>
+    <mj-body>
+        <mj-section>
+            <mj-column padding="25px" border="5px solid green" inner-border="5px solid red" >
+                <mj-text>hello</mj-text>
+            </mj-column>
+        </mj-section>
+    </mj-body>
+</mjml>

src/main/java/ch/digitalfondue/mjml4j/BaseComponent.java

@@ -2,7 +2,11 @@
 
 import org.w3c.dom.Element;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import static ch.digitalfondue.mjml4j.Utils.equalsIgnoreCase;
@@ -247,7 +251,7 @@ CssBoxModel getBoxModel() {
 
             var paddings = getShorthandAttributeValue("padding", "right") + getShorthandAttributeValue("padding", "left");
 
-            var borders = getShorthandBorderValue("right") + getShorthandBorderValue("left");
+            var borders = getShorthandBorderValue("border", "right") + getShorthandBorderValue("border", "left");
 
 
             if (hasParentComponent() && getParent() instanceof BodyComponent parent) {
@@ -271,9 +275,9 @@ CssBoxModel getBoxModel() {
 
         private static final Pattern PATTERN_SHORTHAND_BORDER_VALUE = Pattern.compile("(?:(?:^| )([0-9]+))");
 
-        double getShorthandBorderValue(String direction) {
-            var mjAttributeDirection = getAttribute("border-" + direction);
-            var mjAttribute = getAttribute("border");
+        double getShorthandBorderValue(String attributeName, String direction) {
+            var mjAttributeDirection = getAttribute(attributeName + "-" + direction);
+            var mjAttribute = getAttribute(attributeName);
 
             if (!Utils.isNullOrWhiteSpace(mjAttributeDirection)) {
                 return CssUnitParser.parse(mjAttributeDirection).value();

src/main/java/ch/digitalfondue/mjml4j/MjmlComponentColumn.java

@@ -38,8 +38,8 @@ private int getSectionColumnCount() {
     CssBoxModel getBoxModel() {
 
         var paddings = getShorthandAttributeValue("padding", "right") + getShorthandAttributeValue("padding", "left");
-        var borders = getShorthandBorderValue("right") + getShorthandBorderValue("left");
-        var innerBorders = getShorthandAttributeValue("inner-border", "left") + getShorthandAttributeValue("inner-border", "right");
+        var borders = getShorthandBorderValue("border", "right") + getShorthandBorderValue("border", "left");
+        var innerBorders = getShorthandBorderValue("inner-border", "left") + getShorthandBorderValue("inner-border", "right");
         var allPaddings = paddings + borders + innerBorders;
 
         if (hasParentComponent()) {

src/test/java/ch/digitalfondue/mjml4j/BugTests.java

@@ -5,10 +5,15 @@
 import static ch.digitalfondue.mjml4j.Helpers.testTemplate;
 
 class BugTests {
-    
+
     // see https://github.com/digitalfondue/mjml4j/issues/7
     @Test
     void checkMjSocialNpe() {
         testTemplate("bug-mj-social");
     }
+
+    @Test
+    void checkMjColumnInnerBorderNfe() {
+        testTemplate("bug-mj-column-inner-border");
+    }
 }