diff options
| author |   Smokowski, Steven <steve.smokowski@att.com> | 2019-11-15 15:24:03 -0500 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2019-11-15 15:24:03 -0500 |
| commit | 73ee86531241e7c0103c7573996533c818452d50 (patch) | |
| tree | ae0e6bf0110d8eb75df5566bdd4d9fe7020dba2e /bpmn/so-bpmn-tasks/src/main/java | |
| parent | 70c24f9edcb8351ca8f184294c0815db5eba1904 (diff) | |
updated uri regular expression to support resume
updated uri regular expression to support resume
Issue-ID: SO-2522
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I0a44a374d46c7b3892acabe31c0621d37103b37a
Diffstat (limited to 'bpmn/so-bpmn-tasks/src/main/java')
| -rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index c3f5a98ce7..b5b1f5db2f 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -188,9 +188,11 @@ public class WorkflowAction { boolean isResume = false; if (isUriResume(uri)) { isResume = true; - logger.debug("replacing URI {}", uri); - uri = bbInputSetupUtils.loadOriginalInfraActiveRequestById(requestId).getRequestUrl(); - logger.debug("for RESUME with original value {}", uri); + if (!aLaCarte) { + logger.debug("replacing URI {}", uri); + uri = bbInputSetupUtils.loadOriginalInfraActiveRequestById(requestId).getRequestUrl(); + logger.debug("for RESUME with original value {}", uri); + } } Resource resource = extractResourceIdAndTypeFromUri(uri); WorkflowType resourceType = resource.getResourceType(); @@ -1129,8 +1131,8 @@ public class WorkflowAction { } protected Resource extractResourceIdAndTypeFromUri(String uri) { - Pattern patt = Pattern.compile( - "[vV]\\d+.*?(?:(?:/(?<type>" + SUPPORTEDTYPES + ")(?:/(?<id>[^/]+))?)(?:/(?<action>[^/]+))?)?$"); + Pattern patt = Pattern.compile("[vV]\\d+.*?(?:(?:/(?<type>" + SUPPORTEDTYPES + + ")(?:/(?<id>[^/]+))?)(?:/(?<action>[^/]+))?(?:/resume)?)?$"); Matcher m = patt.matcher(uri); Boolean generated = false; |