git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
ws
/
HttpClientUtils.java
diff --git
a/src/jalview/ws/HttpClientUtils.java
b/src/jalview/ws/HttpClientUtils.java
index
c6d6629
..
b19d606
100644
(file)
--- a/
src/jalview/ws/HttpClientUtils.java
+++ b/
src/jalview/ws/HttpClientUtils.java
@@
-67,8
+67,7
@@
public class HttpClientUtils
*/
public static BufferedReader doHttpUrlPost(String postUrl,
List<NameValuePair> vals, int connectionTimeoutMs,
*/
public static BufferedReader doHttpUrlPost(String postUrl,
List<NameValuePair> vals, int connectionTimeoutMs,
- int readTimeoutMs) throws ClientProtocolException,
- IOException
+ int readTimeoutMs) throws ClientProtocolException, IOException
{
// todo use HttpClient 4.3 or later and class RequestConfig
HttpParams params = new BasicHttpParams();
{
// todo use HttpClient 4.3 or later and class RequestConfig
HttpParams params = new BasicHttpParams();
@@
-76,8
+75,8
@@
public class HttpClientUtils
HttpVersion.HTTP_1_1);
if (connectionTimeoutMs > 0)
{
HttpVersion.HTTP_1_1);
if (connectionTimeoutMs > 0)
{
- HttpConnectionParams
- .setConnectionTimeout(params, connectionTimeoutMs);
+ HttpConnectionParams.setConnectionTimeout(params,
+ connectionTimeoutMs);
}
if (readTimeoutMs > 0)
{
}
if (readTimeoutMs > 0)
{
@@
-92,8
+91,8
@@
public class HttpClientUtils
if (resEntity != null)
{
if (resEntity != null)
{
- BufferedReader r = new BufferedReader(new InputStreamReader(
- resEntity.getContent()));
+ BufferedReader r = new BufferedReader(
+ new InputStreamReader(resEntity.getContent()));
return r;
}
else
return r;
}
else
@@
-115,8
+114,8
@@
public class HttpClientUtils
mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
}
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);
mpe.addPart(fparm, fb);
UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
httppost.setEntity(ue);
@@
-125,8
+124,8
@@
public class HttpClientUtils
if (resEntity != null)
{
if (resEntity != null)
{
- BufferedReader r = new BufferedReader(new InputStreamReader(
- resEntity.getContent()));
+ BufferedReader r = new BufferedReader(
+ new InputStreamReader(resEntity.getContent()));
return r;
}
else
return r;
}
else
@@
-137,8
+136,8
@@
public class HttpClientUtils
public static BufferedReader doHttpMpartInputstreamPost(String postUrl,
List<NameValuePair> vals, String fparm, String fname,
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);
{
HttpClient httpclient = new DefaultHttpClient();
HttpPost httppost = new HttpPost(postUrl);
@@
-148,8
+147,9
@@
public class HttpClientUtils
mpe.addPart(nvp.getName(), new StringBody(nvp.getValue()));
}
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);
mpe.addPart(fparm, fb);
UrlEncodedFormEntity ue = new UrlEncodedFormEntity(vals, "UTF-8");
httppost.setEntity(ue);
@@
-158,8
+158,8
@@
public class HttpClientUtils
if (resEntity != null)
{
if (resEntity != null)
{
- BufferedReader r = new BufferedReader(new InputStreamReader(
- resEntity.getContent()));
+ BufferedReader r = new BufferedReader(
+ new InputStreamReader(resEntity.getContent()));
return r;
}
else
return r;
}
else