1 files changed, 12 insertions, 15 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
index 2776ec53..633559de 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
@@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +49,7 @@ import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
+import at.gv.egiz.eaaf.core.impl.utils.IHttpClientFactory;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory;
@@ -73,6 +74,8 @@ public class MonitoringController {
   @Autowired
   private IConfigurationWithSP config;
 
+  @Autowired private IHttpClientFactory httpClientFactory;
+  
   @Autowired
   private PvpMetadataBuilder metadatabuilder;
   @Autowired
@@ -248,17 +251,11 @@ public class MonitoringController {
 
       // create HTTP client
       // TODO: update if we switch to openSAML3
-      final HttpClient httpClient = new HttpClient();
+      CloseableHttpClient httpClient = httpClientFactory.getHttpClient();
+      HttpUriRequest request = new HttpGet(urlString);
 
-      // set parameters
-      final HttpClientParams params = new HttpClientParams();
-      params.setSoTimeout(5 * 1000);
-      httpClient.setParams(params);
-
-      // request URL
-      final HttpMethod method = new GetMethod(urlString);
-      final int respCode = httpClient.executeMethod(method);
-      if (respCode != 200) {
+      final CloseableHttpResponse respCode = httpClient.execute(request);
+      if (respCode.getStatusLine().getStatusCode() != 200) {
         log.warn("Monitoring: Has an error in '" + TEST_EIDASNODEMETADATA + "': " + " HTTP responsecode: "
             + respCode);
         throw new Exception(TEST_EIDASNODEMETADATA + MESSAGE_ERROR);
@@ -266,7 +263,7 @@ public class MonitoringController {
       }
 
       // parse metadata
-      DomUtils.parseXmlNonValidating(method.getResponseBodyAsStream());
+      DomUtils.parseXmlNonValidating(respCode.getEntity().getContent());
 
       return TEST_EIDASNODEMETADATA + MESSAGE_OK;