diff options
author | YiLi <li.yi101@zte.com.cn> | 2018-02-27 15:26:41 +0800 |
---|---|---|
committer | YiLi <li.yi101@zte.com.cn> | 2018-02-27 17:45:43 +0800 |
commit | d2e0902630ccf06bb466360e036212f5060b9055 (patch) | |
tree | 6d87843690537bbd90b5577e0f8e489fbe268ad4 /rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | |
parent | 4be2442687589c409a469188696d7605979881ee (diff) |
Replace Jackson with GSON
Change-Id: Ifffe7aca1116e2706d66ecb682697df521785b57
Issue-ID: HOLMES-115
Signed-off-by: YiLi <li.yi101@zte.com.cn>
Diffstat (limited to 'rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java')
-rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | 21 |
1 files changed, 7 insertions, 14 deletions
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 97da7ee..d0513ca 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 @@ -13,7 +13,6 @@ */ package org.onap.holmes.rulemgt.dcae; -import com.fasterxml.jackson.core.JsonProcessingException; import java.util.List; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; @@ -27,7 +26,7 @@ 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.JacksonUtil; +import org.onap.holmes.common.utils.GsonUtil; import org.onap.holmes.common.utils.Md5Util; import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; @@ -56,7 +55,7 @@ public class DcaeConfigurationPolling implements Runnable { try { dcaeConfigurations = DcaeConfigurationQuery.getDcaeConfigurations(hostname); String md5 = Md5Util.md5(dcaeConfigurations); - if (prevResult && prevConfigMd5.equals(md5)){ + if (prevResult && prevConfigMd5.equals(md5)) { log.info("Operation aborted due to identical Configurations."); return; } @@ -64,8 +63,6 @@ public class DcaeConfigurationPolling implements Runnable { prevResult = false; } catch (CorrelationException e) { log.error("Failed to fetch DCAE configurations. " + e.getMessage(), e); - } catch (JsonProcessingException e) { - log.info("Failed to generate the MD5 information for new configurations.", e); } if (dcaeConfigurations != null) { RuleQueryListResponse ruleQueryListResponse = getAllCorrelationRules(); @@ -87,17 +84,13 @@ public class DcaeConfigurationPolling implements Runnable { .readEntity(RuleQueryListResponse.class); } - private boolean 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()); - String content = null; - try { - content = JacksonUtil.beanToJson(ruleCreateRequest); - } catch (JsonProcessingException e) { - throw new CorrelationException("Failed to convert the message object to a json string.", e); - } + String content = GsonUtil.beanToJson(ruleCreateRequest); WebTarget webTarget = client.target(url); Response response = webTarget.request(MediaType.APPLICATION_JSON) .put(Entity.entity(content, MediaType.APPLICATION_JSON)); @@ -109,8 +102,8 @@ public class DcaeConfigurationPolling implements Runnable { return suc; } - private void deleteAllCorrelationRules(List<RuleResult4API> ruleResult4APIs){ - ruleResult4APIs.forEach(correlationRule ->{ + 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(); |