-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This extraction will be useful for creation of monitoring module, which will only depend on this domain module
- Loading branch information
Showing
64 changed files
with
262 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
2 changes: 1 addition & 1 deletion
2
modules/cli/src/test/kotlin/datamaintain/cli/app/update/db/MarkOneScriptAsExecutedTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
modules/core/src/main/kotlin/datamaintain/core/db/driver/DatamaintainDriver.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
modules/core/src/main/kotlin/datamaintain/core/exception/DatamaintainException.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../core/src/main/kotlin/datamaintain/core/exception/DatamaintainScriptExecutionException.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 39 additions & 81 deletions
120
modules/core/src/main/kotlin/datamaintain/core/report/Report.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,60 @@ | ||
| package datamaintain.core.report | ||
|
|
||
| import datamaintain.core.script.ReportExecutedScript | ||
| import datamaintain.core.script.ScriptWithContent | ||
| import datamaintain.core.step.Step | ||
| import datamaintain.core.step.check.rules.CheckRule | ||
| import datamaintain.domain.report.Report | ||
| import mu.KotlinLogging | ||
|
|
||
| private val logger = KotlinLogging.logger {} | ||
|
|
||
| class Report @JvmOverloads constructor( | ||
| val scannedScripts: List<ScriptWithContent> = listOf(), | ||
| val filteredScripts: List<ScriptWithContent> = listOf(), | ||
| val prunedScripts: List<ScriptWithContent> = listOf(), | ||
| val executedScripts: List<ReportExecutedScript> = listOf(), | ||
| val validatedCheckRules: List<CheckRule> = listOf() | ||
| ) { | ||
| fun print(verbose: Boolean, porcelain: Boolean = false) { | ||
| val stepWithMaxExecutionOrder: Step = Step.values().asSequence().maxByOrNull { step -> step.executionOrder }!! | ||
| print(verbose, porcelain, stepWithMaxExecutionOrder) | ||
| } | ||
| fun Report.print(verbose: Boolean, porcelain: Boolean = false) { | ||
| val stepWithMaxExecutionOrder: Step = Step.values().asSequence().maxByOrNull { step -> step.executionOrder }!! | ||
| print(verbose, porcelain, stepWithMaxExecutionOrder) | ||
| } | ||
|
|
||
| fun print(verbose: Boolean, porcelain: Boolean, maxStepToShow: Step) { | ||
| if (!porcelain) { | ||
| logger.info { "Summary => " } | ||
| fun Report.print(verbose: Boolean, porcelain: Boolean, maxStepToShow: Step) { | ||
| if (!porcelain) { | ||
| logger.info { "Summary => " } | ||
|
|
||
| // Scanner | ||
| logger.info { "- ${scannedScripts.size} files scanned" } | ||
| if (verbose) { | ||
| scannedScripts.forEach {logger.info { " -> ${it.name}" }} | ||
| } | ||
| // Scanner | ||
| logger.info { "- ${scannedScripts.size} files scanned" } | ||
| if (verbose) { | ||
| scannedScripts.forEach { logger.info { " -> ${it.name}" } } | ||
| } | ||
|
|
||
| if (Step.FILTER.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${filteredScripts.size} files filtered" } | ||
| if (verbose) { | ||
| filteredScripts.forEach { logger.info { " -> ${it.name}" } } | ||
| } | ||
| if (Step.FILTER.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${filteredScripts.size} files filtered" } | ||
| if (verbose) { | ||
| filteredScripts.forEach { logger.info { " -> ${it.name}" } } | ||
| } | ||
| } | ||
|
|
||
| if (Step.PRUNE.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${prunedScripts.size} files pruned" } | ||
| if (verbose) { | ||
| prunedScripts.forEach { logger.info { " -> ${it.name}" } } | ||
| } | ||
| if (Step.PRUNE.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${prunedScripts.size} files pruned" } | ||
| if (verbose) { | ||
| prunedScripts.forEach { logger.info { " -> ${it.name}" } } | ||
| } | ||
| } | ||
|
|
||
| if (Step.CHECK.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${validatedCheckRules.size} check rules validated" } | ||
| if (verbose) { | ||
| validatedCheckRules.forEach { logger.info { " -> ${it.getName()}" } } | ||
| } | ||
| if (Step.CHECK.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| logger.info { "- ${validatedCheckRules.size} check rules validated" } | ||
| if (verbose) { | ||
| validatedCheckRules.forEach { logger.info { " -> ${it.getName()}" } } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (Step.EXECUTE.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| if (!porcelain) { logger.info { "- ${executedScripts.size} files executed" } } | ||
| executedScripts.forEach { | ||
| logger.info { | ||
| if (!porcelain) { " -> ${it.name}" } else { "${it.porcelainName}" } | ||
| if (Step.EXECUTE.isSameStepOrExecutedBefore(maxStepToShow)) { | ||
| if (!porcelain) { | ||
| logger.info { "- ${executedScripts.size} files executed" } | ||
| } | ||
| executedScripts.forEach { | ||
| logger.info { | ||
| if (!porcelain) { | ||
| " -> ${it.name}" | ||
| } else { | ||
| "${it.porcelainName}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| class ReportBuilder @JvmOverloads constructor( | ||
| private val scannedScripts: MutableList<ScriptWithContent> = mutableListOf(), | ||
| private val filteredScripts: MutableList<ScriptWithContent> = mutableListOf(), | ||
| private val prunedScripts: MutableList<ScriptWithContent> = mutableListOf(), | ||
| private val executedScripts: MutableList<ReportExecutedScript> = mutableListOf(), | ||
| private val validatedCheckRules: MutableList<CheckRule> = mutableListOf() | ||
| ) { | ||
|
|
||
| fun addScannedScript(script: ScriptWithContent) { | ||
| scannedScripts.add(script) | ||
| } | ||
|
|
||
| fun addFilteredScript(script: ScriptWithContent) { | ||
| filteredScripts.add(script) | ||
| } | ||
|
|
||
| fun addPrunedScript(script: ScriptWithContent) { | ||
| prunedScripts.add(script) | ||
| } | ||
|
|
||
| fun addReportExecutedScript(script: ReportExecutedScript) { | ||
| executedScripts.add(script) | ||
| } | ||
|
|
||
| fun addValidatedCheckRules(checkRule: CheckRule) { | ||
| validatedCheckRules.add(checkRule) | ||
| } | ||
|
|
||
| fun toReport() = Report( | ||
| scannedScripts, | ||
| filteredScripts, | ||
| prunedScripts, | ||
| executedScripts, | ||
| validatedCheckRules | ||
| ) | ||
| } | ||
| } |
5 changes: 4 additions & 1 deletion
5
modules/core/src/main/kotlin/datamaintain/core/script/FileScript.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
modules/core/src/main/kotlin/datamaintain/core/script/TagMatcher.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...core/src/main/kotlin/datamaintain/core/step/check/rules/contracts/FullContextCheckRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
modules/core/src/main/kotlin/datamaintain/core/step/check/rules/contracts/ScriptCheckRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...rc/main/kotlin/datamaintain/core/step/check/rules/contracts/ScriptWithContextCheckRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.