Fix for Issue OfficeDev#276

Avrom · Avrom · commit 6faa53da2b17 · 2015-05-31T10:30:38.000-04:00
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeService.java
@@ -3744,6 +3744,17 @@ public HttpWebRequest prepareHttpWebRequest()
         .getAcceptGzipEncoding(), true);
   }
 
+  public HttpWebRequest prepareHttpPoolingWebRequest()
+	      throws ServiceLocalException, URISyntaxException {
+	    try {
+	      this.url = this.adjustServiceUriFromCredentials(this.getUrl());
+	    } catch (Exception e) {
+	      LOG.error(e);
+	    }
+	    return this.prepareHttpPoolingWebRequestForUrl(url, this
+	        .getAcceptGzipEncoding(), true);
+	  }
+
   /**
    * Processes an HTTP error response.
    *
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java b/src/main/java/microsoft/exchange/webservices/data/core/ExchangeServiceBase.java
@@ -34,6 +34,7 @@
 import microsoft.exchange.webservices.data.core.exception.service.local.ServiceLocalException;
 import microsoft.exchange.webservices.data.misc.EwsTraceListener;
 import microsoft.exchange.webservices.data.misc.ITraceListener;
+
 import org.apache.http.client.AuthenticationStrategy;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.protocol.HttpClientContext;
@@ -46,6 +47,7 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -142,7 +144,12 @@ public abstract class ExchangeServiceBase implements Closeable {
 
   protected HttpClientContext httpContext;
 
-  protected HttpClientWebRequest request = null;
+  protected CloseableHttpClient	httpPoolingClient;
+  
+  private int	maximumPoolingConnections	= 10;
+
+
+//  protected HttpClientWebRequest request = null;
 
   // protected static HttpStatusCode AccountIsLocked = (HttpStatusCode)456;
 
@@ -193,8 +200,32 @@ private void initializeHttpClient() {
       .build();
   }
 
+  private void initializeHttpPoolingClient() {
+	    Registry<ConnectionSocketFactory> registry = createConnectionSocketFactoryRegistry();
+	    PoolingHttpClientConnectionManager httpConnectionManager = new PoolingHttpClientConnectionManager(registry);
+	    httpConnectionManager.setMaxTotal(maximumPoolingConnections);
+	    httpConnectionManager.setDefaultMaxPerRoute(maximumPoolingConnections);
+	    AuthenticationStrategy authStrategy = new CookieProcessingTargetAuthenticationStrategy();
+
+	    httpPoolingClient = HttpClients.custom()
+	      .setConnectionManager(httpConnectionManager)
+	      .setTargetAuthenticationStrategy(authStrategy)
+	      .build();
+	  }
+  
+  
   /**
-   * Create registry with configured {@link ConnectionSocketFactory} instances.
+   * Sets the maximum number of connections for the pooling connection manager which is used for subscriptions.
+   * <p>
+   * Default is 10.
+   * @param maximumPoolConnections
+   */
+  public void setMaximumPoolingConnections(int maximumPoolingConnections) {
+    this.maximumPoolingConnections = maximumPoolingConnections;
+  }
+
+  /**
+   * Create registry with configured {@see ConnectionSocketFactory} instances.
    * Override this method to change how to work with different schemas.
    *
    * @return registry object
@@ -226,6 +257,8 @@ private void initializeHttpContext() {
   public void close() {
     try {
       httpClient.close();
+      if (httpPoolingClient != null)
+      	httpPoolingClient.close();
     } catch (IOException e) {
       // Ignore exception while closing the HttpClient.
     }
@@ -274,9 +307,33 @@ protected HttpWebRequest prepareHttpWebRequestForUrl(URI url, boolean acceptGzip
       throw new ServiceLocalException(strErr);
     }
 
-    request = new HttpClientWebRequest(httpClient, httpContext);
-    request.setProxy(getWebProxy());
+    HttpClientWebRequest request = new HttpClientWebRequest(httpClient, httpContext);
+    prepareHttpWebRequestForUrl(url, acceptGzipEncoding, allowAutoRedirect, request);
+
+    return request;
+  }
+
+  protected HttpWebRequest prepareHttpPoolingWebRequestForUrl(URI url, boolean acceptGzipEncoding,
+	      boolean allowAutoRedirect) throws ServiceLocalException, URISyntaxException {
+	    // Verify that the protocol is something that we can handle
+	    String scheme = url.getScheme();
+	    if (!scheme.equalsIgnoreCase(EWSConstants.HTTP_SCHEME)
+	      && !scheme.equalsIgnoreCase(EWSConstants.HTTPS_SCHEME)) {
+	      String strErr = String.format("Protocol %s isn't supported for service request.", scheme);
+	      throw new ServiceLocalException(strErr);
+	    }
 
+	    if (httpPoolingClient == null)
+	   	 initializeHttpPoolingClient();
+	    HttpClientWebRequest request = new HttpClientWebRequest(httpPoolingClient, httpContext);
+	    prepareHttpWebRequestForUrl(url, acceptGzipEncoding, allowAutoRedirect, request);
+
+	    return request;
+	  }
+
+private void prepareHttpWebRequestForUrl(URI url, boolean acceptGzipEncoding, boolean allowAutoRedirect, HttpClientWebRequest request)
+		throws ServiceLocalException, URISyntaxException
+{
     try {
       request.setUrl(url.toURL());
     } catch (MalformedURLException e) {
@@ -298,8 +355,6 @@ protected HttpWebRequest prepareHttpWebRequestForUrl(URI url, boolean acceptGzip
     request.prepareConnection();
 
     httpResponseHeaders.clear();
-
-    return request;
   }
 
   protected void prepareCredentials(HttpWebRequest request) throws ServiceLocalException, URISyntaxException {
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/GetStreamingEventsRequest.java b/src/main/java/microsoft/exchange/webservices/data/core/request/GetStreamingEventsRequest.java
@@ -149,5 +149,9 @@ protected static void setHeartbeatFrequency(int heartbeatFrequency) {
     GetStreamingEventsRequest.heartbeatFrequency = heartbeatFrequency;
   }
 
-
+  @Override
+	protected HttpWebRequest buildEwsHttpWebRequest() throws Exception
+	{
+		return super.buildEwsHttpPoolingWebRequest();
+	}
 }
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
@@ -661,8 +661,18 @@ protected HttpWebRequest validateAndEmitRequest() throws Exception {
    * @throws Exception on error
    */
   protected HttpWebRequest buildEwsHttpWebRequest() throws Exception {
-    try {
       HttpWebRequest request = service.prepareHttpWebRequest();
+    return buildEwsHttpWebRequest(request);
+  }
+
+  protected HttpWebRequest buildEwsHttpPoolingWebRequest() throws Exception {
+     HttpWebRequest request = service.prepareHttpPoolingWebRequest();
+    return buildEwsHttpWebRequest(request);
+  }
+
+private HttpWebRequest buildEwsHttpWebRequest(HttpWebRequest request) throws Exception
+{
+	try {
 
       service.traceHttpRequestHeaders(TraceFlags.EwsRequestHttpHeaders, request);
 
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/SubscribeRequest.java b/src/main/java/microsoft/exchange/webservices/data/core/request/SubscribeRequest.java
@@ -256,4 +256,9 @@ public void setWatermark(String watermark) {
     this.watermark = watermark;
   }
 
+  @Override
+	protected HttpWebRequest buildEwsHttpWebRequest() throws Exception
+	{
+		return super.buildEwsHttpPoolingWebRequest();
+	}
 }
diff --git a/src/main/java/microsoft/exchange/webservices/data/core/request/UnsubscribeRequest.java b/src/main/java/microsoft/exchange/webservices/data/core/request/UnsubscribeRequest.java
@@ -164,5 +164,9 @@ public String getSubscriptionId() {
   public void setSubscriptionId(String subscriptionId) {
     this.subscriptionId = subscriptionId;
   }
-
+  @Override
+ 	protected HttpWebRequest buildEwsHttpWebRequest() throws Exception
+ 	{
+		return super.buildEwsHttpPoolingWebRequest();
+ 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -149,5 +149,9 @@ protected static void setHeartbeatFrequency(int heartbeatFrequency) {`
`149`	`149`	`GetStreamingEventsRequest.heartbeatFrequency = heartbeatFrequency;`
`150`	`150`	`}`
`151`	`151`
`152`		`-`
	`152`	`+ @Override`
	`153`	`+ protected HttpWebRequest buildEwsHttpWebRequest() throws Exception`
	`154`	`+ {`
	`155`	`+ return super.buildEwsHttpPoolingWebRequest();`
	`156`	`+ }`
`153`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,4 +256,9 @@ public void setWatermark(String watermark) {`
`256`	`256`	`this.watermark = watermark;`
`257`	`257`	`}`
`258`	`258`
	`259`	`+ @Override`
	`260`	`+ protected HttpWebRequest buildEwsHttpWebRequest() throws Exception`
	`261`	`+ {`
	`262`	`+ return super.buildEwsHttpPoolingWebRequest();`
	`263`	`+ }`
`259`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,5 +164,9 @@ public String getSubscriptionId() {`
`164`	`164`	`public void setSubscriptionId(String subscriptionId) {`
`165`	`165`	`this.subscriptionId = subscriptionId;`
`166`	`166`	`}`
`167`		`-`
	`167`	`+ @Override`
	`168`	`+ protected HttpWebRequest buildEwsHttpWebRequest() throws Exception`
	`169`	`+ {`
	`170`	`+ return super.buildEwsHttpPoolingWebRequest();`
	`171`	`+ }`
`168`	`172`	`}`