Skip to content

Commit dfd801d

Browse files
committed
Made the taskDefinitionKey of a UserTask required to be the same as in the BPMN - new in API doc and Simulation.
1 parent c85dd2b commit dfd801d

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

02-bpmn/src/main/scala/camundala/bpmn/BpmnDsl.scala

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,17 @@ trait BpmnDsl:
66
def companyDescr: String = ""
77

88
private[bpmn] def msgNameDescr(messageName: String) =
9-
Some(s"""
10-
|$descr
11-
|
12-
|- _messageName_: `$messageName`
13-
|
14-
|---
15-
|
16-
|$companyDescr
17-
|""".stripMargin)
9+
bpmnDescr(s"- _messageName_: `$messageName`")
1810

19-
private[bpmn] lazy val defaultDescr =
11+
private[bpmn] def userTaskDescr(messageName: String) =
12+
bpmnDescr(s"- _taskDefinitionKey_: `$messageName`")
13+
14+
private def bpmnDescr(keyLabel: String) =
2015
Some(s"""
2116
|$descr
2217
|
18+
|$keyLabel
19+
|
2320
|---
2421
|
2522
|$companyDescr

02-bpmn/src/main/scala/camundala/bpmn/BpmnUserTaskDsl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trait BpmnUserTaskDsl extends BpmnDsl:
1616
out: Out = NoOutput()
1717
): UserTask[In, Out] =
1818
UserTask(
19-
InOutDescr(name, in, out, defaultDescr)
19+
InOutDescr(name, in, out, userTaskDescr(name))
2020
)
2121

2222
end BpmnUserTaskDsl

03-simulation/src/main/scala/camundala/simulation/custom/SUserTaskExtensions.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,19 @@ trait SUserTaskExtensions extends SimulationHelper:
2323

2424
private def task()(using data: ScenarioData): ResultType =
2525
def getTask(
26-
processInstanceId: Any
26+
processInstanceId: Any,
27+
taskDefinitionKey: String
2728
)(data: ScenarioData): ResultType =
2829
val uri =
29-
uri"${config.endpoint}/task?processInstanceId=$processInstanceId"
30+
uri"${config.endpoint}/task?processInstanceId=$processInstanceId&taskDefinitionKey=$taskDefinitionKey"
3031
val request = basicRequest
3132
.auth()
3233
.get(uri)
3334
given ScenarioData = data
3435
.info(
3536
s"UserTask '${userTask.name}' get"
3637
)
37-
.debug(s"- URI: $uri")
38+
.info(s"- URI: $uri")
3839

3940
request
4041
.extractBody()
@@ -53,13 +54,13 @@ trait SUserTaskExtensions extends SimulationHelper:
5354
}
5455
.left
5556
.flatMap { _ =>
56-
userTask.tryOrFail(getTask(processInstanceId))
57+
userTask.tryOrFail(getTask(processInstanceId, userTask.id))
5758
}
5859
)
5960
end getTask
6061

6162
val processInstanceId = data.context.processInstanceId
62-
getTask(processInstanceId)(data.withRequestCount(0))
63+
getTask(processInstanceId, userTask.id)(data.withRequestCount(0))
6364
end task
6465

6566
def checkForm()(using data: ScenarioData): ResultType =

03-worker/src/main/scala/camundala/worker/Handler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ trait WorkerHandler:
1313
def worker: Worker[?, ?, ?]
1414
def topic: String
1515

16-
def projectName: String
16+
def applicationName: String
1717
def registerHandler( register: => Unit): Unit =
18-
val appPackageName = projectName.replace("-", ".")
18+
val appPackageName = applicationName.replace("-", ".")
1919
val testMode = sys.env.get("WORKER_TEST_MODE").contains("true") // did not work with lazy val
2020
if testMode || getClass.getName.startsWith(appPackageName)
2121
then

04-worker-c7spring/src/main/scala/camundala/camunda7/worker/C7WorkerHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import scala.util.{Failure, Success}
2121
trait C7WorkerHandler extends camunda.ExternalTaskHandler, WorkerHandler:
2222

2323
@Value("${spring.application.name}")
24-
var projectName: String = scala.compiletime.uninitialized
24+
var applicationName: String = scala.compiletime.uninitialized
2525

2626
@Autowired()
2727
protected var engineContext: EngineContext = scala.compiletime.uninitialized

0 commit comments

Comments
 (0)