Fix a few Windows-specific issues (#336)

Author: sbabcoc

src/main/java/com/nordstrom/automation/selenium/core/GridUtility.java

@@ -27,15 +27,20 @@
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.concurrent.TimeoutException;
+
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIUtils;
+import org.apache.http.entity.BufferedHttpEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
@@ -93,9 +98,22 @@ public static boolean isHostActive(final URL hostUrl, final String... pathAndPar
      */
     public static HttpResponse getHttpResponse(final URL hostUrl, final String... pathAndParams) throws IOException {
         Objects.requireNonNull(hostUrl, "[hostUrl] must be non-null");
-        HttpClient client = HttpClientBuilder.create().build();
+
         URI uri = UriUtils.makeBasicURI(hostUrl.getProtocol(), hostUrl.getHost(), hostUrl.getPort(), pathAndParams);
-        return client.execute(extractHost(hostUrl), new HttpGet(uri.toURL().toExternalForm()));
+
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(2000)
+                .setConnectionRequestTimeout(2000).setSocketTimeout(5000).build();
+        CloseableHttpClient client = HttpClientBuilder.create().disableAutomaticRetries()
+                .setDefaultRequestConfig(requestConfig).build();
+
+        HttpGet request = new HttpGet(uri.toString());
+        HttpResponse response = client.execute(extractHost(hostUrl), request);
+        HttpEntity entity = response.getEntity();
+        if (entity != null && entity.isStreaming()) {
+            response.setEntity(new BufferedHttpEntity(entity));
+        }
+
+        return response;
     }
 
     /**

src/main/java/com/nordstrom/automation/selenium/model/Page.java

@@ -6,8 +6,8 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.openqa.selenium.SearchContext;
-import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebDriverException;
 
 import com.nordstrom.automation.selenium.annotations.InitialPage;
 import com.nordstrom.automation.selenium.annotations.PageUrl;
@@ -96,7 +96,7 @@ protected SearchContext switchToContext() {
         }
         try {
             driver.switchTo().defaultContent();
-        } catch(UnsupportedCommandException eaten) {
+        } catch(WebDriverException eaten) {
             // unsupported on native platforms
         }
         return this;
@@ -232,7 +232,7 @@ public SearchContext getWrappedContext() {
     public SearchContext refreshContext(final long expiration) {
         try {
             driver.switchTo().defaultContent();
-        } catch(UnsupportedCommandException eaten) {
+        } catch(WebDriverException eaten) {
             // unsupported on native platforms
         }
         return this;