fixed some null handling

CHANGELOG.md

@@ -57,3 +57,7 @@ Mail.using(configuration)
 ## 1.4.0
 
 * New [low level functions](https://github.com/sargue/mailgun/wiki/Mail-content-using-content-helpers#low-level-html) on the HTML builder.
+
+## 1.4.1
+
+* Fixed some null handling

README.md

@@ -29,15 +29,15 @@ Add the dependency to your project:
 
 #### Gradle
 
-`compile 'net.sargue:mailgun:1.4.0'`
+`compile 'net.sargue:mailgun:1.4.1'`
 
 #### Maven
 
 ```xml
 <dependency>
     <groupId>net.sargue</groupId>
     <artifactId>mailgun</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 </dependency>
 ```
 

build.gradle

@@ -8,7 +8,7 @@ apply plugin: 'maven'
 
 group 'net.sargue'
 archivesBaseName = 'mailgun'
-version '1.4.0'
+version '1.4.1'
 
 sourceCompatibility = 1.7
 

src/main/java/net/sargue/mailgun/content/Builder.java

@@ -129,12 +129,20 @@ public Builder end() {
      * @return this builder
      */
     public Builder text(String s) {
+        // null values add no text
+        if (s == null) {
+            return this;
+        }
         html.a(Util.escapeXml(s));
         text.a(s);
         return this;
     }
 
     public <T> Builder text(T value) {
+        // null values add no text
+        if (value == null) {
+            return this;
+        }
         //noinspection unchecked
         return text(value,
                     configuration.converter((Class<T>) value.getClass()));

src/test/java/net/sargue/mailgun/test/HTMLContentTests.java

@@ -433,4 +433,24 @@ public void nestedTag() {
                      postHTML,
                      body.html());
     }
+
+
+    @Test
+    public void nullStringHandling() {
+        Body body = Body.builder()
+                        .text(null)
+                        .build();
+        assertEquals(preHTML + postHTML, body.html());
+        assertEquals(postText, body.text());
+    }
+
+    @Test
+    public void nullObjectHandling() {
+        Object o = null;
+        Body body = Body.builder()
+                        .text(o)
+                        .build();
+        assertEquals(preHTML + postHTML, body.html());
+        assertEquals(postText, body.text());
+    }
 }