Improve managing <messageML> tag (#858)

Author: symphony-enrico

symphony-bdk-core/src/main/java/com/symphony/bdk/core/service/message/model/Message.java

@@ -206,8 +206,14 @@ public Message build() {
       }
 
       // check if content is encapsulated in <messageML/> node
-      boolean isAlreadyWrapped = this.content.startsWith("<messageML") && this.content.endsWith("</messageML>");
-      if (!isAlreadyWrapped) {
+      String trimmedContent = this.content.trim();
+      boolean hasStartTag = trimmedContent.startsWith("<messageML");
+      boolean hasEndTag = trimmedContent.endsWith("</messageML>");
+      if (hasStartTag != hasEndTag) {
+        throw new MessageCreationException(
+            "Malformed <messageML> tag. Missing " + (hasStartTag ? "closing" : "opening") + " tag");
+      }
+      if (!hasStartTag) {
         log.trace("Processing content to prefix with <messageML> and suffix with </messageML>");
         if (Boolean.TRUE.equals(this.beta)) {
           this.content = "<messageML beta=\"true\">" + this.content + "</messageML>";
@@ -219,6 +225,9 @@ public Message build() {
         throw new MessageCreationException(
             "Cannot set beta=true when content is already wrapped with <messageML> without the beta attribute. "
             + "Either remove the wrapper or include beta=\"true\" in your messageML tag.");
+      } else {
+        // content is already wrapped, but we can trim if needed
+        this.content = trimmedContent;
       }
 
       // check done below because it will rejected by the agent otherwise
@@ -229,4 +238,15 @@ public Message build() {
       return new Message(this);
     }
   }
+
+  private boolean isAlreadyWrapped(String content) {
+    boolean hasStart = content.startsWith("<messageML>");
+    boolean hasEnd = content.endsWith("</messageML>");
+
+    if (hasStart != hasEnd) {
+      throw new IllegalStateException("Malformed MessageML: missing " + (hasStart ? "closing" : "opening") + " tag.");
+    }
+
+    return hasStart; // Since they are equal, if hasStart is true, both are true.
+  }
 }

symphony-bdk-core/src/test/java/com/symphony/bdk/core/service/message/model/MessageTest.java

@@ -31,6 +31,23 @@ void checkMessageMLNotAppendedToContentIfSet() {
     assertEquals("<messageML>hello</messageML>", Message.builder().content("<messageML>hello</messageML>").build().getContent());
   }
 
+  @Test
+  void checkMessageMLNotAppendedToContentIfSetWithSpaces() {
+    assertEquals("<messageML>hello</messageML>", Message.builder().content(" <messageML>hello</messageML> ").build().getContent());
+  }
+
+  @Test
+  void checkMessageMLWithoutClosingTagThrowsException() {
+    MessageCreationException exception = assertThrows(MessageCreationException.class, Message.builder().content("<messageML>hello")::build);
+    assertEquals("Malformed <messageML> tag. Missing closing tag", exception.getMessage());
+  }
+
+  @Test
+  void checkMessageMLWithoutOpeningTagThrowsException() {
+    MessageCreationException exception = assertThrows(MessageCreationException.class, Message.builder().content("hello</messageML>")::build);
+    assertEquals("Malformed <messageML> tag. Missing opening tag", exception.getMessage());
+  }
+
   @Test
   void checkMessageSilentValueIfSet() {
     assertEquals(Boolean.FALSE, Message.builder().content("<messageML>hello</messageML>").silent(Boolean.FALSE).build().getSilent());