Fixed NPE in case of media images

Author: s2team

src/main/java/de/votesapp/client/GroupMessage.java

@@ -1,11 +1,14 @@
 package de.votesapp.client;
 
 import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -22,7 +25,7 @@
 @NoArgsConstructor
 public class GroupMessage {
 
-	public static GroupMessage of(final String groupId, final String text) {
+	public static GroupMessage of(final String groupId, @NotNull final String text) {
 		return new GroupMessage(null, escapeDot(groupId), null, null, text);
 	}
 
@@ -33,9 +36,9 @@ public static GroupMessage of( //
 			@JsonProperty("_from") final String groupId, //
 			@JsonProperty("participant") final String senderPhone, //
 			@JsonProperty(value = "notify", required = false) final String senderName, //
-			@JsonProperty("body") final String text) {
+			@JsonProperty(value = "body", required = false) final String text) {
 
-		return new GroupMessage(escapeDot(id), escapeDot(groupId), escapeDot(senderPhone), senderName, text);
+		return new GroupMessage(escapeDot(id), escapeDot(groupId), escapeDot(senderPhone), senderName, text == null ? "" : text);
 	}
 
 	private static String escapeDot(final String txt) {
@@ -50,7 +53,7 @@ private static String escapeDot(final String txt) {
 		// return mappingMongoConverter;
 		// }
 		// But then we need to have one. Now it's autoconfigured
-		return txt.replaceAll("\\.", "_");
+		return StringUtils.replace(txt, ".", "_");
 	}
 
 	/**