Read optional attributes of comments

2 files changed, 48 insertions, 4 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
index 1740ec2..1b6a171 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
@@ -28,8 +28,17 @@ public class CommentXmlReader {
             .map(children -> new Comment(
                 commentId,
                 children,
-                Optional.empty(),
-                Optional.empty()
+                readOptionalAttribute(element, "w:author"),
+                readOptionalAttribute(element, "w:initials")
             ));
     }
+
+    private Optional<String> readOptionalAttribute(XmlElement element, String name) {
+        String value = element.getAttributeOrNone(name).orElse("").trim();
+        if (value.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(value);
+        }
+    }
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
index 6abf086..0464866 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
@@ -42,10 +42,27 @@ public class CommentXmlTests {
 
     @Test
     public void whenOptionalAttributesOfCommentAreMissingThenTheyAreReadAsNone() {
-        List<XmlNode> body = list(element("w:p"));
         CommentXmlReader reader = new CommentXmlReader(bodyReader());
         InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
-            element("w:comment", map("w:id", "1"), body)
+            element("w:comment", map("w:id", "1"))
+        )));
+        assertThat(
+            result,
+            isInternalSuccess(contains(
+                allOf(
+                    isA(Comment.class),
+                    hasProperty("authorName", equalTo(Optional.empty())),
+                    hasProperty("authorInitials", equalTo(Optional.empty()))
+                )
+            ))
+        );
+    }
+
+    @Test
+    public void whenOptionalAttributesOfCommentAreBlankThenTheyAreReadAsNone() {
+        CommentXmlReader reader = new CommentXmlReader(bodyReader());
+        InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
+            element("w:comment", map("w:id", "1", "w:author", " ", "w:initials", " "))
         )));
         assertThat(
             result,
@@ -58,4 +75,22 @@ public class CommentXmlTests {
             ))
         );
     }
+
+    @Test
+    public void whenOptionalAttributesOfCommentAreNotBlankThenTheyAreRead() {
+        CommentXmlReader reader = new CommentXmlReader(bodyReader());
+        InternalResult<List<Comment>> result = reader.readElement(element("w:comments", list(
+            element("w:comment", map("w:id", "1", "w:author", "The Piemaker", "w:initials", "TP"))
+        )));
+        assertThat(
+            result,
+            isInternalSuccess(contains(
+                allOf(
+                    isA(Comment.class),
+                    hasProperty("authorName", equalTo(Optional.of("The Piemaker"))),
+                    hasProperty("authorInitials", equalTo(Optional.of("TP")))
+                )
+            ))
+        );
+    }
 }