From 959493d3274d2f2749586248cf31ee12b730e2af Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Fri, 26 Oct 2018 15:05:42 -0400
Subject: Bug fixes October 26th

Set non-custom health diagnostic check code to a default value.
created custom java serialization for SimpleUri
changed property value for cloud-owner in unit test
converted aai call to use the AAI Client
Correct a JUnit data file to include userParams values that are
expected to be set.
Set userParams on requestContext to parameters that need to be passed
to downstream systems.

Change-Id: I3974691875ef967f90a15f076ae27bc0cd76ee8e
Issue-ID: SO-1169
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../tasks/BBInputSetupMapperLayer.java                 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'bpmn/MSOCommonBPMN/src/main')

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 d463fde09c..0f52c96d0e 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
@@ -22,6 +22,7 @@ package org.onap.so.bpmn.servicedecomposition.tasks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -84,6 +85,8 @@ import org.springframework.stereotype.Component;
 
 @Component("BBInputSetupMapperLayer")
 public class BBInputSetupMapperLayer {
+	private static final String USER_PARAM_NAME_KEY = "name";
+    private static final String USER_PARAM_VALUE_KEY = "value";
 
 	private static final MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL,
 			BBInputSetupMapperLayer.class);
@@ -332,6 +335,7 @@ public class BBInputSetupMapperLayer {
 		if (null != requestParameters) {
 			context.setSubscriptionServiceType(requestParameters.getSubscriptionServiceType());
 			context.setRequestParameters(this.mapRequestParameters(requestDetails.getRequestParameters()));
+			context.setUserParams(this.mapNameValueUserParams(requestDetails.getRequestParameters()));
 		}
 		return context;
 	}
@@ -344,6 +348,20 @@ public class BBInputSetupMapperLayer {
 		requestParams.setPayload(requestParameters.getPayload());
 		return requestParams;
 	}
+	
+	protected HashMap<String,String> mapNameValueUserParams(org.onap.so.serviceinstancebeans.RequestParameters requestParameters) {		
+		HashMap<String,String> userParamsResult = new HashMap<String,String>();
+		if (requestParameters.getUserParams() != null) {
+			List<Map<String, Object>> userParams = requestParameters.getUserParams();
+			for (Map<String, Object> userParamsMap : userParams) {
+				if ( userParamsMap.containsKey(USER_PARAM_NAME_KEY) && (userParamsMap.get(USER_PARAM_NAME_KEY) instanceof String)
+						&& userParamsMap.containsKey(USER_PARAM_VALUE_KEY) && (userParamsMap.get(USER_PARAM_VALUE_KEY) instanceof String)) {
+					userParamsResult.put((String) userParamsMap.get(USER_PARAM_NAME_KEY), (String) userParamsMap.get(USER_PARAM_VALUE_KEY));
+				}
+			}
+		}
+		return userParamsResult;
+	}
 
 	protected OrchestrationContext mapOrchestrationContext(RequestDetails requestDetails) {
 		OrchestrationContext context = new OrchestrationContext();
-- 
cgit 1.2.3-korg