meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

rename task lambda from "task" to "taskLambda"

Browse source
This commit is contained in:
az 2022-07-11 22:34:22 +02:00
parent fc90a8332c
commit a94cbc24b0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt
View file

@ -72,16 +72,16 @@ open class Prov protected constructor(
* A task is the base execution unit in provs. In the results overview it is represented by one line resp. result (of either success or failure). * A task is the base execution unit in provs. In the results overview it is represented by one line resp. result (of either success or failure).
* Returns success if no sub-tasks are called or if all subtasks finish with success. * Returns success if no sub-tasks are called or if all subtasks finish with success.
*/ */
fun task(name: String? = null, task: Prov.() -> Unit): ProvResult { fun task(name: String? = null, taskLambda: Prov.() -> Unit): ProvResult {
return evaluate(ResultMode.ALL, name) { task(); ProvResult(true) } return evaluate(ResultMode.ALL, name) { taskLambda(); ProvResult(true) }
} }
/** /**
* Same as task but the provided lambda is explicitly required to provide a ProvResult to be returned. * Same as task but the provided lambda is explicitly required to provide a ProvResult to be returned.
* The returned result is included in the evaluation. * The returned result is included in the evaluation.
*/ */
fun taskWithResult(name: String? = null, task: Prov.() -> ProvResult): ProvResult { fun taskWithResult(name: String? = null, taskLambda: Prov.() -> ProvResult): ProvResult {
return evaluate(ResultMode.ALL, name) { task() } return evaluate(ResultMode.ALL, name) { taskLambda() }
} }
/** /**
@ -108,9 +108,9 @@ open class Prov protected constructor(
/** /**
* Runs the provided task in the specified (running) container * Runs the provided task in the specified (running) container
*/ */
fun taskInContainer(containerName: String, task: Prov.() -> ProvResult): ProvResult { fun taskInContainer(containerName: String, taskLambda: Prov.() -> ProvResult): ProvResult {
runInContainerWithName = containerName runInContainerWithName = containerName
val res = evaluate(ResultMode.ALL) { task() } val res = evaluate(ResultMode.ALL) { taskLambda() }
runInContainerWithName = null runInContainerWithName = null
return res return res
} }
@ -245,7 +245,7 @@ open class Prov protected constructor(
* Provides task evaluation, i.e. computes a ProvResult based on the provided resultMode, * Provides task evaluation, i.e. computes a ProvResult based on the provided resultMode,
* on the returned ProvResult from the task as well as on the results from executed subtasks (if there are). * on the returned ProvResult from the task as well as on the results from executed subtasks (if there are).
*/ */
private fun evaluate(resultMode: ResultMode, name: String? = null, task: Prov.() -> ProvResult): ProvResult { private fun evaluate(resultMode: ResultMode, name: String? = null, taskLambda: Prov.() -> ProvResult): ProvResult {
// init // init
if (level == 0) { if (level == 0) {
@ -269,7 +269,7 @@ open class Prov protected constructor(
val resultOfTaskLambda = if (!exit) { val resultOfTaskLambda = if (!exit) {
progress(internalResult) progress(internalResult)
@Suppress("UNUSED_EXPRESSION") // false positive @Suppress("UNUSED_EXPRESSION") // false positive
task() taskLambda()
} else { } else {
ProvResult(false, out = "Exiting due to failure and mode FAILEXIT") ProvResult(false, out = "Exiting due to failure and mode FAILEXIT")
} }