Store Message-ID and Reply-To mail headers in metadata store. Fixes #49.

Author: Rustam Aliyev

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

@@ -340,6 +340,8 @@ public void messageAddListViewDeletePurgeTest() throws IOException
 			body(messageId + ".size", equalTo((int) fileSizeA)).
 			body(messageId + ".from.address", hasItems(containsString("@"))).
 			body(messageId + ".to.address", hasItems(containsString("@"))).
+			body(messageId + ".replyTo.address", hasItems(containsString("@"))).
+			body(messageId + ".messageId", containsString("@elasticinbox")).
 			body(messageId + ".subject", is(notNullValue())).
 			body(messageId, not(hasKey("bcc"))).
 		when().
@@ -358,6 +360,8 @@ public void messageAddListViewDeletePurgeTest() throws IOException
 			body("message.size", equalTo((int) fileSizeA)).
 			body("message.from.address", hasItems(containsString("@"))).
 			body("message.to.address", hasItems(containsString("@"))).
+			body("message.replyTo.address", hasItems(containsString("@"))).
+			body("message.messageId", containsString("@elasticinbox")).
 			body("message.subject", is(notNullValue())).
 			body("message.htmlBody", is(notNullValue())).
 			body("message.textBody", is(nullValue())).

itests/src/test/resources/01-headers-utf8.eml

@@ -13,6 +13,7 @@ From: =?utf-8?B?UsO8c3TJmW0gxo9saXlldg==?= <[email protected]>
 Cc: =?utf-8?B?RsmZcmlkIE3JmW1tyZlkb3Y=?= <[email protected]>, =?utf-8?Q?Makaka_B=C9=99hram?= <[email protected]>
 Subject: =?utf-8?B?VVRGOCBUZXN0IMO8w6fDvG4gbcO2dnp1IGZpa2lsyZnFn23JmW1pxZ/JmW0=?=
 Message-ID: <3917ea5a412bc64e0c1f04d81ac2e5c6@elasticinbox>
+Reply-To: <[email protected]>
 X-Mailer: Makaka Mailer v.2.2.8
 MIME-Version: 1.0
 Content-Type: multipart/alternative;

modules/core/src/main/java/com/elasticinbox/core/cassandra/persistence/Marshaller.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2012 Optimax Software Ltd.
+ * Copyright (c) 2011-2014 Optimax Software Ltd.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,8 @@ public final class Marshaller
 	public final static String CN_TO = "to";
 	public final static String CN_CC = "cc";
 	public final static String CN_BCC = "bcc";
+	public final static String CN_REPLY_TO = "replyto";
+	public final static String CN_MESSAGE_ID = "mid";
 	public final static String CN_SUBJECT = "subject";
 	public final static String CN_HTML_BODY = "html";
 	public final static String CN_PLAIN_BODY = "plain";
@@ -93,15 +95,17 @@ protected static Message unmarshall(
 
 		for (HColumn<String, byte[]> c : columns)
 		{
-			if( (c != null) && (c.getValue() != null)) {
-
+			if (c != null && c.getValue() != null)
+			{
 				// map columns to Message object
 				if (c.getName().equals(CN_DATE)) {
 					message.setDate(dateSe.fromBytes(c.getValue()));
 				} else if (c.getName().equals(CN_SIZE)) {
 					message.setSize(longSe.fromBytes(c.getValue()));
 				} else if (c.getName().equals(CN_SUBJECT)) {
 					message.setSubject(strSe.fromBytes(c.getValue()));
+				} else if (c.getName().equals(CN_MESSAGE_ID)) {
+					message.setMessageId(strSe.fromBytes(c.getValue()));
 				} else if (c.getName().equals(CN_FROM)) {
 					message.setFrom(unserializeAddress(c.getValue()));
 				} else if (c.getName().equals(CN_TO)) {
@@ -110,6 +114,8 @@ protected static Message unmarshall(
 					message.setCc(unserializeAddress(c.getValue()));
 				} else if (c.getName().equals(CN_BCC)) {
 					message.setBcc(unserializeAddress(c.getValue()));
+				} else if (c.getName().equals(CN_REPLY_TO)) {
+					message.setReplyTo(unserializeAddress(c.getValue()));
 				} else if (c.getName().equals(CN_BRI)) {
 					message.setLocation(URI.create(
 							strSe.fromBytes(c.getValue())));
@@ -182,33 +188,42 @@ protected static List<HColumn<String, byte[]>> marshall(final Message m)
 			columns.put(CN_BCC, serializeAddress(m.getBcc()));
 		}
 
+		if (m.getReplyTo() != null) {
+			columns.put(CN_REPLY_TO, serializeAddress(m.getReplyTo()));
+		}
+
+		if (m.getMessageId() != null) {
+			columns.put(CN_MESSAGE_ID, m.getMessageId());
+		}
+
 		if (m.getSubject() != null) {
 			columns.put(CN_SUBJECT, m.getSubject());
 		}
 
 		if (m.getLocation() != null) {
 			columns.put(CN_BRI, m.getLocation().toString());
-
 		}
 
 		if (m.getParts() != null) {
 			columns.put(CN_PARTS, JSONUtils.fromObject(m.getParts()));
 		}
 
 		// add markers
-		if (!m.getMarkers().isEmpty()) {
-			for (Marker marker : m.getMarkers()) {
-				String cn = new StringBuilder(CN_MARKER_PREFIX)
-						.append(marker.toInt()).toString();
+		if (!m.getMarkers().isEmpty())
+		{
+			for (Marker marker : m.getMarkers())
+			{
+				String cn = CN_MARKER_PREFIX + marker.toInt();
 				columns.put(cn, new byte[0]);
 			}
 		}
 
 		// add labels
-		if (!m.getLabels().isEmpty()) {
-			for (Integer labelId : m.getLabels()) {
-				String cn = new StringBuilder(CN_LABEL_PREFIX)
-						.append(labelId).toString();
+		if (!m.getLabels().isEmpty())
+		{
+			for (Integer labelId : m.getLabels())
+			{
+				String cn = CN_LABEL_PREFIX + labelId;
 				columns.put(cn, new byte[0]);
 			}
 		}
@@ -242,7 +257,8 @@ private static byte[] serializeAddress(final AddressList addresses)
 	{
 		List<String[]> result = new ArrayList<String[]>();
 
-		for(Address address : addresses) {
+		for (Address address : addresses)
+		{
 			result.add(new String[]{
 					(address.getName() == null ? "" : address.getName()),
 					(address.getAddress() == null ? "" : address.getAddress()) });
@@ -264,7 +280,7 @@ private static AddressList unserializeAddress(final byte[] val)
 		List<List<String>> addresses = null;
 		addresses = JSONUtils.toObject(val, addresses);
 
-		for(List<String> address : addresses) {
+		for (List<String> address : addresses) {
 			result.add(new Address(address.get(0), address.get(1)));
 		}
 
@@ -284,7 +300,8 @@ protected static List<HColumn<String, byte[]>> mapToHColumns(
 		List<HColumn<String, byte[]>> columns = 
 			new ArrayList<HColumn<String, byte[]>>(map.size());
 
-		for (Map.Entry<String, Object> a : map.entrySet()) {
+		for (Map.Entry<String, Object> a : map.entrySet())
+		{
 			columns.add(createColumn(a.getKey(), SerializerTypeInferer
 					.getSerializer(a.getValue()).toBytes(a.getValue()),
 					strSe, byteSe));

modules/core/src/main/java/com/elasticinbox/core/message/MimeParser.java

@@ -127,6 +127,7 @@ public void parse(InputStream in) throws IOException, MimeParserException
 			this.message.setBcc(getAddressList(mimeMessage.getRecipients(RecipientType.BCC)));
 			this.message.setSubject(mimeMessage.getSubject());
 			this.message.setMessageId(mimeMessage.getMessageID());
+			this.message.setReplyTo(getAddressList(mimeMessage.getReplyTo()));
 			this.message.setDate(mimeMessage.getSentDate());
 			//this.message.setSize((long) mimeMessage.getSize());
 

modules/core/src/main/java/com/elasticinbox/core/message/id/MessageIdBuilder.java

@@ -48,7 +48,7 @@ public final class MessageIdBuilder
 	/**
 	 * Set <code>date</code> header from email
 	 * 
-	 * @param messageId
+	 * @param date
 	 * @return
 	 */
 	public MessageIdBuilder setSentDate(Date date) {