/**\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017-2020 ZTE Corporation.\r
*\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
*/\r
package org.onap.holmes.rulemgt.bolt.enginebolt;\r
\r
-import javax.inject.Inject;\r
+import com.google.gson.JsonObject;\r
+import com.google.gson.JsonParser;\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.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
-import org.onap.holmes.common.exception.CorrelationException;\r
+\r
+import javax.inject.Inject;\r
\r
@Service\r
@Slf4j\r
@Inject\r
private EngineService engineService;\r
\r
- public String deployEngine(CorrelationDeployRule4Engine correlationRule) throws CorrelationException {\r
+ public String deployEngine(CorrelationDeployRule4Engine correlationRule,String ip) throws CorrelationException {\r
HttpResponse response;\r
try {\r
- response = engineService.deploy(correlationRule);\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
try {\r
- JSONObject json = JSONObject.fromObject(HttpsUtils.extractResponseEntity(response));\r
- return json.get(RuleMgtConstant.PACKAGE).toString();\r
+ JsonObject json = JsonParser.parseString(HttpsUtils.extractResponseEntity(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
}\r
}\r
}\r
\r
- public boolean deleteRuleFromEngine(String packageName) throws CorrelationException {\r
+ public boolean deleteRuleFromEngine(String packageName,String ip) throws CorrelationException {\r
HttpResponse response;\r
try {\r
- response = engineService.delete(packageName);\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
}\r
}\r
\r
- public boolean checkRuleFromEngine(CorrelationCheckRule4Engine correlationCheckRule4Engine)\r
+ 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);\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