X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Frule-management.git;a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fdcae%2FDcaeConfigurationPolling.java;h=8049e8f3f4b59892ae9bbb6cc673b31e457422d0;hp=e8fa8b0b6653a37764df36562ae938df69c1331a;hb=5cc6fc1a762c547f420ce281deac69f02f6c2b83;hpb=9c61e307545d68ca37be2548a3ab7f2ef4f73ad8

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
index e8fa8b0..8049e8f 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
@@ -1,11 +1,11 @@
 /**
- * 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
- *
+ * <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. See the License for the specific language governing permissions and limitations under
@@ -13,35 +13,24 @@
  */
 package org.onap.holmes.rulemgt.dcae;
 
-import com.alibaba.fastjson.JSON;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import javax.ws.rs.core.MediaType;
+
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.StringEntity;
 import org.onap.holmes.common.dcae.DcaeConfigurationQuery;
 import org.onap.holmes.common.dcae.entity.DcaeConfigurations;
 import org.onap.holmes.common.dcae.entity.Rule;
 import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.GsonUtil;
-import org.onap.holmes.common.utils.HttpsUtils;
+import org.onap.holmes.common.utils.JerseyClient;
 import org.onap.holmes.common.utils.Md5Util;
 import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;
 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;
 import org.onap.holmes.rulemgt.bean.response.RuleResult4API;
 
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
 @Slf4j
+@Deprecated
 public class DcaeConfigurationPolling implements Runnable {
 
     public static final long POLLING_PERIOD = 30 * 1000L;
@@ -64,8 +53,8 @@ public class DcaeConfigurationPolling implements Runnable {
         try {
             dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname);
             String md5 = Md5Util.md5(dcaeConfigurations);
-            if (prevResult && prevConfigMd5.equals(md5)){
-                log.info("Operation aborted due to identical Configurations.");
+            if (prevResult && prevConfigMd5.equals(md5)) {
+                log.info("Operation aborted due to identical configurations.");
                 return;
             }
             prevConfigMd5 = md5;
@@ -79,10 +68,8 @@ public class DcaeConfigurationPolling implements Runnable {
         if (dcaeConfigurations != null) {
             try {
                 ruleQueryListResponse = getAllCorrelationRules();
-            } catch (CorrelationException e) {
-                log.error("Failed to get right response!" + e.getMessage(), e);
-            } catch (IOException e) {
-                log.error("Failed to extract response entity. " + e.getMessage(), e);
+            } catch (Exception e) {
+                log.error("Failed to get deployed rules from the rule management module: " + e.getMessage(), e);
             }
         }
         if (ruleQueryListResponse != null) {
@@ -97,39 +84,17 @@ public class DcaeConfigurationPolling implements Runnable {
         }
     }
 
-    public RuleQueryListResponse getAllCorrelationRules() throws CorrelationException, IOException {
-              HashMap<String, String> headers = new HashMap<>();
-        headers.put("Content-Type", MediaType.APPLICATION_JSON);
-        HttpResponse httpResponse = HttpsUtils.get(url, headers);
-        String response = HttpsUtils.extractResponseEntity(httpResponse);
-        return JSON.parseObject(response,RuleQueryListResponse.class);
+    private RuleQueryListResponse getAllCorrelationRules() {
+        return JerseyClient.newInstance().get(url, RuleQueryListResponse.class);
     }
 
     private boolean addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException {
         boolean suc = false;
         for (Rule rule : dcaeConfigurations.getDefaultRules()) {
             RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(rule);
-            String content = "";
-            try {
-                content = GsonUtil.beanToJson(ruleCreateRequest);
-            } catch (Exception e) {
-                throw new CorrelationException("Failed to convert the message object to a json string.", e);
-            }
-            HashMap<String, String> headers = new HashMap<>();
-            headers.put("Content-Type", MediaType.APPLICATION_JSON);
-            headers.put("Accept", MediaType.APPLICATION_JSON);
-            HttpResponse httpResponse;
-            try {
-                httpResponse = HttpsUtils
-                        .put(url, headers, new HashMap<>(), new StringEntity(content));
-            } catch (UnsupportedEncodingException e) {
-                throw new CorrelationException("Failed to create https entity.", e);
-            } catch (Exception e) {
-                throw new CorrelationException(e.getMessage());
-            }
-            if (httpResponse != null) {
-                suc = httpResponse.getStatusLine().getStatusCode() == 200;
-            }
+            suc = JerseyClient.newInstance().header("Accept", MediaType.APPLICATION_JSON)
+                    .put(url, Entity.json(ruleCreateRequest)) != null;
+
             if (!suc) {
                 break;
             }
@@ -137,15 +102,10 @@ public class DcaeConfigurationPolling implements Runnable {
         return suc;
     }
 
-    private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs){
-        ruleResult4APIs.forEach(correlationRule ->{
-            HashMap<String, String> headers = new HashMap<>();
-            headers.put("Content-Type", MediaType.APPLICATION_JSON);
-            try {
-                HttpsUtils.delete(url + "/" + correlationRule.getRuleId(), headers);
-            } catch (Exception e) {
-                log.warn("Failed to delete rule, the rule id is : " + correlationRule.getRuleId()
-                        + " exception messge is : " + e.getMessage(), e);
+    private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs) {
+        ruleResult4APIs.forEach(correlationRule -> {
+            if (null == JerseyClient.newInstance().delete(url + "/" + correlationRule.getRuleId())) {
+                log.warn("Failed to delete rule, the rule id is: {}", correlationRule.getRuleId());
             }
         });
     }