Remove empty (null) message metadata entries. #49

Author: Rustam Aliyev

itests/src/test/java/com/elasticinbox/itests/RestV2IT.java

@@ -341,6 +341,7 @@ public void messageAddListViewDeletePurgeTest() throws IOException
 			body(messageId + ".from.address", hasItems(containsString("@"))).
 			body(messageId + ".to.address", hasItems(containsString("@"))).
 			body(messageId + ".subject", is(notNullValue())).
+			body(messageId, not(hasKey("bcc"))).
 		when().
 			get(REST_PATH + "/mailbox/label/{labelId}?metadata=true&count=2&start={messageId}");
 

modules/common/src/test/java/com/elasticinbox/common/utils/JSONUtilsTest.java

@@ -0,0 +1,25 @@
+package com.elasticinbox.common.utils;
+
+import static org.junit.Assert.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+public class JSONUtilsTest
+{
+	@Test
+	public void testNullValueSerialization()
+	{
+		Map<String, String> testMap = new HashMap<String, String>();
+		testMap.put("key1", "val1");
+		testMap.put("key2", null);
+		
+		byte[] bytes = JSONUtils.fromObject(testMap);
+		String result = new String(bytes);
+		
+		assertFalse(result.contains("null"));
+	}
+
+}

modules/core/src/main/java/com/elasticinbox/core/model/Message.java

@@ -37,6 +37,8 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 import com.elasticinbox.core.blob.BlobURI;
 
@@ -52,6 +54,7 @@
  * @see {@link MimePart}
  * @see <a href="http://tools.ietf.org/html/rfc3501#section-6.4.5">RFC3501</a>
  */
+@JsonInclude(Include.NON_NULL)
 public class Message
 {
 	private AddressList from;