From 2f3b7f180511a5e0af674e3a25ddbaabaa38d36c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 16 Oct 2014 09:01:39 +0200 Subject: update to Apache commons-http 4.3 --- .../gv/util/client/mis/simple/MISSimpleClient.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/main/java/at/gv/util/client/mis/simple') diff --git a/src/main/java/at/gv/util/client/mis/simple/MISSimpleClient.java b/src/main/java/at/gv/util/client/mis/simple/MISSimpleClient.java index 34ba951..6886c44 100644 --- a/src/main/java/at/gv/util/client/mis/simple/MISSimpleClient.java +++ b/src/main/java/at/gv/util/client/mis/simple/MISSimpleClient.java @@ -9,9 +9,11 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.methods.StringRequestEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.HttpClients; import org.apache.xpath.XPathAPI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -188,15 +190,16 @@ public class MISSimpleClient { throw new NullPointerException("Argument request must not be null."); } try { - HttpClient httpclient = new HttpClient(); - PostMethod post = new PostMethod(webServiceURL); - StringRequestEntity re = new StringRequestEntity(DOMUtils.serializeNode(packIntoSOAP(request)),"text/xml", "UTF-8"); - post.setRequestEntity(re); - int responseCode = httpclient.executeMethod(post); - if (responseCode != 200) { - throw new MISSimpleClientException("Invalid HTTP response code " + responseCode); + HttpClient httpclient = HttpClients.createDefault(); + HttpPost post = new HttpPost(webServiceURL); + StringEntity re = new StringEntity(DOMUtils.serializeNode(packIntoSOAP(request)),"text/xml"); + post.setEntity(re); + + HttpResponse response = httpclient.execute(post); + if (response.getStatusLine().getStatusCode() != 200) { + throw new MISSimpleClientException("Invalid HTTP response code " + response.getStatusLine().getStatusCode()); } - return unpackFromSOAP(DOMUtils.parseXmlNonValidating(post.getResponseBodyAsStream())); + return unpackFromSOAP(DOMUtils.parseXmlNonValidating(post.getEntity().getContent())); } catch(IOException e) { throw new MISSimpleClientException(e); } catch (TransformerException e) { -- cgit v1.2.3