Change HTTP Requests into HTTPS Ones

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / bolt / enginebolt / EngineWrapper.java

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
index 733cae0..183e52f 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapper.java
@@ -16,10 +16,11 @@
 package org.onap.holmes.rulemgt.bolt.enginebolt;\r
 \r
 import javax.inject.Inject;\r
-import javax.ws.rs.core.Response;\r
 import lombok.extern.slf4j.Slf4j;\r
 import net.sf.json.JSONObject;\r
+import org.apache.http.HttpResponse;\r
 import org.jvnet.hk2.annotations.Service;\r
+import org.onap.holmes.common.utils.HttpsUtils;\r
 import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;\r
 import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;\r
 import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\r
@@ -33,16 +34,16 @@ public class EngineWrapper {
     private EngineService engineService;\r
 \r
     public String deployEngine(CorrelationDeployRule4Engine correlationRule) throws CorrelationException {\r
-        Response response;\r
+        HttpResponse response;\r
         try {\r
             response = engineService.deploy(correlationRule);\r
         } catch (Exception e) {\r
             throw new CorrelationException("Failed to call the rule deployment RESTful API.", e);\r
         }\r
-        if (response.getStatus() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
+        if (response.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
             log.info("Succeeded in calling the rule deployment RESTful API from the engine management service.");\r
             try {\r
-                JSONObject json = JSONObject.fromObject(response.readEntity(String.class));\r
+                JSONObject json = JSONObject.fromObject(HttpsUtils.extractResponseEntity(response));\r
                 return json.get(RuleMgtConstant.PACKAGE).toString();\r
             } catch (Exception e) {\r
                 throw new CorrelationException("Failed to parse the value returned by the engine management service.", e);\r
@@ -53,13 +54,13 @@ public class EngineWrapper {
     }\r
 \r
     public boolean deleteRuleFromEngine(String packageName) throws CorrelationException {\r
-        Response response;\r
+        HttpResponse response;\r
         try {\r
             response = engineService.delete(packageName);\r
         } catch (Exception e) {\r
             throw new CorrelationException("Failed to call the rule deleting RESTful API.", e);\r
         }\r
-        if (response.getStatus() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
+        if (response.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
             log.info("Succeeded in calling the rule deleting RESTful API from the engine management service.");\r
             return true;\r
         } else {\r
@@ -70,17 +71,17 @@ public class EngineWrapper {
     public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine)\r
             throws CorrelationException {\r
         log.info("Rule Contents: " + correlationCheckRule4Engine.getContent());\r
-        Response response;\r
+        HttpResponse response;\r
         try {\r
             response = engineService.check(correlationCheckRule4Engine);\r
         } catch (Exception e) {\r
             throw new CorrelationException("Failed to call the rule verification RESTful API.", e);\r
         }\r
-        if (response.getStatus() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
+        if (response.getStatusLine().getStatusCode() == RuleMgtConstant.RESPONSE_STATUS_OK) {\r
             log.info("Succeeded in calling the rule verification RESTful API from the engine management service.");\r
             return true;\r
         } else {\r
-            log.info(response.getStatus() + " " + response.getStatusInfo() + " " + response.getEntity());\r
+            log.info(response.getStatusLine().getStatusCode() + " " + response.getEntity());\r
             throw new CorrelationException("Failed to verify the rule. The contents of the rule are invalid.");\r
         }\r
     }\r