X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fdcae%2FDcaeConfigurationPolling.java;h=036bd9ae4f10109fb4f8cb5b24c5545575b13160;hb=8182df37f0308ad04433a47570e7ca9612fcfd84;hp=493011c973a57738ccc32b6c834bf22e3d962beb;hpb=126cfb2bef37fff35e6c1e3f3c7b03787fd923d8;p=holmes%2Frule-management.git

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 493011c..036bd9a 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,30 @@
  */
 package org.onap.holmes.rulemgt.dcae;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.List;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+
 import lombok.extern.slf4j.Slf4j;
-import org.glassfish.jersey.client.ClientConfig;
-import org.onap.holmes.common.config.MicroServiceConfig;
 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.dcae.utils.DcaeConfigurationParser;
 import org.onap.holmes.common.exception.CorrelationException;
+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
 public class DcaeConfigurationPolling implements Runnable {
 
-    public static long POLLING_PERIOD = 30 * 1000L;
+    public static final long POLLING_PERIOD = 30 * 1000L;
 
     private String hostname;
 
-    private String url = "http://127.0.0.1:9101/api/holmes-rule-mgmt/v1/rule";
+    private String url = "https://127.0.0.1:9101/api/holmes-rule-mgmt/v1/rule";
 
     public DcaeConfigurationPolling(String hostname) {
         this.hostname = hostname;
@@ -49,63 +44,68 @@ public class DcaeConfigurationPolling implements Runnable {
 
     private String prevConfigMd5 = Md5Util.md5(null);
 
+    private boolean prevResult = false;
+
     @Override
     public void run() {
         DcaeConfigurations dcaeConfigurations = null;
         try {
             dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname);
             String md5 = Md5Util.md5(dcaeConfigurations);
-            if (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;
+            prevResult = false;
         } catch (CorrelationException e) {
             log.error("Failed to fetch DCAE configurations. " + e.getMessage(), e);
-        } catch (JsonProcessingException e) {
+        } catch (Exception e) {
             log.info("Failed to generate the MD5 information for new configurations.", e);
         }
+        RuleQueryListResponse ruleQueryListResponse = null;
         if (dcaeConfigurations != null) {
-            RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules();
+            try {
+                ruleQueryListResponse = getAllCorrelationRules();
+            } catch (Exception e) {
+                log.error("Failed to get deployed rules from the rule management module: " + e.getMessage(), e);
+            }
+        }
+        if (ruleQueryListResponse != null) {
             List<RuleResult4API> ruleResult4APIs = ruleQueryListResponse.getCorrelationRules();
             deleteAllCorrelationRules(ruleResult4APIs);
             try {
-                addAllCorrelationRules(dcaeConfigurations);
+                prevResult = addAllCorrelationRules(dcaeConfigurations);
             } catch (CorrelationException e) {
                 log.error("Failed to add rules. " + e.getMessage(), e);
+                prevResult = false;
             }
         }
     }
 
     private RuleQueryListResponse getAllCorrelationRules() {
-        Client client = ClientBuilder.newClient(new ClientConfig());
-        WebTarget webTarget = client.target(url);
-        return webTarget.request("application/json").get()
-                .readEntity(RuleQueryListResponse.class);
+        return new JerseyClient().get(url, RuleQueryListResponse.class);
     }
 
-    private void addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException {
+    private boolean addAllCorrelationRules(DcaeConfigurations dcaeConfigurations) throws CorrelationException {
+        boolean suc = false;
         for (Rule rule : dcaeConfigurations.getDefaultRules()) {
             RuleCreateRequest ruleCreateRequest = getRuleCreateRequest(rule);
-            Client client = ClientBuilder.newClient(new ClientConfig());
-            ObjectMapper mapper = new ObjectMapper();
-            String content = null;
-            try {
-                content = mapper.writeValueAsString(ruleCreateRequest);
-            } catch (JsonProcessingException e) {
-                throw new CorrelationException("Failed to convert the message object to a json string.", e);
+            suc = new JerseyClient().header("Accept", MediaType.APPLICATION_JSON)
+                    .put(url, Entity.json(ruleCreateRequest)) != null;
+
+            if (!suc) {
+                break;
             }
-            WebTarget webTarget = client.target(url);
-            webTarget.request(MediaType.APPLICATION_JSON)
-                    .put(Entity.entity(content, MediaType.APPLICATION_JSON));
         }
+        return suc;
     }
 
-    private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs){
-        ruleResult4APIs.forEach(correlationRule ->{
-            Client client = ClientBuilder.newClient(new ClientConfig());
-            WebTarget webTarget = client.target(url + "/" + correlationRule.getRuleId());
-            webTarget.request(MediaType.APPLICATION_JSON).delete();
+    private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs) {
+        ruleResult4APIs.forEach(correlationRule -> {
+            if (null == new JerseyClient().delete(url + "/" + correlationRule.getRuleId())) {
+                log.warn("Failed to delete rule, the rule id is: {}", correlationRule.getRuleId());
+            }
         });
     }