diff options
| author |   subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-11-17 12:45:58 +0530 |
|---|---|---|
| committer | subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-11-17 13:25:43 +0530 |
| commit | c9bdf8cf227a76d1130c327f6497a455f779955e (patch) | |
| tree | 956a38fcf470a833050fc1902c2e30713bafd472 | |
| parent | 351946d6f5ef7954fd7a09a59050d700997826eb (diff) | |
Fix request resource building
Fix request resource building.
Change-Id: I64161359ae1b3d36ef3647382fab615d6afd6647
Issue-ID: SO-689
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2 files changed, 18 insertions, 8 deletions
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java index 71937245bc..f842e78916 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java @@ -84,6 +84,14 @@ public class SDNCRestClient{ msoLogger.debug("BPEL Request:" + bpelRequest.toString()); + // Added delay to allow completion of create request to SDNC + // before executing activate of create request. + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + String action = bpelRequest.getRequestHeader().getSvcAction(); String operation = bpelRequest.getRequestHeader().getSvcOperation(); String bpelReqId = bpelRequest.getRequestHeader().getRequestId(); diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java index 1989ca8cf9..b4851ee7a4 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java @@ -233,14 +233,16 @@ public class ResourceRequestBuilder { private static Object getValue(Object value, Map<String, Object> serviceInputs, List<Input> servInputs) { if(value instanceof Map) { - Map<String, Object> valueMap = new HashMap<>(); - - Map<String, Object> propertyMap = (Map<String, Object>)value; - - for(String key : propertyMap.keySet()) { - valueMap.put(key, getValue(propertyMap.get(key), serviceInputs, servInputs)); - } - return valueMap; // return if the value is nested hashmap + // currently this logic handles only one level of nesting. +// Map<String, Object> valueMap = new HashMap<>(); +// +// Map<String, Object> propertyMap = (Map<String, Object>)value; +// +// for(String key : propertyMap.keySet()) { +// valueMap.put(key, getValue(propertyMap.get(key), serviceInputs, servInputs)); +// } +// return valueMap; // return if the value is nested hashmap + return ((LinkedHashMap) value).values().toArray()[0]; } else if(value instanceof GetInput) { String inputName = ((GetInput)value).getInputName(); |