Update httpclient library from version 4.5.x to version 5.y

1 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/edu/kit/scc/dei/ecplean/ECPAuthenticator.java b/src/main/java/edu/kit/scc/dei/ecplean/ECPAuthenticator.java
index 089bc88..9422ea6 100644
--- a/src/main/java/edu/kit/scc/dei/ecplean/ECPAuthenticator.java
+++ b/src/main/java/edu/kit/scc/dei/ecplean/ECPAuthenticator.java
@@ -8,15 +8,15 @@ import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathConstants;

 import javax.xml.xpath.XPathException;

 

-import org.apache.http.HttpResponse;

-import org.apache.http.ParseException;

-import org.apache.http.client.methods.HttpGet;

-import org.apache.http.client.methods.HttpPost;

-import org.apache.http.client.protocol.HttpClientContext;

-import org.apache.http.entity.StringEntity;

-import org.apache.http.impl.client.BasicCookieStore;

-import org.apache.http.impl.client.CloseableHttpClient;

-import org.apache.http.util.EntityUtils;

+import org.apache.hc.client5.http.classic.methods.HttpGet;

+import org.apache.hc.client5.http.classic.methods.HttpPost;

+import org.apache.hc.client5.http.cookie.BasicCookieStore;

+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;

+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;

+import org.apache.hc.client5.http.protocol.HttpClientContext;

+import org.apache.hc.core5.http.ParseException;

+import org.apache.hc.core5.http.io.entity.EntityUtils;

+import org.apache.hc.core5.http.io.entity.StringEntity;

 import org.w3c.dom.Document;

 import org.w3c.dom.Node;

 import org.w3c.dom.NodeList;

@@ -36,7 +36,7 @@ public class ECPAuthenticator extends ECPAuthenticatorBase {
 		authInfo = new ECPAuthenticationInfo(username, password, idpEcpEndpoint, spUrl);

 	}

 	

-	public HttpResponse authenticate() throws ECPAuthenticationException {

+	public CloseableHttpResponse authenticate() throws ECPAuthenticationException {

 		logger.info("Starting authentication");

 

 		logger.info("Contacting SP " + authInfo.getSpUrl());

@@ -52,7 +52,7 @@ public class ECPAuthenticator extends ECPAuthenticatorBase {
 		HttpClientContext ctx = HttpClientContext.create();

 		ctx.setCookieStore(new BasicCookieStore());

 

-		HttpResponse httpResponse;

+		CloseableHttpResponse httpResponse;

 		String responseBody;

 		try {

 			httpResponse = client.execute(httpGet, ctx);

@@ -133,7 +133,7 @@ public class ECPAuthenticator extends ECPAuthenticatorBase {
 		try {

 			httpPost.setEntity(new StringEntity(documentToString(idpResponse)));

 			httpResponse = client.execute(httpPost, ctx);

-			logger.info("Asserting resulted in " + httpResponse.getStatusLine());

+			logger.info("Asserting resulted in " + httpResponse.getReasonPhrase());

 			httpPost.reset();

 		} catch (TransformerException | IOException e) {

 			logger.debug("Could not post assertion back to SP");