From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001
From: Arthur Martella <amartell@research.att.com>
Date: Fri, 8 Sep 2017 13:27:46 -0400
Subject: 1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
---
 .../WebContent/WEB-INF/jboss-deployment-structure.xml                | 5 +++++
 .../mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'adapters/mso-sdnc-adapter')

diff --git a/adapters/mso-sdnc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-sdnc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 88d5024f0d..f7fc214469 100644
--- a/adapters/mso-sdnc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-sdnc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
 			<module name="org.apache.log4j" />
 			<module name="org.slf4j" />
 			<module name="org.slf4j.impl" />
+			<module name="org.jboss.resteasy.resteasy-jackson-provider" />
+			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
 		</exclusions>
 		<dependencies>
 			    <module name="org.jboss.jandex" slot="main" />
                 <module name="org.javassist" slot="main" />
                 <module name="org.antlr" slot="main" />
                 <module name="org.dom4j" slot="main" />
+                <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+                <!-- This module contain the ProviderBase class: -->
+                <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
 		</dependencies>
 	</deployment>
 </jboss-deployment-structure>
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
index bd864d085a..be6fc34d44 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestConnector.java
@@ -129,7 +129,7 @@ public class SDNCServiceRequestConnector extends SDNCConnector {
 
 			// ack-final-indicator is optional: default to "Y".
 
-			if (ackFinalIndicator == null) {
+			if (ackFinalIndicator == null || ackFinalIndicator.trim().isEmpty()) {
 				ackFinalIndicator = "Y";
 			}
 
@@ -184,6 +184,7 @@ public class SDNCServiceRequestConnector extends SDNCConnector {
 
                 response.addParam(tagName, tagValue);
             }
+
 			return response;
 		} catch (ParseException e) {
 			throw e;
-- 
cgit 1.2.3-korg