Merge branch 'releases/Release_2_10_0_Branch'

[jalview.git] / src / jalview / ws / HttpClientUtils.java

diff --git a/src/jalview/ws/HttpClientUtils.java b/src/jalview/ws/HttpClientUtils.java
index 93566f8..4f25e39 100644 (file)
--- a/src/jalview/ws/HttpClientUtils.java
+++ b/src/jalview/ws/HttpClientUtils.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -29,6 +29,7 @@ import java.util.List;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
@@ -40,11 +41,16 @@ import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.InputStreamBody;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
 
 /**
  * Helpful procedures for working with services via HTTPClient
+ * 
  * @author jimp
- *
+ * 
  */
 public class HttpClientUtils
 {
@@ -60,10 +66,23 @@ public class HttpClientUtils
    * @throws Exception
    */
   public static BufferedReader doHttpUrlPost(String postUrl,
-          List<NameValuePair> vals) throws ClientProtocolException,
-          IOException
+          List<NameValuePair> vals, int connectionTimeoutMs,
+          int readTimeoutMs) throws ClientProtocolException, IOException
   {
-    HttpClient httpclient = new DefaultHttpClient();
+    // todo use HttpClient 4.3 or later and class RequestConfig
+    HttpParams params = new BasicHttpParams();
+    params.setParameter(CoreProtocolPNames.PROTOCOL_VERSION,
+            HttpVersion.HTTP_1_1);
+    if (connectionTimeoutMs > 0)
+    {
+      HttpConnectionParams
+              .setConnectionTimeout(params, connectionTimeoutMs);
+    }
+    if (readTimeoutMs > 0)
+    {
+      HttpConnectionParams.setSoTimeout(params, readTimeoutMs);
+    }
+    HttpClient httpclient = new DefaultHttpClient(params);
     HttpPost httppost = new HttpPost(postUrl);
     UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
     httppost.setEntity(ue);
@@ -83,18 +102,20 @@ public class HttpClientUtils
   }
 
   public static BufferedReader doHttpMpartFilePost(String postUrl,
-          List<NameValuePair> vals, String fparm,File file, String mtype) throws ClientProtocolException,
-          IOException
+          List<NameValuePair> vals, String fparm, File file, String mtype)
+          throws ClientProtocolException, IOException
   {
     HttpClient httpclient = new DefaultHttpClient();
     HttpPost httppost = new HttpPost(postUrl);
-    MultipartEntity mpe = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE);
-    for (NameValuePair nvp:vals)
+    MultipartEntity mpe = new MultipartEntity(
+            HttpMultipartMode.BROWSER_COMPATIBLE);
+    for (NameValuePair nvp : vals)
     {
       mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
     }
-    
-    FileBody fb = new FileBody(file, mtype!=null ? mtype : "application/octet-stream");
+
+    FileBody fb = new FileBody(file, mtype != null ? mtype
+            : "application/octet-stream");
     mpe.addPart(fparm, fb);
     UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
     httppost.setEntity(ue);
@@ -112,19 +133,22 @@ public class HttpClientUtils
       return null;
     }
   }
+
   public static BufferedReader doHttpMpartInputstreamPost(String postUrl,
-          List<NameValuePair> vals, String fparm,String fname, InputStream is, String mtype) throws ClientProtocolException,
+          List<NameValuePair> vals, String fparm, String fname,
+          InputStream is, String mtype) throws ClientProtocolException,
           IOException
   {
     HttpClient httpclient = new DefaultHttpClient();
     HttpPost httppost = new HttpPost(postUrl);
     MultipartEntity mpe = new MultipartEntity(HttpMultipartMode.STRICT);
-    for (NameValuePair nvp:vals)
+    for (NameValuePair nvp : vals)
     {
       mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
     }
-    
-    InputStreamBody fb = (mtype!=null) ? new InputStreamBody(is, fname, mtype) : new InputStreamBody(is, fname);
+
+    InputStreamBody fb = (mtype != null) ? new InputStreamBody(is, fname,
+            mtype) : new InputStreamBody(is, fname);
     mpe.addPart(fparm, fb);
     UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
     httppost.setEntity(ue);