ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-12 21:53:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add "forceRecoverFlowIds" parameter to FinalityRecoveryFlow

Browse Source
This commit is contained in:
Jose Coll 2023-10-27 13:45:19 +01:00
parent e52f086d11
commit 04b1e8fb3d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/kotlin/net/corda/core/flows/FinalityRecoveryFlow.kt
View File

@ -21,6 +21,7 @@ class FinalityRecoveryFlow(
private val matchingCriteria: FlowRecoveryQuery? = null,
private val forceRecover: Boolean = false,
private val recoverAll: Boolean = false,
private val forceRecoverFlowIds: Collection<StateMachineRunId> = emptySet(),
override val progressTracker: ProgressTracker = ProgressTracker()) : FlowLogic<Map<FlowTransactionInfo, Boolean>>() {
@CordaInternal
@ -28,16 +29,17 @@ class FinalityRecoveryFlow(
val flowIds: Collection<StateMachineRunId>,
val matchingCriteria: FlowRecoveryQuery?,
val forceRecover: Boolean,
val recoverAll: Boolean)
val recoverAll: Boolean,
val forceRecoverFlowIds: Collection<StateMachineRunId>)
@CordaInternal
fun getExtraConstructorArgs() = ExtraConstructorArgs(txIds, flowIds, matchingCriteria, forceRecover, recoverAll)
fun getExtraConstructorArgs() = ExtraConstructorArgs(txIds, flowIds, matchingCriteria, forceRecover, recoverAll, forceRecoverFlowIds)
constructor(txId: SecureHash, forceRecover: Boolean = false) : this(setOf(txId), forceRecover)
constructor(txIds: Collection<SecureHash>, forceRecover: Boolean = false, recoverAll: Boolean = false) : this(txIds, emptySet(), null, forceRecover, recoverAll, tracker())
constructor(txIds: Collection<SecureHash>, forceRecover: Boolean = false, recoverAll: Boolean = false) : this(txIds, emptySet(), null, forceRecover, recoverAll, emptySet(), tracker())
constructor(flowId: StateMachineRunId, forceRecover: Boolean = false) : this(emptySet(), setOf(flowId), null, forceRecover)
constructor(flowIds: Collection<StateMachineRunId>, forceRecover: Boolean = false) : this(emptySet(), flowIds, null, forceRecover, false, tracker())
constructor(recoverAll: Boolean, forceRecover: Boolean = false) : this(emptySet(), emptySet(), null, forceRecover, recoverAll, tracker())
constructor(matchingCriteria: FlowRecoveryQuery, forceRecover: Boolean = false) : this(emptySet(), emptySet(), matchingCriteria, forceRecover, false, tracker())
constructor(flowIds: Collection<StateMachineRunId>, forceRecover: Boolean = false) : this(emptySet(), flowIds, null, forceRecover, false, emptySet(), tracker())
constructor(recoverAll: Boolean, forceRecover: Boolean = false) : this(emptySet(), emptySet(), null, forceRecover, recoverAll, emptySet(), tracker())
constructor(matchingCriteria: FlowRecoveryQuery, forceRecover: Boolean = false) : this(emptySet(), emptySet(), matchingCriteria, forceRecover, false, emptySet(), tracker())
@Suspendable
@Throws(FlowRecoveryException::class)
@ -55,9 +57,10 @@ class FlowRecoveryException(message: String, cause: Throwable? = null) : FlowExc
data class FlowRecoveryQuery(
val timeframe: FlowTimeWindow? = null,
val initiatedBy: CordaX500Name? = null,
val counterParties: List<CordaX500Name>? = null) {
val counterParties: List<CordaX500Name>? = null,
val excludeFlowIds: List<StateMachineRunId>? = null) {
init {
require(timeframe != null || initiatedBy != null || counterParties != null) {
require(timeframe != null || initiatedBy != null || counterParties != null || excludeFlowIds != null) {
"Must specify at least one recovery criteria"
}
}