Merge "Reorder modifiers"

[so.git] / adapters / mso-sdnc-adapter / src / main / java / org / openecomp / mso / adapters / sdnc / sdncrest / SDNCServiceRequestTask.java

diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
index e52a426..f3ae6d6 100644 (file)
--- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCServiceRequestTask.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -138,6 +138,14 @@ public class SDNCServiceRequestTask implements Runnable {
 
                        Element requestInformation = addChild(root, "request-information");
                        addTextChild(requestInformation, "request-id", request.getRequestInformation().getRequestId());
+                       if(request.getRequestInformation().getRequestAction()!= null) {
+                               addTextChild(requestInformation, "request-action",
+                                               request.getRequestInformation().getRequestAction());
+                       }
+                       if(request.getRequestInformation().getRequestSubAction()!= null) {
+                               addTextChild(requestInformation, "request-sub-action",
+                                               request.getRequestInformation().getRequestSubAction());
+                       }
                        addTextChild(requestInformation, "source", request.getRequestInformation().getSource());
                        addTextChild(requestInformation, "notification-url", request.getRequestInformation().getNotificationUrl());
 
@@ -196,7 +204,7 @@ public class SDNCServiceRequestTask implements Runnable {
                } catch (Exception e) {
                        LOGGER.error(MessageEnum.RA_ERROR_CONVERT_XML2STR, "", "",
                                MsoLogger.ErrorCode.DataError, "Exception - domToStr", e);
-                       return(null);
+                       return null;
                }
 
                LOGGER.debug("Formatted SDNC service request XML:\n" + xml);