Merge pull request OfficeDev#202 from superelchi/master

serious6 · serious6 · commit 7b4331a46cc2 · 2015-02-12T07:27:45.000+01:00
Keep whitespace in plain text email messagebodys
diff --git a/src/main/java/microsoft/exchange/webservices/data/EwsXmlReader.java b/src/main/java/microsoft/exchange/webservices/data/EwsXmlReader.java
@@ -159,6 +159,19 @@ private void internalReadElement(String namespacePrefix, String localName,
    */
   public void read() throws ServiceXmlDeserializationException,
       XMLStreamException {
+    read(false);
+  }
+
+  /**
+   * Reads the specified node type.
+   * 
+   * @param keepWhiteSpace Do not remove whitespace characters if true
+   *
+   * @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.
@@ -170,9 +183,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;
@@ -401,18 +415,32 @@ 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
+   *
+   * @param keepWhiteSpace Do not remove whitespace characters if true
+   * @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());
               }
@@ -439,11 +467,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
@@ -22,13 +22,18 @@
  */
 package microsoft.exchange.webservices.data;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import javax.xml.stream.XMLStreamException;
 
 /**
  * Represents the body of a message.
  */
 public final class MessageBody extends ComplexProperty {
 
+  private static final Log log = LogFactory.getLog(MessageBody.class);
+
   /**
    * The body type.
    */
@@ -112,7 +117,15 @@ protected void readAttributesFromXml(EwsServiceXmlReader reader)
   @Override
   protected void readTextValueFromXml(EwsServiceXmlReader reader)
       throws XMLStreamException, ServiceXmlDeserializationException {
-    this.text = reader.readValue();
+    if (log.isDebugEnabled()) {
+       log.debug("Reading text value from XML. BodyType = " + this.getBodyType() +
+          ", keepWhiteSpace = " +
+          ((this.getBodyType() == BodyType.Text) ? "true." : "false."));
+    }
+    this.text = reader.readValue(this.getBodyType() == BodyType.Text);
+    if (log.isDebugEnabled()) {
+       log.debug("Text value read:\n---\n" + this.text + "\n---");
+    }
   }
 
   /**
