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=f07d8aca13657d58f7008561812e9aa31541fa7c;hb=af62330fbd26c576564a4170b2ff271ca606ee93;hp=6c0d732b2b4d2a852da3c0bc20435a6ff08d83be;hpb=a9e01a4e720ff10684a9c46e9e8ab85848d3b3a7;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 6c0d732..f07d8ac 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,5 +1,5 @@ /** - * Copyright 2017 ZTE Corporation. + * Copyright 2017-2021 ZTE Corporation. *
* 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
@@ -13,40 +13,22 @@
*/
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.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
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
public class DcaeConfigurationPolling implements Runnable {
@@ -85,12 +67,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 build http client. " + e.getMessage(), e);
+ log.error("Failed to get deployed rules from the rule management module: " + e.getMessage(), e);
}
}
if (ruleQueryListResponse != null) {
@@ -105,53 +83,17 @@ public class DcaeConfigurationPolling implements Runnable {
}
}
- public RuleQueryListResponse getAllCorrelationRules() throws CorrelationException, IOException {
- HashMap