Merge "Update Tasks API with additional fields"

diff --combined bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
index d5e88a8,cf7290a..27fe33f
--- 1/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
--- 2/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ManualHandling.groovy
@@@ -20,9 -20,7 +20,9 @@@
   * ============LICENSE_END=========================================================
   */
  
 -package org.onap.so.bpmn.common.scripts;
 +package org.onap.so.bpmn.common.scripts
 +
 +import org.onap.so.logger.ErrorCode;
  
  import static org.apache.commons.lang3.StringUtils.*;
  
@@@ -46,6 -44,7 +46,6 @@@ import org.onap.so.bpmn.core.domain.Ser
  import org.onap.so.bpmn.core.json.JsonUtils
  import org.onap.so.client.ruby.*
  import org.onap.so.logger.MessageEnum
 -import org.onap.so.logger.MsoLogger
  import org.slf4j.Logger
  import org.slf4j.LoggerFactory
  
@@@ -158,6 -157,8 +158,8 @@@ public class ManualHandling extends Abs
                        taskVariables.put("buildingBlockName", buildingBlockName)
                        taskVariables.put("buildingBlockStep", buildingBlockStep)
                        taskVariables.put("validResponses", validResponses)
+                       taskVariables.put("description", "")
+                       taskVariables.put("timeout", "")
  
                        TaskService taskService = execution.getProcessEngineServices().getTaskService()
                        Task manualTask = taskService.newTask(taskId)
@@@ -212,6 -213,8 +214,8 @@@
                        taskVariables.put("buildingBlockName", buildingBlockName)
                        taskVariables.put("buildingBlockStep", buildingBlockStep)
                        taskVariables.put("validResponses", validResponses)
+                       taskVariables.put("description", "")
+                       taskVariables.put("timeout", "")
                        TaskService taskService = execution.getProcessEngineServices().getTaskService()
  
  
@@@ -287,7 -290,7 +291,7 @@@
                } catch (Exception e) {
                        logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
                                        'Caught exception in ' + method, "BPMN",
 -                                      MsoLogger.ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
 +                                      ErrorCode.UnknownError.getValue(), "Exception is:\n" + e);
                        exceptionUtil.buildAndThrowWorkflowException(execution, 2000, "Internal Error - Occured in" + method)
                }
  
@@@ -338,11 -341,11 +342,11 @@@
                } catch (BpmnError e) {
                        msg = "BPMN error in createAOTSTicket " + ex.getMessage()
                        logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), msg, "BPMN",
 -                                      MsoLogger.ErrorCode.UnknownError.getValue());
 +                                      ErrorCode.UnknownError.getValue());
                } catch (Exception ex){
                        msg = "Exception in createAOTSTicket " + ex.getMessage()
                        logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(), msg, "BPMN",
 -                                      MsoLogger.ErrorCode.UnknownError.getValue());
 +                                      ErrorCode.UnknownError.getValue());
                }
                logger.trace("Exit createAOTSTicket of ManualHandling ")
        }

diff --combined mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java
index e355725,98227f8..b7bd28f
--- 1/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java
--- 2/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java
@@@ -54,9 -54,9 +54,9 @@@ import org.onap.so.apihandlerinfra.task
  import org.onap.so.apihandlerinfra.tasksbeans.TaskVariableValue;
  import org.onap.so.apihandlerinfra.tasksbeans.TaskVariables;
  import org.onap.so.apihandlerinfra.tasksbeans.TasksGetResponse;
 +import org.onap.so.logger.ErrorCode;
  import org.onap.so.logger.MessageEnum;
  
 -import org.onap.so.logger.MsoLogger;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.springframework.beans.factory.annotation.Autowired;
@@@ -163,7 -163,7 +163,7 @@@ public class TasksHandler 
                        response = requestClient.post(camundaJsonReq);
  
                } catch(JsonProcessingException e){
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, MsoLogger.ErrorCode.SchemaError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).build();
  
  
                        ValidateException validateException = new ValidateException.Builder("Mapping of request to JSON object failed : " + e.getMessage(),
@@@ -171,7 -171,7 +171,7 @@@
  
                        throw validateException;
                } catch(IOException e) {
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, MsoLogger.ErrorCode.AvailabilityError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).build();
                        BPMNFailureException bpmnFailureException = new BPMNFailureException.Builder(String.valueOf(HttpStatus.SC_BAD_GATEWAY),HttpStatus.SC_BAD_GATEWAY,ErrorNumbers.SVC_NO_SERVER_RESOURCES).build();
                        throw bpmnFailureException;
                }
@@@ -203,7 -203,7 +203,7 @@@
                
                } else {
  
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, MsoLogger.ErrorCode.BusinessProcesssError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_RESPONSE_ERROR, ErrorCode.BusinessProcesssError).build();
  
  
                        BPMNFailureException bpmnFailureException = new BPMNFailureException.Builder(String.valueOf(bpelStatus), bpelStatus, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR)
@@@ -218,7 -218,7 +218,7 @@@
                        jsonResponse = mapper.writeValueAsString(trr);
                }
                catch (JsonProcessingException e) {
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, MsoLogger.ErrorCode.SchemaError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_REQUEST_VALIDATION_ERROR, ErrorCode.SchemaError).build();
  
  
                        ValidateException validateException = new ValidateException.Builder("Mapping of request to JSON object failed : " + e.getMessage(),
@@@ -241,7 -241,7 +241,7 @@@
                try {
                        getResponse = requestClient.get();
                }catch(IOException e){
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, MsoLogger.ErrorCode.AvailabilityError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).build();
                        BPMNFailureException validateException = new BPMNFailureException.Builder(String.valueOf(HttpStatus.SC_BAD_GATEWAY), HttpStatus.SC_BAD_GATEWAY, ErrorNumbers.SVC_NO_SERVER_RESOURCES).build();
                        throw validateException;
                }
@@@ -253,7 -253,7 +253,7 @@@
                                taskList = buildTaskList(taskId, respBody);                             
                        }
                        else {
 -                              ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, MsoLogger.ErrorCode.AvailabilityError).build();
 +                              ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).build();
  
  
  
@@@ -265,7 -265,7 +265,7 @@@
                        
                }
                else {
 -                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, MsoLogger.ErrorCode.AvailabilityError).build();
 +                      ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_BPEL_COMMUNICATE_ERROR, ErrorCode.AvailabilityError).build();
  
  
  
@@@ -294,7 -294,9 +294,9 @@@
        taskList.setErrorCode(getOptVariableValue(variables, "errorCode"));
        taskList.setErrorMessage(getOptVariableValue(variables, "errorMessage"));
        taskList.setBuildingBlockName(getOptVariableValue(variables, "buildingBlockName"));
-       taskList.setBuildingBlockStep(getOptVariableValue(variables, "buildingBlockStep"));  
+       taskList.setBuildingBlockStep(getOptVariableValue(variables, "buildingBlockStep"));
+       taskList.setDescription(getOptVariableValue(variables, "description"));
+       taskList.setTimeout(getOptVariableValue(variables, "timeout"));
        
        String validResponses = getOptVariableValue(variables, "validResponses").toLowerCase();
        List<String> items = Arrays.asList(validResponses.split("\\s*,\\s*"));