X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fdcae%2Futils%2FDcaeConfigurationParser.java;h=2c878b0f1b89bea3e9088d299fac6ea60722a063;hb=ec0a5672d39fc3caed1292abe1c4e1c2f814d2e5;hp=1143263bd581dd8b9a9504b028c709382c85f24f;hpb=e8643ee7b7fb72f55df742dd7e075469fbca43c8;p=holmes%2Fcommon.git diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java index 1143263..2c878b0 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParser.java @@ -15,12 +15,13 @@ */ package org.onap.holmes.common.dcae.utils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import java.util.Set; import java.util.stream.Stream; -import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.onap.holmes.common.dcae.entity.DcaeConfigurations; import org.onap.holmes.common.dcae.entity.Rule; @@ -44,7 +45,7 @@ public class DcaeConfigurationParser { JSONObject jsonObject = null; try { - jsonObject = JSONObject.fromObject(jsonStr); + jsonObject = JSON.parseObject(jsonStr); } catch (Exception e) { throw new CorrelationException(e.getMessage(), e); } @@ -56,7 +57,7 @@ public class DcaeConfigurationParser { JSONObject finalJsonObject = jsonObject; Stream.of(jsonObject.keySet().toArray(new String[0])) .filter(key -> !OBJECT_ATTRS.contains(key)) - .forEach(key -> ret.put(key.toString(), finalJsonObject.getString(String.valueOf(key)))); + .forEach(key -> ret.put(key, finalJsonObject.getString(String.valueOf(key)))); return ret; }