JAL-2418 source formatting

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

diff --git a/src/jalview/ws/HttpClientUtils.java b/src/jalview/ws/HttpClientUtils.java
index ed7288f..b19d606 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.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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,6 +41,10 @@ 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
@@ -61,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);
@@ -73,8 +91,8 @@ public class HttpClientUtils
 
     if (resEntity != null)
     {
-      BufferedReader r = new BufferedReader(new InputStreamReader(
-              resEntity.getContent()));
+      BufferedReader r = new BufferedReader(
+              new InputStreamReader(resEntity.getContent()));
       return r;
     }
     else
@@ -96,8 +114,8 @@ public class HttpClientUtils
       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);
@@ -106,8 +124,8 @@ public class HttpClientUtils
 
     if (resEntity != null)
     {
-      BufferedReader r = new BufferedReader(new InputStreamReader(
-              resEntity.getContent()));
+      BufferedReader r = new BufferedReader(
+              new InputStreamReader(resEntity.getContent()));
       return r;
     }
     else
@@ -118,8 +136,8 @@ public class HttpClientUtils
 
   public static BufferedReader doHttpMpartInputstreamPost(String postUrl,
           List<NameValuePair> vals, String fparm, String fname,
-          InputStream is, String mtype) throws ClientProtocolException,
-          IOException
+          InputStream is, String mtype)
+          throws ClientProtocolException, IOException
   {
     HttpClient httpclient = new DefaultHttpClient();
     HttpPost httppost = new HttpPost(postUrl);
@@ -129,8 +147,9 @@ public class HttpClientUtils
       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);
@@ -139,8 +158,8 @@ public class HttpClientUtils
 
     if (resEntity != null)
     {
-      BufferedReader r = new BufferedReader(new InputStreamReader(
-              resEntity.getContent()));
+      BufferedReader r = new BufferedReader(
+              new InputStreamReader(resEntity.getContent()));
       return r;
     }
     else