X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fbolt%2Fenginebolt%2FEngineWrapper.java;h=7c927c0097ef864d581520b5c1e8790431278c10;hb=8182df37f0308ad04433a47570e7ca9612fcfd84;hp=183e52f362fc79b84d33d73af1115862ec0c6b41;hpb=3a2c70f1ee024dbad4dc091d3105064641908e1d;p=holmes%2Frule-management.git

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 183e52f..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,12 +1,12 @@
 /**
- * Copyright 2017 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.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,16 +15,16 @@
  */
 package org.onap.holmes.rulemgt.bolt.enginebolt;
 
-import javax.inject.Inject;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONObject;
-import org.apache.http.HttpResponse;
 import org.jvnet.hk2.annotations.Service;
-import org.onap.holmes.common.utils.HttpsUtils;
+import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;
 import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;
 import org.onap.holmes.rulemgt.constant.RuleMgtConstant;
-import org.onap.holmes.common.exception.CorrelationException;
+
+import javax.inject.Inject;
 
 @Service
 @Slf4j
@@ -33,18 +33,12 @@ public class EngineWrapper {
     @Inject
     private EngineService engineService;
 
-    public String deployEngine(CorrelationDeployRule4Engine correlationRule) throws CorrelationException {
-        HttpResponse response;
-        try {
-            response = engineService.deploy(correlationRule);
-        } 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.");
+    public String deployEngine(CorrelationDeployRule4Engine correlationRule, String ip) throws CorrelationException {
+        String response = engineService.deploy(correlationRule, ip);
+        if (response != null) {
             try {
-                JSONObject json = JSONObject.fromObject(HttpsUtils.extractResponseEntity(response));
-                return json.get(RuleMgtConstant.PACKAGE).toString();
+                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);
             }
@@ -53,36 +47,20 @@ public class EngineWrapper {
         }
     }
 
-    public boolean deleteRuleFromEngine(String packageName) throws CorrelationException {
-        HttpResponse response;
-        try {
-            response = engineService.delete(packageName);
-        } 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.");
+    public boolean deleteRuleFromEngine(String packageName, String ip) throws CorrelationException {
+        if (engineService.delete(packageName, ip)) {
             return true;
         } else {
             throw new CorrelationException("Failed to delete the rule!");
         }
     }
 
-    public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine)
+    public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine, String ip)
             throws CorrelationException {
         log.info("Rule Contents: " + correlationCheckRule4Engine.getContent());
-        HttpResponse response;
-        try {
-            response = engineService.check(correlationCheckRule4Engine);
-        } 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;
     }
 }