Merge Casablanca

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / onap / so / apihandlerinfra / OrchestrationRequests.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
index c809079..b65b82a 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
@@ -333,6 +333,10 @@ public class OrchestrationRequests {
               String startTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getStartTime()) + " GMT";
               request.setStartTime(startTimeStamp);
        }
+       if(iar.getEndTime() != null){
+          String endTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getEndTime()) + " GMT";
+          request.setFinishTime(endTimeStamp);
+       }
        String statusMessages = null;
        RequestStatus status = new RequestStatus();
        if(iar.getStatusMessage() != null){
@@ -340,28 +344,31 @@ public class OrchestrationRequests {
        }
        if(flowStatusMessage != null){
           if(statusMessages != null){
-                  statusMessages = statusMessages + "/";
+                  statusMessages = statusMessages + " " + "FLOW STATUS: " + flowStatusMessage;
+          }else{
+                  statusMessages = "FLOW STATUS: " + flowStatusMessage;
           }
-          statusMessages = statusMessages + "FLOW STATUS: " + flowStatusMessage;
        }
        if(retryStatusMessage != null){
           if(statusMessages != null){
-                  statusMessages = statusMessages + "/";
+                  statusMessages = statusMessages + " " + "RETRY STATUS: " + retryStatusMessage;
+          }else{
+                  statusMessages = "RETRY STATUS: " + retryStatusMessage;
           }
-          statusMessages = statusMessages + "RETRY STATUS: " + retryStatusMessage;
        }
        if(rollbackStatusMessage != null){
           if(statusMessages != null){
-                  statusMessages = statusMessages + "/";
+                  statusMessages = statusMessages + " " + "ROLLBACK STATUS: " + rollbackStatusMessage;
+          }else{
+                  statusMessages = "ROLLBACK STATUS: " + rollbackStatusMessage;
           }
-          statusMessages = statusMessages + "ROLLBACK STATUS: " + rollbackStatusMessage;
        }
        if(statusMessages != null){
           status.setStatusMessage(statusMessages);
        }
-       if(iar.getEndTime() != null){
-          String endTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getEndTime()) + " GMT";
-          status.setFinishTime(endTimeStamp);
+       if(iar.getModifyTime() != null){
+          String timeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getModifyTime()) + " GMT";
+          status.setTimeStamp(timeStamp);
        }