diff options
Diffstat (limited to 'server/src/main/java/org/onap/usecaseui/server/service')
2 files changed, 12 insertions, 10 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java index 372a0c1b..bebc8121 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java @@ -778,14 +778,18 @@ public class IntentInstanceServiceImpl implements IntentInstanceService { } private IntentInstance assembleIntentInstanceFormSliceInfo(IntentInstance instance, Object body) { - JSONObject jsonObject = new JSONObject((Map) body); - JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info"); - String intent_content = slicingOrderInfo.getString("intentContent"); - slicingOrderInfo.remove("intentContent"); - instance.setIntentConfig(slicingOrderInfo.toJSONString()); - instance.setIntentContent(intent_content); - instance.setIntentName(slicingOrderInfo.getString("name")); - return instance; + if(body instanceof Map){ + Map map = (Map) body; + JSONObject jsonObject = new JSONObject(map); + JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info"); + String intent_content = slicingOrderInfo.getString("intentContent"); + slicingOrderInfo.remove("intentContent"); + instance.setIntentConfig(slicingOrderInfo.toJSONString()); + instance.setIntentContent(intent_content); + instance.setIntentName(slicingOrderInfo.getString("name")); + return instance; + } + return new IntentInstance(); } diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java index 9124cca0..ebebba6c 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/SotnServiceQryServiceImpl.java @@ -18,7 +18,6 @@ package org.onap.usecaseui.server.service.lcm.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import okhttp3.ResponseBody; -import org.json.simple.parser.JSONParser; import org.onap.usecaseui.server.bean.activateEdge.ServiceInstance; import org.onap.usecaseui.server.bean.lcm.sotne2eservice.ModelConfig; import org.onap.usecaseui.server.bean.lcm.sotne2eservicemonitor.ResponseServiceInstanceWrapper; @@ -65,7 +64,6 @@ public class SotnServiceQryServiceImpl implements SotnServiceQryService { //serviceType = "generic"; ObjectMapper mapper = new ObjectMapper(); - JSONParser parser = new JSONParser(); try { Response<ResponseBody> response = aaiService.listServiceInstances(customerid, serviceType).execute(); |