Update apache httpclient, minor cleanups

1 files changed, 6 insertions, 11 deletions

diff --git a/src/main/java/edu/kit/scc/dei/ecplean/ECPIdPAuth.java b/src/main/java/edu/kit/scc/dei/ecplean/ECPIdPAuth.java
index 0eb035b..54227e6 100644
--- a/src/main/java/edu/kit/scc/dei/ecplean/ECPIdPAuth.java
+++ b/src/main/java/edu/kit/scc/dei/ecplean/ECPIdPAuth.java
@@ -4,31 +4,29 @@ import java.io.IOException;
 import java.net.URI;

 

 import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.transform.TransformerConfigurationException;

 import javax.xml.transform.TransformerException;

 import javax.xml.xpath.XPathConstants;

 import javax.xml.xpath.XPathException;

 

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

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

 import org.w3c.dom.Document;

 import org.w3c.dom.Node;

 import org.xml.sax.SAXException;

 

 public class ECPIdPAuth extends ECPAuthenticatorBase {

-

+	

 	public ECPIdPAuth(String username, String password,

 			URI idpEcpEndpoint) {

-		this(new DefaultHttpClient(), username, password, idpEcpEndpoint);

+		super();

+		authInfo = new ECPAuthenticationInfo(username, password, idpEcpEndpoint, null);

 	}

 

-	public ECPIdPAuth(DefaultHttpClient client, String username, String password,

+	public ECPIdPAuth(CloseableHttpClient client, String username, String password,

 			URI idpEcpEndpoint) {

 		super(client);

-

 		authInfo = new ECPAuthenticationInfo(username, password, idpEcpEndpoint, null);

-		authInfo.setAuthState(ECPAuthState.NOT_STARTED);

 	}

-

+	

 	public String authenticate(String paosMessage) throws ECPAuthenticationException {

 		

 		Document initResponse;

@@ -70,9 +68,6 @@ public class ECPIdPAuth extends ECPAuthenticatorBase {
 

 		try {

 			return documentToString(idpResponse);

-		} catch (TransformerConfigurationException e) {

-			logger.debug("documentToString failed");

-			throw new ECPAuthenticationException(e);

 		} catch (TransformerException e) {

 			logger.debug("documentToString failed");

 			throw new ECPAuthenticationException(e);