diff options
3 files changed, 16 insertions, 2 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy index 4670b11b71..976ad1466d 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/AbstractServiceTaskProcessor.groovy @@ -45,6 +45,20 @@ public abstract class AbstractServiceTaskProcessor implements ServiceTaskProcess public MsoUtils utils = new MsoUtils() /** + * Logs a WorkflowException at the ERROR level with the specified message. + * @param execution the execution + */ + public void logWorkflowException(DelegateExecution execution, String message) { + def workflowException = execution.getVariable("WorkflowException") + + if (workflowException == null) { + logger.error(message); + } else { + logger.error('{}: {}', message, workflowException) + } + } + + /** * Saves the WorkflowException in the execution to the specified variable, * clearing the WorkflowException variable so the workflow can continue * processing (perhaps catching another WorkflowException). 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 63dd72566b..41cd87e874 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 @@ -581,6 +581,6 @@ public class BBInputSetupMapperLayer { protected ModelInfoServiceProxy mapServiceProxyCustomizationToServiceProxy( ServiceProxyResourceCustomization serviceProxyCustomization) { - return modelMapper.map(serviceProxyCustomization, ModelInfoServiceProxy.class); + return modelMapper.map(serviceProxyCustomization.getSourceService(), ModelInfoServiceProxy.class); } } diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java index 787957dc38..bff13f8dbd 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java @@ -2071,7 +2071,7 @@ public class BBInputSetupTest { ServiceProxy expected = new ServiceProxy(); expected.setType("TRANSPORT"); expected.setModelInfoServiceProxy(new ModelInfoServiceProxy()); - expected.getModelInfoServiceProxy().setModelCustomizationUuid("modelCustomizationUUID"); + expected.getModelInfoServiceProxy().setModelUuid("modelUUID"); expected.setServiceInstance(new ServiceInstance()); expected.getServiceInstance().setModelInfoServiceInstance(new ModelInfoServiceInstance()); expected.getServiceInstance().getModelInfoServiceInstance().setModelUuid("modelUUID"); |