From e10e0e7aa3f094883a50856eee5d7b024b2a4d2f Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 8 Sep 2015 15:07:40 -0400
Subject: [PATCH 01/19] Add checkstyle as part of the Maven build to ensure
 coding standards compliance

---
 pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pom.xml b/pom.xml
index 54c06edaa..e54c32396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
         <javadoc.doclint.param/>
 
         <!--  Dependencies [BUILD]:  -->
+        <maven-checkstyle-plugin.version>2.16</maven-checkstyle-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
@@ -99,6 +100,34 @@
                 <javadoc.doclint.param>-Xdoclint:none</javadoc.doclint.param>
             </properties>
         </profile>
+        <profile>
+            <!-- maven-checkstyle-plugin required Java 7 or later -->
+            <id>java-7-or-later-profile</id>
+            <activation>
+                <jdk>[1.7,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${maven-checkstyle-plugin.version}</version>
+                    <configuration>
+                    <failsOnError>true</failsOnError>
+                        <configLocation>google_checks.xml</configLocation>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>checkstyle</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release-sign-artifacts</id>
             <activation>

From a4ce02170e79f54a71d2cc4d0311af936eba5b00 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 8 Sep 2015 16:00:42 -0400
Subject: [PATCH 02/19] Use IOUtils.closeQuietly instead of reimplementing that
 method in each location

Add a dependency on commons-io and use it appropriately.
---
 pom.xml                                       |  7 ++++++
 .../data/core/ExchangeServiceBase.java        | 16 +++-----------
 .../request/HangingServiceRequestBase.java    | 22 ++++---------------
 .../data/core/request/HttpWebRequest.java     |  3 ++-
 .../data/core/request/ServiceRequestBase.java |  8 ++-----
 .../data/property/complex/FileAttachment.java |  8 +++----
 6 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54c06edaa..784d0f192 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
         <commons-logging.version>1.2</commons-logging.version>
         <joda-time.version>2.8</joda-time.version>
         <commons-lang3.version>3.4</commons-lang3.version>
+        <commons-io.version>2.4</commons-io.version>
         <!--  Dependencies [TEST]:  -->
         <junit.version>4.12</junit.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
@@ -175,6 +176,12 @@
             <version>${httpcore.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
index befc421f9..bb01858b4 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
@@ -56,6 +56,7 @@
 import microsoft.exchange.webservices.data.misc.EwsTraceListener;
 import microsoft.exchange.webservices.data.misc.ITraceListener;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.AuthenticationStrategy;
@@ -264,19 +265,8 @@ private void initializeHttpContext() {
 
   @Override
   public void close() {
-    try {
-      httpClient.close();
-    } catch (IOException e) {
-      LOG.debug(e);
-    }
-
-    if (httpPoolingClient != null) {
-      try {
-        httpPoolingClient.close();
-      } catch (IOException e) {
-        LOG.debug(e);
-      }
-    }
+    IOUtils.closeQuietly(httpClient);
+    IOUtils.closeQuietly(httpPoolingClient);
   }
 
   // Event handlers
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/HangingServiceRequestBase.java b/src/main/java/microsoft/exchange/webservices/data/core/request/HangingServiceRequestBase.java
index 4ecc9a92f..04db10e43 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/request/HangingServiceRequestBase.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/request/HangingServiceRequestBase.java
@@ -36,6 +36,7 @@
 import microsoft.exchange.webservices.data.core.exception.xml.XmlException;
 import microsoft.exchange.webservices.data.misc.HangingTraceStream;
 import microsoft.exchange.webservices.data.security.XmlNodeType;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -241,14 +242,7 @@ private void parseResponses() {
       // Stream is closed, so disconnect.
       this.disconnect(HangingRequestDisconnectReason.Exception, ex);
     } finally {
-      if (responseCopy != null) {
-        try {
-          responseCopy.close();
-          responseCopy = null;
-        } catch (Exception ex) {
-          LOG.error(ex);
-        }
-      }
+      IOUtils.closeQuietly(responseCopy);
     }
   }
 
@@ -272,11 +266,7 @@ private void setIsConnected(boolean value) {
    */
   public void disconnect() {
     synchronized (this) {
-      try {
-        this.response.close();
-      } catch (IOException e) {
-        // Ignore exception on disconnection
-      }
+      IOUtils.closeQuietly(this.response);
       this.disconnect(HangingRequestDisconnectReason.UserInitiated, null);
     }
   }
@@ -289,11 +279,7 @@ public void disconnect() {
    */
   public void disconnect(HangingRequestDisconnectReason reason, Exception exception) {
     if (this.isConnected()) {
-      try {
-        this.response.close();
-      } catch (IOException e) {
-        // Ignore exception on disconnection
-      }
+      IOUtils.closeQuietly(this.response);
       this.internalOnDisconnect(reason, exception);
     }
   }
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/HttpWebRequest.java b/src/main/java/microsoft/exchange/webservices/data/core/request/HttpWebRequest.java
index edc2aef10..f8abec964 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/request/HttpWebRequest.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/request/HttpWebRequest.java
@@ -27,6 +27,7 @@
 import microsoft.exchange.webservices.data.core.WebProxy;
 import microsoft.exchange.webservices.data.core.exception.http.EWSHttpException;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,7 +37,7 @@
 /**
  * The Class HttpWebRequest.
  */
-public abstract class HttpWebRequest {
+public abstract class HttpWebRequest implements Closeable {
 
   /**
    * The url.
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java b/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
index 073c2c2a1..101d6b104 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
@@ -46,6 +46,7 @@
 import microsoft.exchange.webservices.data.core.exception.xml.XmlException;
 import microsoft.exchange.webservices.data.misc.SoapFaultDetails;
 import microsoft.exchange.webservices.data.security.XmlNodeType;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -644,12 +645,7 @@ protected HttpWebRequest validateAndEmitRequest() throws Exception {
         throw new ServiceRequestException(String.format("The request failed. %s", e.getMessage()), e);
       }
     } catch (Exception e) {
-      try {
-        request.close();
-      } catch (Exception e2) {
-        // Ignore exception while closing the request.
-      }
-
+      IOUtils.closeQuietly(request);
       throw e;
     }
   }
diff --git a/src/main/java/microsoft/exchange/webservices/data/property/complex/FileAttachment.java b/src/main/java/microsoft/exchange/webservices/data/property/complex/FileAttachment.java
index 5b6555c50..de3567f36 100644
--- a/src/main/java/microsoft/exchange/webservices/data/property/complex/FileAttachment.java
+++ b/src/main/java/microsoft/exchange/webservices/data/property/complex/FileAttachment.java
@@ -33,6 +33,8 @@
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceValidationException;
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceVersionException;
 
+import org.apache.commons.io.IOUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -234,11 +236,7 @@ public void load(String fileName) throws Exception {
       this.load();
       this.loadToStream.flush();
     } finally {
-      try {
-        this.loadToStream.close();
-      } catch(Exception e) {
-        //ignore exception on close
-      }
+      IOUtils.closeQuietly(this.loadToStream);
       this.loadToStream = null;
     }
 

From 757bd4d3f1966811e876b4b36a9c5a89c7f01413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Behrens?= <andre.behrens@haw-hamburg.de>
Date: Sun, 8 Nov 2015 10:37:48 +0100
Subject: [PATCH 03/19] increment version to 2.1

Version needs to be incremented for development on next snapshot release. [ci skip]
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b150d8daf..39b7a60a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     <groupId>com.microsoft.ews-java-api</groupId>
     <artifactId>ews-java-api</artifactId>
     
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
 
     <name>Exchange Web Services Java API</name>
     <description>Exchange Web Services (EWS) Java API</description>

From afc45d09136882bdd85ca9f189ce24a05548eb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Behrens?= <andre.behrens@haw-hamburg.de>
Date: Sun, 8 Nov 2015 11:21:04 +0100
Subject: [PATCH 04/19] Update readme.md

extract documentation for gradle from readme.md and put it in the wiki
---
 readme.md | 51 ++-------------------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/readme.md b/readme.md
index dbc64dfe9..c8378a1d6 100644
--- a/readme.md
+++ b/readme.md
@@ -7,55 +7,8 @@ Please see the [Getting Started Guide](https://github.com/OfficeDev/ews-java-api
 ## Using the library
 Prebuilt JARs are available in the Maven Central repository, which are easy to use with your project. Note that currently, no stable version is available yet, only snapshots in the snapshots repository.
 
-### Maven
-If you want to use a snapshot build, add the Maven Central snapshots repository to your project's `pom.xml`. If you want to use a stable build (not available yet), you should skip this step.
-```xml
-<project>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <name>Sonatype OSS Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-</project>
-```
-
-And finally, add the dependency to your project's `pom.xml`.
-```xml
-<project>
-  <dependencies>
-    <dependency>
-      <groupId>com.microsoft.ews-java-api</groupId>
-      <artifactId>ews-java-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
-```
-
-### Gradle
-If you want to use a snapshot build, add the Maven Central snapshots repository to your project's `build.gradle`. If you want to use a stable build (not available yet), you should skip this step.
-```groovy
-repositories {
-    maven {
-        url 'https://oss.sonatype.org/content/repositories/snapshots/'
-    }
-}
-```
-
-And finally, add the dependency to your project's `build.gradle`.
-```groovy
-dependencies {
-    compile 'com.microsoft.ews-java-api:ews-java-api:2.0-SNAPSHOT'
-}
-```
+### Maven / Gradle
+For Documentation on how to use _ews-java-api_ with maven or gradle please refer to [this section in our wiki](https://github.com/OfficeDev/ews-java-api/wiki#maven--gradle-integration). 
 
 ### Building from source
 To build a JAR from the source yourself, please see [this page](https://github.com/OfficeDev/ews-java-api/wiki/Building-EWS-JAVA-API).

From ae3dc3e4ccd9345db30bb8e595e51f016e97d24a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Behrens?= <andre.behrens@haw-hamburg.de>
Date: Sun, 8 Nov 2015 17:07:57 +0100
Subject: [PATCH 05/19] enable codecov.io support

this PR enables our ci-server to evaluate code coverage and submit the
resulting data to codecov.io
---
 .travis.yml |  1 +
 pom.xml     | 21 +++++++++++++++++++++
 readme.md   |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f9a9cf069..8baa6e401 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,3 +52,4 @@ before_install:
 
 after_success:
   - ./deploy_snapshot.sh
+  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/pom.xml b/pom.xml
index 9ec56a577..e303359bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
         <versions-maven-plugin.version>2.2</versions-maven-plugin.version>
         <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
         <maven-surefire-report-plugin.version>2.18.1</maven-surefire-report-plugin.version>
+        <jacoco-maven-plugin.version>0.7.5.201505241946</jacoco-maven-plugin.version>
         <!--  Dependencies [COMPILE]:  -->
         <httpclient.version>4.4.1</httpclient.version>
         <httpcore.version>4.4.1</httpcore.version>
@@ -368,6 +369,26 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- Deployment / build plugins END -->
         </plugins>
         <!-- Used to bump all of the various core plugins up to Maven current.
diff --git a/readme.md b/readme.md
index dbc64dfe9..1c06654a1 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/OfficeDev/ews-java-api.svg)](https://travis-ci.org/OfficeDev/ews-java-api) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/OfficeDev/ews-java-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/OfficeDev/ews-java-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  
+[![Build Status](https://travis-ci.org/OfficeDev/ews-java-api.svg)](https://travis-ci.org/OfficeDev/ews-java-api) [![codecov.io](https://codecov.io/github/OfficeDev/ews-java-api/coverage.svg?branch=master)](https://codecov.io/github/OfficeDev/ews-java-api?branch=master)
 
 # EWS JAVA API
 

From aaf233fa1b054beb73d97242ff639403cdce3e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Behrens?= <andre.behrens@haw-hamburg.de>
Date: Thu, 12 Nov 2015 08:42:40 +0100
Subject: [PATCH 06/19] Update deploy_snapshot.sh

disable checkstyle for deployment run (checkstyle was invoked before)
---
 deploy_snapshot.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy_snapshot.sh b/deploy_snapshot.sh
index b5bdc543a..09f13b0c5 100644
--- a/deploy_snapshot.sh
+++ b/deploy_snapshot.sh
@@ -36,10 +36,10 @@ else
 	# deploy
 	if [ -z "${GPG_PASSPHRASE+xxx}" ]; then
 	    echo "[INFO] Deploying unsigned artifacts"
-            mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true
+            mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true
         else
             echo "[INFO] Deploying signed artifacts"
-            mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE
+            mvn clean deploy --settings="$HOME/.m2/settings.xml" -Dmaven.test.skip=true -Dcheckstyle.skip=true -Dgpg.passphrase=$GPG_PASSPHRASE
         fi
 	# clean up
 	rm -f $HOME/.m2/settings.xml

From ed9c51ef989a127143f817c7acc31e1b162660c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Behrens?= <andre.behrens@haw-hamburg.de>
Date: Thu, 12 Nov 2015 10:14:15 +0100
Subject: [PATCH 07/19] Update .travis.yml

upload codecov before trying to deploy the snapshot release. This will enable us to have all build-jobs coverage reports being uploaded.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8baa6e401..063139190 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,5 +51,5 @@ before_install:
   - chmod +x ./deploy_snapshot.sh
 
 after_success:
+  - bash <(curl -s https://codecov.io/bash)
   - ./deploy_snapshot.sh
-  - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

From 54a06c4e7f469efbfe8a45ddf3410798cd5834e9 Mon Sep 17 00:00:00 2001
From: two <two@silbergrau.com>
Date: Mon, 23 Nov 2015 22:07:15 +0100
Subject: [PATCH 08/19] Fixed parsing of AlternateMailboxCollection, added
 documentation and unit tests

---
 .../data/autodiscover/AlternateMailbox.java   | 93 ++++++++++++++-----
 .../AlternateMailboxCollection.java           |  2 +-
 .../data/core/XmlElementNames.java            | 93 +++++++++----------
 .../AlternateMailboxCollectionTest.java       | 87 +++++++++++++++++
 4 files changed, 202 insertions(+), 73 deletions(-)
 create mode 100644 src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java

diff --git a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java
index 082bced0b..d85adf965 100644
--- a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java
+++ b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailbox.java
@@ -53,11 +53,22 @@ public final class AlternateMailbox {
    */
   private String server;
 
+  /**
+   * The SMTP address of alternate mailbox. It is only set if it is available
+   * for the given type. E.g. type 'Delegate' has one type 'Archive' not.
+   */
+  private String smtpAddress;
+
+
+  /**
+   * The SMTP address of the owner of this alternate mailbox.
+   */
+  private String ownerSmtpAddress;
+
   /**
    * Initializes a new instance of the AlternateMailbox class.
    */
-  private AlternateMailbox() {
-  }
+  private AlternateMailbox() {}
 
   /**
    * PLoads AlternateMailbox instance from XML.
@@ -66,28 +77,31 @@ private AlternateMailbox() {
    * @return AlternateMailbox
    * @throws Exception the exception
    */
-  public static AlternateMailbox loadFromXml(EwsXmlReader reader)
+  public static AlternateMailbox loadFromXml(final EwsXmlReader reader)
       throws Exception {
-    AlternateMailbox altMailbox = new AlternateMailbox();
+    final AlternateMailbox altMailbox = new AlternateMailbox();
 
     do {
       reader.read();
 
       if (reader.getNodeType().getNodeType() == XmlNodeType.START_ELEMENT) {
-        if (reader.getLocalName()
-            .equalsIgnoreCase(XmlElementNames.Type)) {
+        if (reader.getLocalName().equalsIgnoreCase(XmlElementNames.Type)) {
           altMailbox.setType(reader.readElementValue(String.class));
-        } else if (reader.getLocalName().equalsIgnoreCase(
-            XmlElementNames.DisplayName)) {
-          altMailbox.setDisplayName(reader
-              .readElementValue(String.class));
-        } else if (reader.getLocalName().equalsIgnoreCase(
-            XmlElementNames.LegacyDN)) {
-          altMailbox.setLegacyDN(reader
-              .readElementValue(String.class));
-        } else if (reader.getLocalName().equalsIgnoreCase(
-            XmlElementNames.Server)) {
+        } else if (reader.getLocalName()
+            .equalsIgnoreCase(XmlElementNames.DisplayName)) {
+          altMailbox.setDisplayName(reader.readElementValue(String.class));
+        } else if (reader.getLocalName()
+            .equalsIgnoreCase(XmlElementNames.LegacyDN)) {
+          altMailbox.setLegacyDN(reader.readElementValue(String.class));
+        } else
+          if (reader.getLocalName().equalsIgnoreCase(XmlElementNames.Server)) {
           altMailbox.setServer(reader.readElementValue(String.class));
+        } else if (reader.getLocalName()
+            .equalsIgnoreCase(XmlElementNames.SmtpAddress)) {
+          altMailbox.setSmtpAddress(reader.readElementValue(String.class));
+        } else if (reader.getLocalName()
+            .equalsIgnoreCase(XmlElementNames.OwnerSmtpAddress)) {
+          altMailbox.setOwnerSmtpAddress(reader.readElementValue(String.class));
         }
       }
     } while (!reader.isEndElement(XmlNamespace.Autodiscover,
@@ -110,7 +124,7 @@ public String getType() {
    *
    * @param type the new type
    */
-  protected void setType(String type) {
+  protected void setType(final String type) {
     this.type = type;
   }
 
@@ -128,7 +142,7 @@ public String getDisplayName() {
    *
    * @param displayName the new display name
    */
-  protected void setDisplayName(String displayName) {
+  protected void setDisplayName(final String displayName) {
     this.displayName = displayName;
   }
 
@@ -146,7 +160,7 @@ public String getLegacyDN() {
    *
    * @param legacyDN the new legacy dn
    */
-  protected void setLegacyDN(String legacyDN) {
+  protected void setLegacyDN(final String legacyDN) {
     this.legacyDN = legacyDN;
   }
 
@@ -162,10 +176,47 @@ public String getServer() {
   /**
    * Sets the server.
    *
-   * @param server the new server
+   * @param server the new server.
    */
-  protected void setServer(String server) {
+  protected void setServer(final String server) {
     this.server = server;
   }
 
+  /**
+   * Gets the SMTP address.
+   *
+   * @return the SMTP address if available for the mailbox type otherwise null
+   *         is returned.
+   */
+  public String getSmtpAddress() {
+    return smtpAddress;
+  }
+
+  /**
+   * Sets the SMTP address.
+   *
+   * @param smtpAddress the new SMTP address.
+   */
+  protected void setSmtpAddress(final String smtpAddress) {
+    this.smtpAddress = smtpAddress;
+  }
+
+  /**
+   * Gets the owner SMTP address.
+   *
+   * @return the SMTP address of the owner of this mailbox.
+   */
+  public String getOwnerSmtpAddress() {
+    return ownerSmtpAddress;
+  }
+
+  /**
+   * Sets the owner SMTP address.
+   *
+   * @param ownerSmtpAdress the new owner SMTP address
+   */
+  protected void setOwnerSmtpAddress(final String ownerSmtpAddress) {
+    this.ownerSmtpAddress = ownerSmtpAddress;
+  }
+
 }
diff --git a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollection.java b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollection.java
index 5e7294419..4340bda32 100644
--- a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollection.java
+++ b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollection.java
@@ -66,7 +66,7 @@ public static AlternateMailboxCollection loadFromXml(EwsXmlReader reader)
             AlternateMailbox.loadFromXml(reader));
       }
     } while (!reader.isEndElement(XmlNamespace.Autodiscover,
-        XmlElementNames.AlternateMailbox));
+        XmlElementNames.AlternateMailboxes));
 
     return instance;
   }
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/XmlElementNames.java b/src/main/java/microsoft/exchange/webservices/data/core/XmlElementNames.java
index 41d7286b3..8fca4f048 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/XmlElementNames.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/XmlElementNames.java
@@ -101,8 +101,7 @@ public class XmlElementNames {
   /**
    * The Constant FractionalPageItemView.
    */
-  public static final String FractionalPageItemView =
-      "FractionalPageItemView";
+  public static final String FractionalPageItemView = "FractionalPageItemView";
 
   /**
    * The Constant FractionalPageFolderView.
@@ -249,8 +248,7 @@ public class XmlElementNames {
   /**
    * The Constant IsReadReceiptRequested.
    */
-  public static final String IsReadReceiptRequested =
-      "IsReadReceiptRequested";
+  public static final String IsReadReceiptRequested = "IsReadReceiptRequested";
 
   /**
    * The Constant IsResponseRequested.
@@ -385,8 +383,7 @@ public class XmlElementNames {
   /**
    * The Constant InternetMessageHeaders.
    */
-  public static final String InternetMessageHeaders =
-      "InternetMessageHeaders";
+  public static final String InternetMessageHeaders = "InternetMessageHeaders";
 
   /**
    * The Constant DateTimeSent.
@@ -1359,8 +1356,7 @@ public class XmlElementNames {
   /**
    * The Constant IntendedFreeBusyStatus.
    */
-  public static final String IntendedFreeBusyStatus =
-      "IntendedFreeBusyStatus";
+  public static final String IntendedFreeBusyStatus = "IntendedFreeBusyStatus";
 
   /**
    * The Constant MeetingRequest.
@@ -2046,8 +2042,7 @@ public class XmlElementNames {
   /**
    * The Constant SuggestionsViewOptions.
    */
-  public static final String SuggestionsViewOptions =
-      "SuggestionsViewOptions";
+  public static final String SuggestionsViewOptions = "SuggestionsViewOptions";
 
   /**
    * The Constant FreeBusyView.
@@ -2350,8 +2345,7 @@ public class XmlElementNames {
   /**
    * The Constant DeliverMeetingRequests.
    */
-  public static final String DeliverMeetingRequests =
-      "DeliverMeetingRequests";
+  public static final String DeliverMeetingRequests = "DeliverMeetingRequests";
 
   /**
    * The Constant MessageXml.
@@ -2448,8 +2442,7 @@ public class XmlElementNames {
   /**
    * The Constant ConnectionFailureCause.
    */
-  public static final String ConnectionFailureCause =
-      "ConnectionFailureCause";
+  public static final String ConnectionFailureCause = "ConnectionFailureCause";
 
   /**
    * The Constant SIPResponseCode.
@@ -2526,14 +2519,12 @@ public class XmlElementNames {
   /**
    * The Constant AbsoluteDateTransition.
    */
-  public static final String AbsoluteDateTransition =
-      "AbsoluteDateTransition";
+  public static final String AbsoluteDateTransition = "AbsoluteDateTransition";
 
   /**
    * The Constant RecurringDayTransition.
    */
-  public static final String RecurringDayTransition =
-      "RecurringDayTransition";
+  public static final String RecurringDayTransition = "RecurringDayTransition";
 
   /**
    * The Constant RecurringDateTransition.
@@ -2695,8 +2686,7 @@ public class XmlElementNames {
   /**
    * The Constant GlobalUniqueRecipients.
    */
-  public static final String GlobalUniqueRecipients =
-      "GlobalUniqueRecipients";
+  public static final String GlobalUniqueRecipients = "GlobalUniqueRecipients";
 
   /**
    * The Constant UniqueUnreadSenders.
@@ -2727,8 +2717,7 @@ public class XmlElementNames {
   /**
    * The Constant GlobalLastDeliveryTime.
    */
-  public static final String GlobalLastDeliveryTime =
-      "GlobalLastDeliveryTime";
+  public static final String GlobalLastDeliveryTime = "GlobalLastDeliveryTime";
 
   /**
    * The Constant GlobalCategories.
@@ -2999,6 +2988,17 @@ public class XmlElementNames {
    */
   public static final String ServerVersionInfo = "ServerVersionInfo";
 
+
+  /**
+   * The Constant SmtpAddress.
+   */
+  public static final String SmtpAddress = "SmtpAddress";
+
+  /**
+   * The Constant OwnerSmtpAddress.
+   */
+  public static final String OwnerSmtpAddress = "OwnerSmtpAddress";
+
   /**
    * The Constant AD.
    */
@@ -3093,8 +3093,7 @@ public class XmlElementNames {
   /**
    * The Constant RequestedServerVersion.
    */
-  public static final String RequestedServerVersion =
-      "RequestedServerVersion";
+  public static final String RequestedServerVersion = "RequestedServerVersion";
 
   /**
    * The Constant Request.
@@ -3483,8 +3482,7 @@ public class XmlElementNames {
   /**
    * The Constant ContainsSubjectStrings.
    */
-  public static final String ContainsSubjectStrings =
-      "ContainsSubjectStrings";
+  public static final String ContainsSubjectStrings = "ContainsSubjectStrings";
 
   /**
    * The Constant FlaggedForAction.
@@ -3539,8 +3537,7 @@ public class XmlElementNames {
   /**
    * The Constant IsPermissionControlled.
    */
-  public static final String IsPermissionControlled =
-      "IsPermissionControlled";
+  public static final String IsPermissionControlled = "IsPermissionControlled";
 
   /**
    * The Constant IsSigned.
@@ -3560,8 +3557,7 @@ public class XmlElementNames {
   /**
    * The Constant MessageClassifications.
    */
-  public static final String MessageClassifications =
-      "MessageClassifications";
+  public static final String MessageClassifications = "MessageClassifications";
 
   /**
    * The Constant NotSentToMe.
@@ -3683,8 +3679,7 @@ public class XmlElementNames {
   /**
    * The Constant ServerReplyWithMessage.
    */
-  public static final String ServerReplyWithMessage =
-      "ServerReplyWithMessage";
+  public static final String ServerReplyWithMessage = "ServerReplyWithMessage";
 
   /**
    * The Constant StopProcessingRules.
@@ -3805,8 +3800,7 @@ public class XmlElementNames {
   /**
    * The Constant IsGreaterThanOrEqualTo.
    */
-  public static final String IsGreaterThanOrEqualTo =
-      "IsGreaterThanOrEqualTo";
+  public static final String IsGreaterThanOrEqualTo = "IsGreaterThanOrEqualTo";
 
   /**
    * The Constant IsLessThan.
@@ -3818,7 +3812,7 @@ public class XmlElementNames {
    */
   public static final String IsLessThanOrEqualTo = "IsLessThanOrEqualTo";
 
-  //Directory only contact property
+  // Directory only contact property
   /**
    * The Constant PhoneticFullName.
    */
@@ -3934,8 +3928,7 @@ public class XmlElementNames {
   /**
    * The Constant GetItemResponseMessage.
    */
-  public static final String GetItemResponseMessage =
-      "GetItemResponseMessage";
+  public static final String GetItemResponseMessage = "GetItemResponseMessage";
 
   // CreateItem
   /**
@@ -4107,7 +4100,7 @@ public class XmlElementNames {
   public static final String DeleteFolderResponseMessage =
       "DeleteFolderResponseMessage";
 
-  //EmptyFolder
+  // EmptyFolder
   /**
    * The Constant EmptyFolder.
    */
@@ -4201,8 +4194,8 @@ public class XmlElementNames {
   /**
    * The Constant CreateAttachmentResponse.
    */
-  public static final String
-      CreateAttachmentResponse = "CreateAttachmentResponse";
+  public static final String CreateAttachmentResponse =
+      "CreateAttachmentResponse";
 
   /**
    * The Constant CreateAttachmentResponseMessage.
@@ -4507,8 +4500,7 @@ public class XmlElementNames {
   /**
    * The Constant RemoveDelegateResponse.
    */
-  public static final String RemoveDelegateResponse =
-      "RemoveDelegateResponse";
+  public static final String RemoveDelegateResponse = "RemoveDelegateResponse";
 
   // GetDelegate
   /**
@@ -4530,8 +4522,7 @@ public class XmlElementNames {
   /**
    * The Constant UpdateDelegateResponse.
    */
-  public static final String UpdateDelegateResponse =
-      "UpdateDelegateResponse";
+  public static final String UpdateDelegateResponse = "UpdateDelegateResponse";
 
   // CreateUserConfiguration
   /**
@@ -4703,16 +4694,18 @@ public class XmlElementNames {
   public static final String ExecuteDiagnosticMethodResponseMEssage =
       "ExecuteDiagnosticMethodResponseMessage";
 
-  //GetPasswordExpirationDate
+  // GetPasswordExpirationDate
   /**
    * The Constant GetPasswordExpirationDate.
    */
-  public static final String GetPasswordExpirationDateRequest = "GetPasswordExpirationDate";
+  public static final String GetPasswordExpirationDateRequest =
+      "GetPasswordExpirationDate";
 
   /**
    * The Constant GetPasswordExpirationDateResponse.
    */
-  public static final String GetPasswordExpirationDateResponse = "GetPasswordExpirationDateResponse";
+  public static final String GetPasswordExpirationDateResponse =
+      "GetPasswordExpirationDateResponse";
 
   // SOAP element names
 
@@ -4779,8 +4772,7 @@ public class XmlElementNames {
   /**
    * The Constant EwsErrorCodeElementName.
    */
-  public static final String EwsErrorCodeElementName =
-      "ErrorCode"; // Generated
+  public static final String EwsErrorCodeElementName = "ErrorCode"; // Generated
 
 
   // by
@@ -4788,8 +4780,7 @@ public class XmlElementNames {
   /**
    * The Constant EwsExceptionTypeElementName.
    */
-  public static final String EwsExceptionTypeElementName =
-      "ExceptionType"; // Generated
+  public static final String EwsExceptionTypeElementName = "ExceptionType"; // Generated
 
   // by
   // UM
diff --git a/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java
new file mode 100644
index 000000000..084bbfec8
--- /dev/null
+++ b/src/test/java/microsoft/exchange/webservices/data/autodiscover/AlternateMailboxCollectionTest.java
@@ -0,0 +1,87 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package microsoft.exchange.webservices.data.autodiscover;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+
+import org.junit.Test;
+
+import microsoft.exchange.webservices.data.core.EwsXmlReader;
+
+public class AlternateMailboxCollectionTest {
+
+  private static final String PARTIAL_RESULT =
+      "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:a=\"http://www.w3.org/2005/08/addressing\">"
+          + "<s:Header><a:Action s:mustUnderstand=\"1\">http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetUserSettingsResponse</a:Action>"
+          + "<h:ServerVersionInfo xmlns:h=\"http://schemas.microsoft.com/exchange/2010/Autodiscover\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">"
+          + "<h:MajorVersion>15</h:MajorVersion><h:MinorVersion>0</h:MinorVersion><h:MajorBuildNumber>1076</h:MajorBuildNumber>"
+          + "<h:MinorBuildNumber>0</h:MinorBuildNumber><h:Version>Exchange2013_SP1</h:Version></h:ServerVersionInfo>"
+          + "</s:Header>"
+          + "<s:Body><GetUserSettingsResponseMessage xmlns=\"http://schemas.microsoft.com/exchange/2010/Autodiscover\">"
+          + "<Response xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">"
+          + "<UserResponses><UserResponse><UserSettings><UserSetting i:type=\"AlternateMailboxCollectionSetting\">"
+          + "<Name>AlternateMailboxes</Name><AlternateMailboxes>"
+          + "<AlternateMailbox><Type>Archive</Type>"
+          + "<DisplayName>Personal Archive - Testaccount008</DisplayName>"
+          + "<LegacyDN>ou=Exchange Administrative Group/cn=Testaccount008 Test</LegacyDN>"
+          + "<Server>cb7c4056-a738-4004-bd0d-65b58d3b7bc1@test.com</Server>"
+          + "<OwnerSmtpAddress>testaccount008@test.com</OwnerSmtpAddress>"
+          + "</AlternateMailbox><AlternateMailbox><Type>Delegate</Type>"
+          + "<DisplayName>Testaccount007 Test</DisplayName>"
+          + "<SmtpAddress>testaccount007@test.com</SmtpAddress>"
+          + "<OwnerSmtpAddress>testaccount007@test.com</OwnerSmtpAddress>"
+          + "</AlternateMailbox></AlternateMailboxes></UserSetting></UserSettings>"
+          + "</UserResponse></UserResponses></Response></GetUserSettingsResponseMessage></s:Body></s:Envelope>";
+
+
+  @Test
+  public void testGetEntries() throws Exception {
+    final AlternateMailboxCollection amc =
+        AlternateMailboxCollection.loadFromXml(new EwsXmlReader(
+            new ByteArrayInputStream(PARTIAL_RESULT.getBytes())));
+
+    assertEquals(2, amc.getEntries().size());
+
+    final AlternateMailbox first = amc.getEntries().get(0);
+    assertEquals("Archive", first.getType());
+    assertEquals("Personal Archive - Testaccount008", first.getDisplayName());
+    assertEquals("ou=Exchange Administrative Group/cn=Testaccount008 Test",
+        first.getLegacyDN());
+    assertEquals("cb7c4056-a738-4004-bd0d-65b58d3b7bc1@test.com",
+        first.getServer());
+    assertNull(first.getSmtpAddress());
+    assertEquals("testaccount008@test.com", first.getOwnerSmtpAddress());
+
+    final AlternateMailbox second = amc.getEntries().get(1);
+    assertEquals("Delegate", second.getType());
+    assertEquals("Testaccount007 Test", second.getDisplayName());
+    assertNull(second.getLegacyDN());
+    assertNull(second.getServer());
+    assertEquals("testaccount007@test.com", second.getSmtpAddress());
+    assertEquals("testaccount007@test.com", second.getOwnerSmtpAddress());
+  }
+}

From ea8f81ac978630ce92955a52168566bb54d734c9 Mon Sep 17 00:00:00 2001
From: Brian Thomas <thatjavaguy09@gmail.com>
Date: Wed, 9 Dec 2015 15:32:26 +0100
Subject: [PATCH 09/19] Fix: AutodiscoverService has no timeout, and thus might
 hang indefinitely.

---
 .../webservices/data/autodiscover/AutodiscoverService.java     | 2 ++
 .../exchange/webservices/data/core/ExchangeService.java        | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
index bbb6a67de..147a61c7f 100644
--- a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
+++ b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
@@ -401,6 +401,7 @@ private URI getRedirectUrl(String domainName)
 
       request.setRequestMethod("GET");
       request.setAllowAutoRedirect(false);
+      request.setTimeout(getTimeout());
 
       // Do NOT allow authentication as this single request will be made over plain HTTP.
       request.setAllowAuthentication(false);
@@ -1523,6 +1524,7 @@ private boolean tryGetEnabledEndpointsForHost(String host,
         request.setAllowAutoRedirect(false);
         request.setPreAuthenticate(false);
         request.setUseDefaultCredentials(this.getUseDefaultCredentials());
+        request.setTimeout(getTimeout());
 
         prepareCredentials(request);
 
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java
index 51ce1f990..529637769 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java
@@ -3607,7 +3607,8 @@ private URI getAutodiscoverUrl(String emailAddress,
 
     AutodiscoverService autodiscoverService = new AutodiscoverService(this, requestedServerVersion);
     autodiscoverService.setWebProxy(getWebProxy());
-
+    autodiscoverService.setTimeout(getTimeout());
+    
     autodiscoverService
         .setRedirectionUrlValidationCallback(validateRedirectionUrlCallback);
     autodiscoverService.setEnableScpLookup(this.getEnableScpLookup());

From 56e61b23770361430e8b7308b9f666aea3c352af Mon Sep 17 00:00:00 2001
From: Erik LaBianca <erik.labianca@gmail.com>
Date: Wed, 20 Jan 2016 18:43:33 -0500
Subject: [PATCH 10/19] Add America/Fort_Nelson to known OlsonTimeZones

- Add more descriptive assertion failures to OlsonTimeZoneTest
- A new timezone for America/Fort_Nelson was added in tzdata2015g, which
  was included in jdk8u71. This timezone had no analog in the TimeZoneUtils
  map, causing the OlsonTimeZoneTest to fail.
---
 .../exchange/webservices/data/util/TimeZoneUtils.java         | 1 +
 .../webservices/data/property/complex/OlsonTimeZoneTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java b/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
index c084aab0d..f0ab97d49 100644
--- a/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
+++ b/src/main/java/microsoft/exchange/webservices/data/util/TimeZoneUtils.java
@@ -169,6 +169,7 @@ public static Map<String, String> createOlsonTimeZoneToMsMap() {
     map.put("America/Eirunepe", "SA Pacific Standard Time");
     map.put("America/El_Salvador", "Central America Standard Time");
     map.put("America/Ensenada", "Pacific Standard Time");
+    map.put("America/Fort_Nelson", "Mountain Standard Time");
     map.put("America/Fort_Wayne", "US Eastern Standard Time");
     map.put("America/Fortaleza", "SA Eastern Standard Time");
     map.put("America/Glace_Bay", "Atlantic Standard Time");
diff --git a/src/test/java/microsoft/exchange/webservices/data/property/complex/OlsonTimeZoneTest.java b/src/test/java/microsoft/exchange/webservices/data/property/complex/OlsonTimeZoneTest.java
index 52afc2329..3278e4b7a 100644
--- a/src/test/java/microsoft/exchange/webservices/data/property/complex/OlsonTimeZoneTest.java
+++ b/src/test/java/microsoft/exchange/webservices/data/property/complex/OlsonTimeZoneTest.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
- 
+
 package microsoft.exchange.webservices.data.property.complex;
 
 import microsoft.exchange.webservices.data.property.complex.time.OlsonTimeZoneDefinition;
@@ -54,7 +54,7 @@ public void testOlsonTimeZoneConversion() {
         final OlsonTimeZoneDefinition olsonTimeZone = new OlsonTimeZoneDefinition(timeZone);
         final String olsonTimeZoneId = olsonTimeZone.getId();
 
-        Assert.assertFalse(StringUtils.isBlank(olsonTimeZoneId));
+        Assert.assertFalse("olsonTimeZoneId for " + timeZoneId + " is blank", StringUtils.isBlank(olsonTimeZoneId));
         Assert.assertEquals(olsonTimeZoneToMsMap.get(timeZoneId), olsonTimeZoneId);
       }
     }

From 059288b17b26ada16c824e3d0ed77099349c2310 Mon Sep 17 00:00:00 2001
From: "Weinert, Sebastian" <sebastian.weinert@neos-it.de>
Date: Tue, 9 Feb 2016 14:37:16 +0100
Subject: [PATCH 11/19] * added pooling for ServiceRequestBase

---
 .../webservices/data/core/ExchangeServiceBase.java        | 4 ++++
 .../webservices/data/core/request/ServiceRequestBase.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
index bb01858b4..9e383c582 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
@@ -889,4 +889,8 @@ public static byte[] getSessionKey() {
       return ExchangeServiceBase.binarySecret;
     }
   }
+
+  public int getMaximumPoolingConnections() {
+    return maximumPoolingConnections;
+  }
 }
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java b/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
index 101d6b104..aafd48cf6 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/request/ServiceRequestBase.java
@@ -633,7 +633,13 @@ protected SoapFaultDetails readSoapFault(EwsServiceXmlReader reader) {
   protected HttpWebRequest validateAndEmitRequest() throws Exception {
     this.validate();
 
-    HttpWebRequest request = this.buildEwsHttpWebRequest();
+    HttpWebRequest request;
+    
+    if (service.getMaximumPoolingConnections() > 1) {
+        request = buildEwsHttpPoolingWebRequest();
+    } else {
+        request = buildEwsHttpWebRequest();
+    }
 
     try {
       try {

From e0e8bb18f28fa8661b443f1ac4a00dbe48cef118 Mon Sep 17 00:00:00 2001
From: Manuel <WtfJoke@users.noreply.github.com>
Date: Sat, 20 Feb 2016 23:51:33 +0100
Subject: [PATCH 12/19] Remove unstable part

Remove part of readme, that indicates, there isnt any stable version out yet.
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9c512bd95..b75856f2e 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
 Please see the [Getting Started Guide](https://github.com/OfficeDev/ews-java-api/wiki/Getting-Started-Guide) on our wiki for an introduction to this library.
 
 ## Using the library
-Prebuilt JARs are available in the Maven Central repository, which are easy to use with your project. Note that currently, no stable version is available yet, only snapshots in the snapshots repository.
+Prebuilt JARs are available in the Maven Central repository, which are easy to use with your project. See next section for further details.
 
 ### Maven / Gradle
 For Documentation on how to use _ews-java-api_ with maven or gradle please refer to [this section in our wiki](https://github.com/OfficeDev/ews-java-api/wiki#maven--gradle-integration). 

From b278a5813481e6a42fdf72eeb10e540d99d7a2bd Mon Sep 17 00:00:00 2001
From: Manuel <WtfJoke@users.noreply.github.com>
Date: Tue, 1 Mar 2016 00:16:17 +0100
Subject: [PATCH 13/19] Link to wiki-entry instead of adjusting text

Include link to using library
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b75856f2e..018facaed 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
 Please see the [Getting Started Guide](https://github.com/OfficeDev/ews-java-api/wiki/Getting-Started-Guide) on our wiki for an introduction to this library.
 
 ## Using the library
-Prebuilt JARs are available in the Maven Central repository, which are easy to use with your project. See next section for further details.
+Please see [this wiki-entry](https://github.com/OfficeDev/ews-java-api/wiki/Getting-Started-Guide#using-the-library) on how to include the library in your project
 
 ### Maven / Gradle
 For Documentation on how to use _ews-java-api_ with maven or gradle please refer to [this section in our wiki](https://github.com/OfficeDev/ews-java-api/wiki#maven--gradle-integration). 

From 007692b18773f33e7c5915c9b1de09e221ab4f7c Mon Sep 17 00:00:00 2001
From: Matt Guo <mguo@good.com>
Date: Wed, 16 Mar 2016 16:44:58 -0700
Subject: [PATCH 14/19] Fix the "contacts:MSExchageCertificate" type, should be
 "contacts:MSExchangeCertificate"

---
 .../webservices/data/core/service/schema/ContactSchema.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/microsoft/exchange/webservices/data/core/service/schema/ContactSchema.java b/src/main/java/microsoft/exchange/webservices/data/core/service/schema/ContactSchema.java
index aacad6c17..da6ba708d 100644
--- a/src/main/java/microsoft/exchange/webservices/data/core/service/schema/ContactSchema.java
+++ b/src/main/java/microsoft/exchange/webservices/data/core/service/schema/ContactSchema.java
@@ -306,7 +306,7 @@ private interface FieldUris {
      * The MSExchangeCertificate.
      */
 
-    String MSExchangeCertificate = "contacts:MSExchageCertificate";
+    String MSExchangeCertificate = "contacts:MSExchangeCertificate";
 
     /**
      * The DirectoryId.

From 0e1ba52092c8c5bcc4a2b3eef8b330b06879ba3b Mon Sep 17 00:00:00 2001
From: Krzysztof Wolny <k.wolny@gmail.com>
Date: Tue, 18 Oct 2016 09:04:50 +0200
Subject: [PATCH 15/19] Removed IntelliJ files (#536)

---
 .gitignore                                    |   2 +
 .idea/.name                                   |   1 -
 .idea/codeStyleSettings.xml                   | 108 ------------------
 .idea/compiler.xml                            |  32 ------
 .idea/copyright/profiles_settings.xml         |   3 -
 .idea/encodings.xml                           |   7 --
 ...__ch_qos_logback_logback_classic_1_1_3.xml |  13 ---
 ...ven__ch_qos_logback_logback_core_1_1_3.xml |  13 ---
 ...Maven__commons_codec_commons_codec_1_9.xml |  13 ---
 ...n__commons_logging_commons_logging_1_2.xml |  13 ---
 .../Maven__joda_time_joda_time_2_8.xml        |  13 ---
 .idea/libraries/Maven__junit_junit_4_12.xml   |  13 ---
 ...__org_apache_commons_commons_lang3_3_4.xml |  13 ---
 ...apache_httpcomponents_httpclient_4_4_1.xml |  13 ---
 ...g_apache_httpcomponents_httpcore_4_4_1.xml |  13 ---
 .../Maven__org_hamcrest_hamcrest_all_1_3.xml  |  13 ---
 .../Maven__org_hamcrest_hamcrest_core_1_3.xml |  13 ---
 ...aven__org_mockito_mockito_core_1_10_19.xml |  13 ---
 .../Maven__org_objenesis_objenesis_2_1.xml    |  13 ---
 ...Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml |  13 ---
 .../Maven__org_slf4j_slf4j_api_1_7_12.xml     |  13 ---
 .idea/misc.xml                                |  16 ---
 .idea/modules.xml                             |   9 --
 .idea/scopes/scope_settings.xml               |   5 -
 .idea/vcs.xml                                 |   7 --
 ews-java-api.iml                              |  30 -----
 26 files changed, 2 insertions(+), 413 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/codeStyleSettings.xml
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml
 delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml
 delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
 delete mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
 delete mode 100644 .idea/libraries/Maven__joda_time_joda_time_2_8.xml
 delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml
 delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
 delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
 delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
 delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
 delete mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
 delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/scopes/scope_settings.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 ews-java-api.iml

diff --git a/.gitignore b/.gitignore
index bf7311174..e2a23af44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 
 # IntelliJ
 # User-specific stuff:
+.idea
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/findbugs-idea.xml
@@ -21,6 +22,7 @@
 .idea/shelf
 *.iws
 *.ipr
+*.iml
 # Sensitive or high-churn files:
 .idea/dataSources.ids
 .idea/dataSources.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 8e283d75b..000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-ews-java-api
\ No newline at end of file
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index ddacdf3e8..000000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="JAVA_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="OTHER_INDENT_OPTIONS">
-          <value>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-            <option name="USE_TAB_CHARACTER" value="false" />
-            <option name="SMART_TABS" value="false" />
-            <option name="LABEL_INDENT_SIZE" value="0" />
-            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-            <option name="USE_RELATIVE_INDENTS" value="false" />
-          </value>
-        </option>
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value />
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="" withSubpackages="true" static="true" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java" withSubpackages="true" static="false" />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="110" />
-        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
-        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
-        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
-        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-        <option name="WRAP_COMMENTS" value="true" />
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-          <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-          <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
-          <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
-          <option name="BLANK_LINES_AROUND_CLASS" value="2" />
-          <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-          <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-          <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
-          <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-          <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
-          <option name="RESOURCE_LIST_WRAP" value="5" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="1" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="1" />
-          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="1" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="5" />
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="3" />
-          <option name="WHILE_BRACE_FORCE" value="3" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-          <option name="METHOD_ANNOTATION_WRAP" value="1" />
-          <option name="CLASS_ANNOTATION_WRAP" value="1" />
-          <option name="FIELD_ANNOTATION_WRAP" value="1" />
-          <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-          <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-          <indentOptions>
-            <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-            <option name="TAB_SIZE" value="8" />
-          </indentOptions>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index be026393d..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-        <module name="ews-java-api" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="ews-java-api" target="1.6" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf337..000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 74c0d0a52..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-  </component>
-</project>
-
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml
deleted file mode 100644
index 6c9fc331c..000000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml
deleted file mode 100644
index fd35ca452..000000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
deleted file mode 100644
index a66d03944..000000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
deleted file mode 100644
index eab40b329..000000000
--- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-logging:commons-logging:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_8.xml b/.idea/libraries/Maven__joda_time_joda_time_2_8.xml
deleted file mode 100644
index f973fdc27..000000000
--- a/.idea/libraries/Maven__joda_time_joda_time_2_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: joda-time:joda-time:2.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8/joda-time-2.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8/joda-time-2.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.8/joda-time-2.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d41104174..000000000
--- a/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
deleted file mode 100644
index 78cfcd37a..000000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml
deleted file mode 100644
index bfee5185a..000000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.4.1/httpclient-4.4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.4.1/httpclient-4.4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.4.1/httpclient-4.4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml
deleted file mode 100644
index 24a6857d2..000000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.1/httpcore-4.4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
deleted file mode 100644
index 56193163f..000000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-all:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc112..000000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
deleted file mode 100644
index a5237036c..000000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mockito:mockito-core:1.10.19">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/1.10.19/mockito-core-1.10.19-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
deleted file mode 100644
index 7ab319b64..000000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.objenesis:objenesis:2.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
deleted file mode 100644
index 5aeb229ec..000000000
--- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.12/jcl-over-slf4j-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
deleted file mode 100644
index 411efc600..000000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index d1297649f..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e9b29f758..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ews-java-api.iml" filepath="$PROJECT_DIR$/ews-java-api.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b84..000000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 275077f82..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
-
diff --git a/ews-java-api.iml b/ews-java-api.iml
deleted file mode 100644
index 4dc09d843..000000000
--- a/ews-java-api.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.12" level="project" />
-  </component>
-</module>
\ No newline at end of file

From f0d786e4b45db53b452a29c737b8030ee0f73d79 Mon Sep 17 00:00:00 2001
From: David Chesnut <davech@microsoft.com>
Date: Thu, 28 Dec 2017 13:25:47 -0800
Subject: [PATCH 16/19] Added code of conduct

---
 readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/readme.md b/readme.md
index 018facaed..3b93eaef8 100644
--- a/readme.md
+++ b/readme.md
@@ -13,3 +13,6 @@ For Documentation on how to use _ews-java-api_ with maven or gradle please refer
 
 ### Building from source
 To build a JAR from the source yourself, please see [this page](https://github.com/OfficeDev/ews-java-api/wiki/Building-EWS-JAVA-API).
+
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

From 9c1cdc2195e378e5f8eb7ebe9971535737b9a812 Mon Sep 17 00:00:00 2001
From: Yina Arenas <yinaa@microsoft.com>
Date: Tue, 24 Jul 2018 17:56:27 -0700
Subject: [PATCH 17/19] Update readme.md

---
 readme.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 3b93eaef8..0f6b83da6 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,18 @@
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/OfficeDev/ews-java-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  
+# Getting Started with the EWS Java API
+
+[![Gitter](https://badges.gitter.im/JoinChat.svg)](https://gitter.im/OfficeDev/ews-java-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Build Status](https://travis-ci.org/OfficeDev/ews-java-api.svg)](https://travis-ci.org/OfficeDev/ews-java-api) [![codecov.io](https://codecov.io/github/OfficeDev/ews-java-api/coverage.svg?branch=master)](https://codecov.io/github/OfficeDev/ews-java-api?branch=master)
 
-# EWS JAVA API
+The Exchange Web Services (EWS) Java API provides a managed interface for developing Java applications that use EWS.
+By using the EWS Java API, you can access almost all the information stored in an Office 365, Exchange Online, or Exchange Server mailbox. However, this API is in sustaining mode, the recommended access pattern for Office 365 and Exchange online data is [Microsoft Graph] (https://graph.microsoft.com)
+
+## Support statement
+
+Starting July 19th 2918, Exchange Web Services (EWS) will no longer receive feature updates. While the service will continue to receive security updates and certain non-security updates, product design and features will remain unchanged. This change also applies to the EWS SDKs for Java and .NET. More information here: https://developer.microsoft.com/en-us/graph/blogs/upcoming-changes-to-exchange-web-services-ews-api-for-office-365/
+
+
+## Getting started resources
 
 Please see the [Getting Started Guide](https://github.com/OfficeDev/ews-java-api/wiki/Getting-Started-Guide) on our wiki for an introduction to this library.
 

From 3fe2e837ebc8e75517c41a7f8d4515bfcd7d3c01 Mon Sep 17 00:00:00 2001
From: Yina Arenas <yinaa@microsoft.com>
Date: Tue, 24 Jul 2018 17:57:02 -0700
Subject: [PATCH 18/19] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 0f6b83da6..a1679e042 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@
 [![Build Status](https://travis-ci.org/OfficeDev/ews-java-api.svg)](https://travis-ci.org/OfficeDev/ews-java-api) [![codecov.io](https://codecov.io/github/OfficeDev/ews-java-api/coverage.svg?branch=master)](https://codecov.io/github/OfficeDev/ews-java-api?branch=master)
 
 The Exchange Web Services (EWS) Java API provides a managed interface for developing Java applications that use EWS.
-By using the EWS Java API, you can access almost all the information stored in an Office 365, Exchange Online, or Exchange Server mailbox. However, this API is in sustaining mode, the recommended access pattern for Office 365 and Exchange online data is [Microsoft Graph] (https://graph.microsoft.com)
+By using the EWS Java API, you can access almost all the information stored in an Office 365, Exchange Online, or Exchange Server mailbox. However, this API is in sustaining mode, the recommended access pattern for Office 365 and Exchange online data is [Microsoft Graph](https://graph.microsoft.com)
 
 ## Support statement
 

From 33235f37d97871f17c496526aad0b8c458f904c3 Mon Sep 17 00:00:00 2001
From: Yina Arenas <yinaa@microsoft.com>
Date: Tue, 24 Jul 2018 17:57:19 -0700
Subject: [PATCH 19/19] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index a1679e042..6101807c8 100644
--- a/readme.md
+++ b/readme.md
@@ -9,7 +9,7 @@ By using the EWS Java API, you can access almost all the information stored in a
 
 ## Support statement
 
-Starting July 19th 2918, Exchange Web Services (EWS) will no longer receive feature updates. While the service will continue to receive security updates and certain non-security updates, product design and features will remain unchanged. This change also applies to the EWS SDKs for Java and .NET. More information here: https://developer.microsoft.com/en-us/graph/blogs/upcoming-changes-to-exchange-web-services-ews-api-for-office-365/
+Starting July 19th 2018, Exchange Web Services (EWS) will no longer receive feature updates. While the service will continue to receive security updates and certain non-security updates, product design and features will remain unchanged. This change also applies to the EWS SDKs for Java and .NET. More information here: https://developer.microsoft.com/en-us/graph/blogs/upcoming-changes-to-exchange-web-services-ews-api-for-office-365/
 
 
 ## Getting started resources