treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rever test state machine guard

Browse source
This commit is contained in:
ialbert 2025-06-25 19:11:23 +03:00
parent 06ce9742e2
commit 79cbc7dfc7
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java
View file

@ -42,6 +42,7 @@ import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard;
import ru.spcex.clearing.session.state.listener.MachineMonitoringListener; import ru.spcex.clearing.session.state.listener.MachineMonitoringListener;
import ru.spcex.clearing.util.StateMachineUtil; import ru.spcex.clearing.util.StateMachineUtil;
import static ru.spcex.clearing.util.StateMachineUtil.chain; import static ru.spcex.clearing.util.StateMachineUtil.chain;
import static ru.spcex.clearing.util.StateMachineUtil.invert;
import ru.spcex.platform.classes.base.interfaces.ExecutionType; import ru.spcex.platform.classes.base.interfaces.ExecutionType;
import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.enumeration.RegistryStatus;
import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.enumeration.Section;
@ -195,7 +196,7 @@ public class FinalSessionStateMachineConfig
.and() .and()
.withExternal() .withExternal()
.source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool)
.guard(ctx -> false) /* invert(oblAdmGuard) */ .guard(invert(oblAdmGuard))
.action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)) .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction))
.and() .and()
.withExternal() .withExternal()

13
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/guard/StashedRegistriesPresentGuard.java
View file

@ -1,7 +1,9 @@
package ru.spcex.clearing.session.state.guard; package ru.spcex.clearing.session.state.guard;
import java.util.Map;
import org.springframework.statemachine.StateContext; import org.springframework.statemachine.StateContext;
import org.springframework.statemachine.guard.Guard; import org.springframework.statemachine.guard.Guard;
import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.session.stage.TaskType; import ru.spcex.clearing.session.stage.TaskType;
import ru.spcex.clearing.session.state.DataEnum; import ru.spcex.clearing.session.state.DataEnum;
import ru.spcex.clearing.session.state.SsnEvent; import ru.spcex.clearing.session.state.SsnEvent;
@ -15,13 +17,8 @@ public class StashedRegistriesPresentGuard implements Guard<TaskType, SsnEvent>
@Override @Override
public boolean evaluate(StateContext<TaskType, SsnEvent> ctx) { public boolean evaluate(StateContext<TaskType, SsnEvent> ctx) {
TaskType target = ctx.getTarget().getId(); @SuppressWarnings("unchecked")
return target == TaskType.PSEUDO_waitingForObligationAdmission; Map<Long, Registry> rgss = ctx.getExtendedState().get(dataEnum, Map.class);
// if (target == TaskType.PSEUDO_waitingForObligationAdmission) { return rgss != null && !rgss.isEmpty();
// return true;
// }
// @SuppressWarnings("unchecked")
// Map<Long, Registry> rgss = ctx.getExtendedState().get(dataEnum, Map.class);
// return rgss != null && !rgss.isEmpty();
} }
} }