Removed Dependency: httpclient

[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 4fe5896..7c927c0 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
@@ -1,5 +1,5 @@
 /**\r
- * Copyright 2017-2020 ZTE Corporation.\r
+ * Copyright 2017-2021 ZTE Corporation.\r
  * <p>\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -18,10 +18,8 @@ package org.onap.holmes.rulemgt.bolt.enginebolt;
 import com.google.gson.JsonObject;\r
 import com.google.gson.JsonParser;\r
 import lombok.extern.slf4j.Slf4j;\r
-import org.apache.http.HttpResponse;\r
 import org.jvnet.hk2.annotations.Service;\r
 import org.onap.holmes.common.exception.CorrelationException;\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
@@ -36,16 +34,10 @@ public class EngineWrapper {
     private EngineService engineService;\r
 \r
     public String deployEngine(CorrelationDeployRule4Engine correlationRule, String ip) throws CorrelationException {\r
-        HttpResponse response;\r
-        try {\r
-            response = engineService.deploy(correlationRule, ip);\r
-        } catch (Exception e) {\r
-            throw new CorrelationException("Failed to call the rule deployment RESTful API.", e);\r
-        }\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
+        String response = engineService.deploy(correlationRule, ip);\r
+        if (response != null) {\r
             try {\r
-                JsonObject json = JsonParser.parseString(HttpsUtils.extractResponseEntity(response)).getAsJsonObject();\r
+                JsonObject json = JsonParser.parseString(response).getAsJsonObject();\r
                 return json.get(RuleMgtConstant.PACKAGE).getAsString();\r
             } catch (Exception e) {\r
                 throw new CorrelationException("Failed to parse the value returned by the engine management service.", e);\r
@@ -56,14 +48,7 @@ public class EngineWrapper {
     }\r
 \r
     public boolean deleteRuleFromEngine(String packageName, String ip) throws CorrelationException {\r
-        HttpResponse response;\r
-        try {\r
-            response = engineService.delete(packageName, ip);\r
-        } catch (Exception e) {\r
-            throw new CorrelationException("Failed to call the rule deleting RESTful API.", e);\r
-        }\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
+        if (engineService.delete(packageName, ip)) {\r
             return true;\r
         } else {\r
             throw new CorrelationException("Failed to delete the rule!");\r
@@ -73,18 +58,9 @@ public class EngineWrapper {
     public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine, String ip)\r
             throws CorrelationException {\r
         log.info("Rule Contents: " + correlationCheckRule4Engine.getContent());\r
-        HttpResponse response;\r
-        try {\r
-            response = engineService.check(correlationCheckRule4Engine, ip);\r
-        } catch (Exception e) {\r
-            throw new CorrelationException("Failed to call the rule verification RESTful API.", e);\r
-        }\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.getStatusLine().getStatusCode() + " " + response.getEntity());\r
+        if (!engineService.check(correlationCheckRule4Engine, ip)) {\r
             throw new CorrelationException("Failed to verify the rule. The contents of the rule are invalid.");\r
         }\r
+        return true;\r
     }\r
 }\r