From 09940a4aacf2fb32eddc85dd49f5a17dedff9de0 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Fri, 1 Mar 2019 12:48:00 -0500
Subject: vnf spin up gr api vnf s base module fails

map object representations of json back to json strings
marshal all objects to json strings before sending
all input params converted to Map<String, Object>
Updated userParams map from HashMap<String, String> to Map<String,
Object> as HashMap<String, String> userParams was causing VNF spin up
to fail. Input json in Userparams was not accepted as a valid json
format. Updated other files that were affected by this change.

Change-Id: I0c00fc00c4c11b54ace4df7be8d5bfc80d41d130
Issue-ID: SO-1582
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../so/bpmn/servicedecomposition/generalobjects/RequestContext.java | 6 +++---
 .../so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java | 4 ++--
 .../servicedecomposition/tasks/BBInputSetupMapperLayerTest.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'bpmn/MSOCommonBPMN')

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
index d37c8d13f3..cd66e512a5 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
@@ -43,7 +43,7 @@ public class RequestContext implements Serializable{
 	@JsonProperty("subscription-service-type")
 	private String subscriptionServiceType;
 	@JsonProperty("user-params")
-	private HashMap<String, String> userParams;
+	private Map<String, Object> userParams = new HashMap<>();
 	@JsonProperty("action")
 	private String action;
 	@JsonProperty("callback-url")
@@ -87,10 +87,10 @@ public class RequestContext implements Serializable{
 	public void setSubscriptionServiceType(String subscriptionServiceType) {
 		this.subscriptionServiceType = subscriptionServiceType;
 	}
-	public HashMap<String, String> getUserParams() {
+	public Map<String, Object> getUserParams() {
 		return userParams;
 	}
-	public void setUserParams(HashMap<String, String> userParams) {
+	public void setUserParams(Map<String, Object> userParams) {
 		this.userParams = userParams;
 	}
 	public String getAction() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index d6597ecb1a..81a504da4a 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -355,8 +355,8 @@ public class BBInputSetupMapperLayer {
 		return requestParams;
 	}
 	
-	protected HashMap<String,String> mapNameValueUserParams(org.onap.so.serviceinstancebeans.RequestParameters requestParameters) {		
-		HashMap<String,String> userParamsResult = new HashMap<String,String>();
+	protected Map<String,Object> mapNameValueUserParams(org.onap.so.serviceinstancebeans.RequestParameters requestParameters) {		
+		Map<String,Object> userParamsResult = new HashMap<String,Object>();
 		if (requestParameters.getUserParams() != null) {
 			List<Map<String, Object>> userParams = requestParameters.getUserParams();
 			for (Map<String, Object> userParamsMap : userParams) {
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
index 7e76e52959..753a354d95 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -643,7 +643,7 @@ public class BBInputSetupMapperLayerTest {
 	@Test
 	public void testMapNameValueUserParams() throws IOException {		
 		RequestDetails requestDetails = mapper.readValue(new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContext.json"), RequestDetails.class);
-		HashMap<String,String> actual = bbInputSetupMapperLayer.mapNameValueUserParams(requestDetails.getRequestParameters());
+		Map<String,Object> actual = bbInputSetupMapperLayer.mapNameValueUserParams(requestDetails.getRequestParameters());
 
 		assertTrue(actual.containsKey("name1"));
 		assertTrue(actual.containsValue("value1"));
-- 
cgit 1.2.3-korg