Keep whitespace in plain text email messagebodys

superelchi · superelchi · commit 5b9720be7f5b · 2015-02-05T16:01:35.000+01:00
Fixes OfficeDev#198
diff --git a/src/main/java/microsoft/exchange/webservices/data/EwsXmlReader.java b/src/main/java/microsoft/exchange/webservices/data/EwsXmlReader.java
@@ -147,6 +147,17 @@ private void internalReadElement(String namespacePrefix, String localName,
    */
   public void read() throws ServiceXmlDeserializationException,
       XMLStreamException {
+    read(false);
+  }
+
+  /**
+   * Reads the specified node type.
+   *
+   * @throws ServiceXmlDeserializationException  the service xml deserialization exception
+   * @throws javax.xml.stream.XMLStreamException the xML stream exception
+   */
+  private void read(boolean keepWhiteSpace) throws ServiceXmlDeserializationException,
+      XMLStreamException {
     // The caller to EwsXmlReader.Read expects
     // that there's another node to
     // read. Throw an exception if not true.
@@ -158,9 +169,10 @@ public void read() throws ServiceXmlDeserializationException,
         XMLEvent event = xmlReader.nextEvent();
         if (event.getEventType() == XMLStreamConstants.CHARACTERS) {
           Characters characters = (Characters) event;
-          if (characters.isIgnorableWhiteSpace()
-              || characters.isWhiteSpace()) {
-            continue;
+          if (!keepWhiteSpace)
+            if (characters.isIgnorableWhiteSpace()
+                || characters.isWhiteSpace()) {
+              continue;
           }
         }
         this.prevEvent = this.presentEvent;
@@ -389,18 +401,31 @@ public <T> T readElementValue(Class<T> cls) throws Exception {
    */
   public String readValue() throws XMLStreamException,
       ServiceXmlDeserializationException {
+    return readValue(false);
+  }
+  /**
+   * Reads the value. Should return content element or text node as string
+   * Present event must be START ELEMENT. After executing this function
+   * Present event will be set on END ELEMENT
+   *
+   * @return String
+   * @throws javax.xml.stream.XMLStreamException the xML stream exception
+   * @throws ServiceXmlDeserializationException  the service xml deserialization exception
+   */
+  public String readValue(boolean keepWhiteSpace) throws XMLStreamException,
+      ServiceXmlDeserializationException {
     String errMsg = String.format("Could not read value from %s.",
         XmlNodeType.getString(this.presentEvent.getEventType()));
     if (this.presentEvent.isStartElement()) {
       // Go to next event and check for Characters event
-      this.read();
+      this.read(keepWhiteSpace);
       if (this.presentEvent.isCharacters()) {
         StringBuffer elementValue = new StringBuffer();
         do {
           if (this.getNodeType().nodeType == XmlNodeType.CHARACTERS) {
             Characters characters = (Characters) this.presentEvent;
-            if (!characters.isIgnorableWhiteSpace()
-                && !characters.isWhiteSpace()) {
+            if (keepWhiteSpace || (!characters.isIgnorableWhiteSpace()
+                && !characters.isWhiteSpace())) {
               if (characters.getData().length() != 0) {
                 elementValue.append(characters.getData());
               }
@@ -427,11 +452,11 @@ public String readValue() throws XMLStreamException,
       StringBuffer data = new StringBuffer(this.presentEvent
           .asCharacters().getData());
       do {
-        this.read();
+        this.read(keepWhiteSpace);
         if (this.getNodeType().nodeType == XmlNodeType.CHARACTERS) {
           Characters characters = (Characters) this.presentEvent;
-          if (!characters.isIgnorableWhiteSpace()
-              && !characters.isWhiteSpace()) {
+          if (keepWhiteSpace || (!characters.isIgnorableWhiteSpace()
+              && !characters.isWhiteSpace())) {
             if (characters.getData().length() != 0) {
               data.append(characters.getData());
             }
diff --git a/src/main/java/microsoft/exchange/webservices/data/MessageBody.java b/src/main/java/microsoft/exchange/webservices/data/MessageBody.java
@@ -100,7 +100,8 @@ protected void readAttributesFromXml(EwsServiceXmlReader reader)
   @Override
   protected void readTextValueFromXml(EwsServiceXmlReader reader)
       throws XMLStreamException, ServiceXmlDeserializationException {
-    this.text = reader.readValue();
+    boolean keepWhiteSpace = this.getBodyType() == BodyType.Text;
+    this.text = reader.readValue(keepWhiteSpace);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ protected void readAttributesFromXml(EwsServiceXmlReader reader)`
`100`	`100`	`@Override`
`101`	`101`	`protected void readTextValueFromXml(EwsServiceXmlReader reader)`
`102`	`102`	`throws XMLStreamException, ServiceXmlDeserializationException {`
`103`		`- this.text = reader.readValue();`
	`103`	`+ boolean keepWhiteSpace = this.getBodyType() == BodyType.Text;`
	`104`	`+ this.text = reader.readValue(keepWhiteSpace);`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`/**`