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