diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java index 0b19f1901..59de03ffe 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/CurrencySessionStateMachineConfig.java @@ -51,7 +51,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("currencySessionStateMachineConfig") @EnableStateMachineFactory(name = "CURR") public class CurrencySessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { private final Imdg sessionImdg; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java index fce14237e..4429efd0a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java @@ -133,7 +133,7 @@ public class FinalSessionStateMachineConfig states .withStates() .initial(TaskType.StartRevise, chain( - new CreateSessionAction(sessionImdg, SessionType.FINL, Section.MKR), + new CreateSessionAction(sessionImdg, SESSION_TYPE, Section.MKR), sendSdf56Action)) .states(new HashSet<>(Arrays.asList( TaskType.StartRevise, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java index 99359630e..31e5d2c5c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/IntermediateMkrSessionStateMachineConfig.java @@ -130,7 +130,7 @@ public class IntermediateMkrSessionStateMachineConfig states .withStates() .initial(TaskType.StartRevise, chain( - new CreateSessionAction(sessionImdg, SessionType.MEDM, Section.MKR), + new CreateSessionAction(sessionImdg, SESSION_TYPE, Section.MKR), sendSdf56Action)) .states(new HashSet<>(Arrays.asList( TaskType.StartRevise, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java index f249b4d58..c67c8983b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PaymSessionStateMachineConfig.java @@ -42,7 +42,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("paymSessionStateMachineConfig") @EnableStateMachineFactory(name = "PAYM") public class PaymSessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { private final Imdg sessionImdg; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java index b4c827fb2..4d71887c1 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionB0SessionStateMachineConfig.java @@ -51,7 +51,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("pimaryAuctionB0SessionStateMachineConfig") @EnableStateMachineFactory(name = "IPO0") public class PrimaryAuctionB0SessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { @@ -124,7 +124,7 @@ public class PrimaryAuctionB0SessionStateMachineConfig states .withStates() .initial(TaskType.StartRevise, chain( - new CreateSessionAction(sessionImdg, SessionType.IPO0, Section.FOND), + new CreateSessionAction(sessionImdg, SESSION_TYPE, Section.FOND), sendSdf56Action)) .states(new HashSet<>(Arrays.asList( TaskType.StartRevise, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java index 41ed6b82f..7bd373252 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionBnSessionStateMachineConfig.java @@ -49,7 +49,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("primaryAuctionBnSessionStateMachineConfig") @EnableStateMachineFactory(name = "IPOB") public class PrimaryAuctionBnSessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java index bb5d35ac6..f2c01a111 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrimaryAuctionT0SessionStateMachineConfig.java @@ -51,7 +51,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("primaryAuctionT0SessionStateMachineConfig") @EnableStateMachineFactory(name = "IPOT") public class PrimaryAuctionT0SessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { @@ -124,7 +124,7 @@ public class PrimaryAuctionT0SessionStateMachineConfig states .withStates() .initial(TaskType.StartRevise, chain( - new CreateSessionAction(sessionImdg, SessionType.IPO0, Section.FOND), + new CreateSessionAction(sessionImdg, SESSION_TYPE, Section.FOND), sendSdf56Action)) .states(new HashSet<>(Arrays.asList( TaskType.StartRevise, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java index 8ca65943c..b495405b0 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/SecondaryAuctionT0SessionStateMachineConfig.java @@ -51,8 +51,8 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") -@EnableStateMachineFactory(name = "IPOT") +@Configuration("secondaryAuctionT0SessionStateMachineConfig") +@EnableStateMachineFactory(name = "TRDT") public class SecondaryAuctionT0SessionStateMachineConfig extends EnumStateMachineConfigurerAdapter { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java index fc504582d..887539cba 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/UnitedSessionStateMachineConfig.java @@ -49,7 +49,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; -@Configuration("intermediateMkrSessionStateMachineFactoryConfig") +@Configuration("unitedSessionStateMachineConfig") @EnableStateMachineFactory(name = "UNIT") public class UnitedSessionStateMachineConfig extends EnumStateMachineConfigurerAdapter {