Merge pull request #99 from saumya1singh/sync_main

Sync main branch with Apache main branch

Author: saumya1singh

api/kogito-api/src/main/java/org/kie/kogito/jobs/descriptors/UserTaskInstanceJobDescription.java

@@ -27,16 +27,35 @@ public class UserTaskInstanceJobDescription implements JobDescription {
     private ExpirationTime expirationTime;
     private Integer priority = ProcessInstanceJobDescription.DEFAULT_PRIORITY;
     private String userTaskInstanceId;
+    private String processId;
+    private String processInstanceId;
+    private String nodeInstanceId;
+    private String rootProcessInstanceId;
+    private String rootProcessId;
 
     public UserTaskInstanceJobDescription() {
         // do nothing
     }
 
-    public UserTaskInstanceJobDescription(String id, ExpirationTime expirationTime, Integer priority, String userTaskInstanceId) {
+    public UserTaskInstanceJobDescription(
+            String id,
+            ExpirationTime expirationTime,
+            Integer priority,
+            String userTaskInstanceId,
+            String processId,
+            String processInstanceId,
+            String nodeInstanceId,
+            String rootProcessInstanceId,
+            String rootProcessId) {
         this.id = id;
         this.expirationTime = expirationTime;
         this.priority = priority;
         this.userTaskInstanceId = userTaskInstanceId;
+        this.processId = processId;
+        this.processInstanceId = processInstanceId;
+        this.nodeInstanceId = nodeInstanceId;
+        this.rootProcessInstanceId = rootProcessInstanceId;
+        this.rootProcessId = rootProcessId;
     }
 
     @Override
@@ -59,10 +78,30 @@ public String path() {
         return null;
     }
 
-    public String getUserTaskInstanceId() {
+    public String userTaskInstanceId() {
         return userTaskInstanceId;
     }
 
+    public String processId() {
+        return processId;
+    }
+
+    public String processInstanceId() {
+        return processInstanceId;
+    }
+
+    public String nodeInstanceId() {
+        return nodeInstanceId;
+    }
+
+    public String rootProcessInstanceId() {
+        return rootProcessInstanceId;
+    }
+
+    public String rootProcessId() {
+        return rootProcessId;
+    }
+
     public static UserTaskInstanceJobDescriptionBuilder newUserTaskInstanceJobDescriptionBuilder() {
         return new UserTaskInstanceJobDescriptionBuilder();
     }

api/kogito-api/src/main/java/org/kie/kogito/jobs/descriptors/UserTaskInstanceJobDescriptionBuilder.java

@@ -18,37 +18,18 @@
  */
 package org.kie.kogito.jobs.descriptors;
 
+import java.util.Map;
 import java.util.UUID;
 
 import org.kie.kogito.jobs.ExpirationTime;
-import org.kie.kogito.jobs.JobDescription;
 
-public class UserTaskInstanceJobDescriptionBuilder implements JobDescription {
+public class UserTaskInstanceJobDescriptionBuilder {
 
     private String id;
     private ExpirationTime expirationTime;
     private Integer priority = ProcessInstanceJobDescription.DEFAULT_PRIORITY;
     private String userTaskInstanceId;
-
-    @Override
-    public String id() {
-        return id;
-    }
-
-    @Override
-    public ExpirationTime expirationTime() {
-        return expirationTime;
-    }
-
-    @Override
-    public Integer priority() {
-        return priority;
-    }
-
-    @Override
-    public String path() {
-        return null;
-    }
+    private Map<String, Object> metadata;
 
     public UserTaskInstanceJobDescriptionBuilder id(String id) {
         this.id = id;
@@ -74,7 +55,21 @@ public UserTaskInstanceJobDescriptionBuilder userTaskInstanceId(String userTaskI
         return this;
     }
 
+    public UserTaskInstanceJobDescriptionBuilder metadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
     public UserTaskInstanceJobDescription build() {
-        return new UserTaskInstanceJobDescription(id, expirationTime, priority, userTaskInstanceId);
+        return new UserTaskInstanceJobDescription(
+                id,
+                expirationTime,
+                priority,
+                userTaskInstanceId,
+                (String) this.metadata.get("ProcessId"),
+                (String) this.metadata.get("ProcessInstanceId"),
+                (String) this.metadata.get("NodeInstanceId"),
+                (String) this.metadata.get("RootProcessInstanceId"),
+                (String) this.metadata.get("RootProcessId"));
     }
 }

api/kogito-services/src/main/java/org/kie/kogito/services/jobs/impl/InMemoryUserTaskJobExecutorFactory.java

@@ -94,7 +94,7 @@ public SignalUserTaskInstanceOnExpiredTimer(JobsService jobService, InMemoryJobC
     @Override
     public void run() {
         String jobId = userTaskInstanceJobDescription.id();
-        String userTaskInstanceId = userTaskInstanceJobDescription.getUserTaskInstanceId();
+        String userTaskInstanceId = userTaskInstanceJobDescription.userTaskInstanceId();
         try {
             Optional<UserTaskInstance> userTaskInstance = jobsConfiguration.userTasks().instances().findById(userTaskInstanceId);
             if (userTaskInstance.isEmpty()) {

jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java

@@ -614,6 +614,8 @@ private TimerInstance registerTimer(TimerInstance timerInstance, String nodeInst
                         .processInstanceId(getStringId())
                         .processId(getProcessId())
                         .nodeInstanceId(nodeInstanceId)
+                        .rootProcessId(getRootProcessId())
+                        .rootProcessInstanceId(getRootProcessInstanceId())
                         .build();
         JobsService jobsService = InternalProcessRuntime.asKogitoProcessRuntime(getKnowledgeRuntime().getProcessRuntime()).getJobsService();
         jobsService.scheduleJob(description);

jbpm/jbpm-usertask-workitem/src/main/java/org/kie/kogito/jbpm/usertask/handler/UserTaskKogitoWorkItemHandler.java

@@ -98,6 +98,7 @@ public Optional<WorkItemTransition> activateWorkItemHandler(KogitoWorkItemManage
         instance.setMetadata("RootProcessId", workItem.getProcessInstance().getRootProcessId());
         instance.setMetadata("RootProcessInstanceId", workItem.getProcessInstance().getRootProcessInstanceId());
         instance.setMetadata("ParentProcessInstanceId", workItem.getProcessInstance().getParentProcessInstanceId());
+        instance.setMetadata("NodeInstanceId", workItem.getNodeInstance().getId());
 
         instance.fireInitialStateChange();
         workItem.getParameters().entrySet().stream().filter(e -> !HumanTaskNode.TASK_PARAMETERS.contains(e.getKey())).forEach(e -> instance.setInput(e.getKey(), e.getValue()));

jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java

@@ -688,6 +688,7 @@ private List<JobDescription> toJobDescription(DeadlineInfo<?> deadline) {
                     .generateId()
                     .expirationTime(expirationTime)
                     .userTaskInstanceId(this.id)
+                    .metadata(this.metadata)
                     .build());
         }
         return jobs;