Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[incubator-kie-issues#1650] Add nodeInstanceId reference to node SLA timers #3799

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −3
Open

[incubator-kie-issues#1650] Add nodeInstanceId reference to node SLA timers #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1649d49
[incubator-kie-issues#1650] Add nodeInstanceId reference to node SLA …
martinweiler Nov 29, 2024
25f7e0c
Minor refactor
martinweiler Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .../jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@ public void configureTimers() {
}

public TimerInstance configureSLATimer(String slaDueDateExpression) {
return configureSLATimer(slaDueDateExpression, null);
}

public TimerInstance configureSLATimer(String slaDueDateExpression, String nodeInstanceId) {
// setup SLA if provided
slaDueDateExpression = resolveVariable(slaDueDateExpression).toString();
if (slaDueDateExpression == null || slaDueDateExpression.trim().isEmpty()) {
Expand All @@ -583,7 +587,7 @@ public TimerInstance configureSLATimer(String slaDueDateExpression) {

TimerInstance timerInstance = createDurationTimer(duration);
if (useTimerSLATracking()) {
registerTimer(timerInstance);
registerTimer(timerInstance, nodeInstanceId);
}
return timerInstance;
}
Expand All @@ -598,13 +602,18 @@ private TimerInstance createDurationTimer(long duration) {
}

private TimerInstance registerTimer(TimerInstance timerInstance) {
return registerTimer(timerInstance, null);
}

private TimerInstance registerTimer(TimerInstance timerInstance, String nodeInstanceId) {
ProcessInstanceJobDescription description =
ProcessInstanceJobDescription.newProcessInstanceJobDescriptionBuilder()
.id(timerInstance.getId())
.timerId(timerInstance.getTimerId())
.expirationTime(DurationExpirationTime.after(timerInstance.getDelay()))
.processInstanceId(getStringId())
.processId(getProcessId())
.nodeInstanceId(nodeInstanceId)
.build();
JobsService jobsService = InternalProcessRuntime.asKogitoProcessRuntime(getKnowledgeRuntime().getProcessRuntime()).getJobsService();
jobsService.scheduleJob(description);
Expand Down
2 changes: 1 addition & 1 deletion jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/EventNodeInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void internalTrigger(final KogitoNodeInstance from, String type) {
protected void configureSla() {
String slaDueDateExpression = (String) getNode().getMetaData().get("customSLADueDate");
if (slaDueDateExpression != null) {
TimerInstance timer = ((WorkflowProcessInstanceImpl) getProcessInstance()).configureSLATimer(slaDueDateExpression);
TimerInstance timer = ((WorkflowProcessInstanceImpl) getProcessInstance()).configureSLATimer(slaDueDateExpression, this.getId());
if (timer != null) {
this.slaTimerId = timer.getId();
this.slaDueDate = new Date(System.currentTimeMillis() + timer.getDelay());
Expand Down
2 changes: 1 addition & 1 deletion jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void internalTrigger(KogitoNodeInstance from, String type) {
protected void configureSla() {
String slaDueDateExpression = (String) getNode().getMetaData().get("customSLADueDate");
if (slaDueDateExpression != null) {
TimerInstance timer = ((WorkflowProcessInstanceImpl) getProcessInstance()).configureSLATimer(slaDueDateExpression);
TimerInstance timer = ((WorkflowProcessInstanceImpl) getProcessInstance()).configureSLATimer(slaDueDateExpression, this.getId());
if (timer != null) {
this.slaTimerId = timer.getId();
this.slaDueDate = new Date(System.currentTimeMillis() + timer.getDelay());
Expand Down
Loading