diff --git a/docs/src/reference/asciidoc/sm.adoc b/docs/src/reference/asciidoc/sm.adoc index 348b56dc..0ff1a8fe 100644 --- a/docs/src/reference/asciidoc/sm.adoc +++ b/docs/src/reference/asciidoc/sm.adoc @@ -454,6 +454,9 @@ this decision to a user whether a machine should be started automatically or not. This flag will only control an autostart of a top-level state machine. +Setting `machineId` within a configuration is simply a convenience if +user wants or needs to do it here. + Setting a `BeanFactory`, `TaskExecutor` or `TaskScheduler` exist for convenience for a user and are also use within a framework itself. @@ -464,6 +467,13 @@ start/stop events. Naturally it is not possible to listen a state machine start events if `autoStartup` is enabled unless listener can be registered during a configuration phase. +`transitionConflictPolicy` can be used in cases where multiple +transition paths could be selected. One usual use case for this is if +machine contains anonymous transitions leading out from a sub-state +and a parent state and user want to define a policy which one will be +selected. This is a global setting within a machine instance and +default to _CHILD_. + `DistributedStateMachine` is configured via `withDistributed()` which allows to set a `StateMachineEnsemble` which if exists automatically wraps created `StateMachine` with `DistributedStateMachine` and diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/ObjectStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/ObjectStateMachineFactory.java index 3ca51978..c5f58f84 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/ObjectStateMachineFactory.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/ObjectStateMachineFactory.java @@ -76,7 +76,7 @@ public class ObjectStateMachineFactory extends AbstractStateMachineFactory extendedState, uuid); machine.setId(machineId); machine.setHistoryState(historyState); - machine.setTransitionConflightPolicy(stateMachineModel.getConfigurationData().getTransitionConflightPolicy()); + machine.setTransitionConflightPolicy(stateMachineModel.getConfigurationData().getTransitionConflictPolicy()); if (contextEventsEnabled != null) { machine.setContextEventsEnabled(contextEventsEnabled); } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/builders/StateMachineConfigurationBuilder.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/builders/StateMachineConfigurationBuilder.java index 98824fc3..45733425 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/builders/StateMachineConfigurationBuilder.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/builders/StateMachineConfigurationBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2015-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import org.springframework.statemachine.monitor.StateMachineMonitor; import org.springframework.statemachine.persist.StateMachineRuntimePersister; import org.springframework.statemachine.security.SecurityRule; import org.springframework.statemachine.support.StateMachineInterceptor; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * {@link AnnotationBuilder} for {@link StatesData}. @@ -65,7 +65,7 @@ public class StateMachineConfigurationBuilder private TaskExecutor taskExecutor; private TaskScheduler taskScheculer; private boolean autoStart = false; - private TransitionConflightPolicy transitionConflightPolicy; + private TransitionConflictPolicy transitionConflictPolicy; private StateMachineEnsemble ensemble; private final List> listeners = new ArrayList>(); private boolean securityEnabled = false; @@ -147,7 +147,7 @@ public class StateMachineConfigurationBuilder } return new ConfigurationData(beanFactory, taskExecutor, taskScheculer, autoStart, ensemble, listeners, securityEnabled, transitionSecurityAccessDecisionManager, eventSecurityAccessDecisionManager, eventSecurityRule, - transitionSecurityRule, verifierEnabled, verifier, machineId, stateMachineMonitor, interceptorsCopy, transitionConflightPolicy); + transitionSecurityRule, verifierEnabled, verifier, machineId, stateMachineMonitor, interceptorsCopy, transitionConflictPolicy); } /** @@ -296,11 +296,11 @@ public class StateMachineConfigurationBuilder } /** - * Sets the transition conflight policy. + * Sets the transition conflict policy. * - * @param transitionConflightPolicy the new transition conflight policy + * @param transitionConflictPolicy the new transition conflict policy */ - public void setTransitionConflightPolicy(TransitionConflightPolicy transitionConflightPolicy) { - this.transitionConflightPolicy = transitionConflightPolicy; + public void setTransitionConflictPolicy(TransitionConflictPolicy transitionConflictPolicy) { + this.transitionConflictPolicy = transitionConflictPolicy; } } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java index c74f0cca..41e8488a 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/ConfigurationConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.config.builders.StateMachineConfigurationConfigurer; import org.springframework.statemachine.config.common.annotation.AnnotationConfigurerBuilder; import org.springframework.statemachine.listener.StateMachineListener; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * Base {@code ConfigConfigurer} interface for configuring generic config. @@ -88,10 +88,10 @@ public interface ConfigurationConfigurer extends ConfigurationConfigurer listener(StateMachineListener listener); /** - * Speficy a {@link TransitionConflightPolicy}. + * Speficy a {@link TransitionConflictPolicy}. Default to {@link TransitionConflictPolicy#CHILD}. * - * @param transitionConflightPolicy the transition conflight policy + * @param transitionConflictPolicy the transition conflict policy * @return the configuration configurer */ - ConfigurationConfigurer transitionConflightPolicy(TransitionConflightPolicy transitionConflightPolicy); + ConfigurationConfigurer transitionConflictPolicy(TransitionConflictPolicy transitionConflictPolicy); } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultConfigurationConfigurer.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultConfigurationConfigurer.java index e5c94a57..abbd142a 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultConfigurationConfigurer.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultConfigurationConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2017 the original author or authors. + * Copyright 2015-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.statemachine.config.builders.StateMachineConfiguratio import org.springframework.statemachine.config.common.annotation.AnnotationConfigurerAdapter; import org.springframework.statemachine.config.model.ConfigurationData; import org.springframework.statemachine.listener.StateMachineListener; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * Default implementation of a {@link ConfigurationConfigurer}. @@ -45,7 +45,7 @@ public class DefaultConfigurationConfigurer private TaskExecutor taskExecutor; private TaskScheduler taskScheculer; private boolean autoStart = false; - private TransitionConflightPolicy transitionConflightPolicy; + private TransitionConflictPolicy transitionConflightPolicy; private final List> listeners = new ArrayList>(); @Override @@ -56,7 +56,7 @@ public class DefaultConfigurationConfigurer builder.setTaskScheculer(taskScheculer); builder.setAutoStart(autoStart); builder.setStateMachineListeners(listeners); - builder.setTransitionConflightPolicy(transitionConflightPolicy); + builder.setTransitionConflictPolicy(transitionConflightPolicy); } @Override @@ -96,7 +96,7 @@ public class DefaultConfigurationConfigurer } @Override - public ConfigurationConfigurer transitionConflightPolicy(TransitionConflightPolicy transitionConflightPolicy) { + public ConfigurationConfigurer transitionConflictPolicy(TransitionConflictPolicy transitionConflightPolicy) { this.transitionConflightPolicy = transitionConflightPolicy; return this; } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/model/ConfigurationData.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/model/ConfigurationData.java index 7fc56564..969288d2 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/model/ConfigurationData.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/model/ConfigurationData.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2015-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.statemachine.listener.StateMachineListener; import org.springframework.statemachine.monitor.StateMachineMonitor; import org.springframework.statemachine.security.SecurityRule; import org.springframework.statemachine.support.StateMachineInterceptor; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * Configuration object used to keep things together in {@link StateMachineConfigurationBuilder}. @@ -49,7 +49,7 @@ public class ConfigurationData { private final TaskExecutor taskExecutor; private final TaskScheduler taskScheduler; private final boolean autoStart; - private final TransitionConflightPolicy transitionConflightPolicy; + private final TransitionConflictPolicy transitionConflictPolicy; private final StateMachineEnsemble ensemble; private final List> listeners; private final boolean securityEnabled; @@ -121,7 +121,7 @@ public class ConfigurationData { * @param machineId the machine id * @param stateMachineMonitor the state machine monitor * @param interceptors the state machine interceptors. - * @param transitionConflightPolicy the transition conflight policy + * @param transitionConflightPolicy the transition conflict policy */ public ConfigurationData(BeanFactory beanFactory, TaskExecutor taskExecutor, TaskScheduler taskScheduler, boolean autoStart, StateMachineEnsemble ensemble, @@ -129,7 +129,7 @@ public class ConfigurationData { AccessDecisionManager transitionSecurityAccessDecisionManager, AccessDecisionManager eventSecurityAccessDecisionManager, SecurityRule eventSecurityRule, SecurityRule transitionSecurityRule, boolean verifierEnabled, StateMachineModelVerifier verifier, String machineId, StateMachineMonitor stateMachineMonitor, - List> interceptors, TransitionConflightPolicy transitionConflightPolicy) { + List> interceptors, TransitionConflictPolicy transitionConflightPolicy) { this.beanFactory = beanFactory; this.taskExecutor = taskExecutor; this.taskScheduler = taskScheduler; @@ -146,7 +146,7 @@ public class ConfigurationData { this.machineId = machineId; this.stateMachineMonitor = stateMachineMonitor; this.interceptors = interceptors; - this.transitionConflightPolicy = transitionConflightPolicy; + this.transitionConflictPolicy = transitionConflightPolicy; } public String getMachineId() { @@ -289,11 +289,11 @@ public class ConfigurationData { } /** - * Gets the transition conflight policy. + * Gets the transition conflict policy. * - * @return the transition conflight policy + * @return the transition conflict policy */ - public TransitionConflightPolicy getTransitionConflightPolicy() { - return transitionConflightPolicy; + public TransitionConflictPolicy getTransitionConflictPolicy() { + return transitionConflictPolicy; } } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java index 562af59c..c16630b5 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java @@ -52,7 +52,7 @@ import org.springframework.statemachine.state.State; import org.springframework.statemachine.support.StateMachineExecutor.StateMachineExecutorTransit; import org.springframework.statemachine.transition.InitialTransition; import org.springframework.statemachine.transition.Transition; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; import org.springframework.statemachine.transition.TransitionKind; import org.springframework.statemachine.trigger.DefaultTriggerContext; import org.springframework.statemachine.trigger.Trigger; @@ -93,7 +93,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo private ExtendedState extendedState; - private TransitionConflightPolicy transitionConflightPolicy; + private TransitionConflictPolicy transitionConflictPolicy; private volatile State currentState; @@ -273,7 +273,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo } DefaultStateMachineExecutor executor = new DefaultStateMachineExecutor(this, getRelayStateMachine(), transitions, - triggerToTransitionMap, triggerlessTransitions, initialTransition, initialEvent, transitionConflightPolicy); + triggerToTransitionMap, triggerlessTransitions, initialTransition, initialEvent, transitionConflictPolicy); if (getBeanFactory() != null) { executor.setBeanFactory(getBeanFactory()); } @@ -567,12 +567,12 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo } /** - * Sets the transition conflight policy. + * Sets the transition conflict policy. * - * @param transitionConflightPolicy the new transition conflight policy + * @param transitionConflictPolicy the new transition conflict policy */ - public void setTransitionConflightPolicy(TransitionConflightPolicy transitionConflightPolicy) { - this.transitionConflightPolicy = transitionConflightPolicy; + public void setTransitionConflightPolicy(TransitionConflictPolicy transitionConflictPolicy) { + this.transitionConflictPolicy = transitionConflictPolicy; } private boolean sendEventInternal(Message event) { diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java index a8b4a0f7..4073d352 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java @@ -47,7 +47,7 @@ import org.springframework.statemachine.state.JoinPseudoState; import org.springframework.statemachine.state.PseudoStateKind; import org.springframework.statemachine.state.State; import org.springframework.statemachine.transition.Transition; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; import org.springframework.statemachine.trigger.DefaultTriggerContext; import org.springframework.statemachine.trigger.TimerTrigger; import org.springframework.statemachine.trigger.Trigger; @@ -114,12 +114,12 @@ public class DefaultStateMachineExecutor extends LifecycleObjectSupport im * @param triggerlessTransitions the triggerless transitions * @param initialTransition the initial transition * @param initialEvent the initial event - * @param transitionConflightPolicy the transition conflight policy + * @param transitionConflictPolicy the transition conflict policy */ public DefaultStateMachineExecutor(StateMachine stateMachine, StateMachine relayStateMachine, Collection> transitions, Map, Transition> triggerToTransitionMap, List> triggerlessTransitions, Transition initialTransition, Message initialEvent, - TransitionConflightPolicy transitionConflightPolicy) { + TransitionConflictPolicy transitionConflictPolicy) { this.stateMachine = stateMachine; this.relayStateMachine = relayStateMachine; this.triggerToTransitionMap = triggerToTransitionMap; @@ -127,7 +127,7 @@ public class DefaultStateMachineExecutor extends LifecycleObjectSupport im this.transitions = transitions; this.initialTransition = initialTransition; this.initialEvent = initialEvent; - this.transitionComparator = new TransitionComparator(transitionConflightPolicy); + this.transitionComparator = new TransitionComparator(transitionConflictPolicy); // anonymous transitions are fixed, sort those now this.triggerlessTransitions.sort(transitionComparator); registerTriggerListener(); diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/TransitionComparator.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/TransitionComparator.java index e01b2540..670b2eca 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/TransitionComparator.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/TransitionComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import java.util.Comparator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.statemachine.transition.Transition; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * {@link Comparator} for {@link Transition}s. This comparator tries to compare @@ -34,15 +34,15 @@ import org.springframework.statemachine.transition.TransitionConflightPolicy; class TransitionComparator implements Comparator> { private final static Log log = LogFactory.getLog(TransitionComparator.class); - private final TransitionConflightPolicy transitionConflightPolicy; + private final TransitionConflictPolicy transitionConflictPolicy; /** * Instantiates a new transition comparator. * - * @param transitionConflightPolicy the transition conflight policy + * @param transitionConflictPolicy the transition conflict policy */ - public TransitionComparator(TransitionConflightPolicy transitionConflightPolicy) { - this.transitionConflightPolicy = transitionConflightPolicy == null ? TransitionConflightPolicy.CHILD : transitionConflightPolicy; + public TransitionComparator(TransitionConflictPolicy transitionConflictPolicy) { + this.transitionConflictPolicy = transitionConflictPolicy == null ? TransitionConflictPolicy.CHILD : transitionConflictPolicy; } @Override @@ -54,7 +54,7 @@ class TransitionComparator implements Comparator> { return 0; } else { boolean substate = StateMachineUtils.isSubstate(left.getSource(), right.getSource()); - if (transitionConflightPolicy == TransitionConflightPolicy.CHILD) { + if (transitionConflictPolicy == TransitionConflictPolicy.CHILD) { return substate ? 1 : -1; } else { return substate ? -1 : 1; @@ -64,6 +64,6 @@ class TransitionComparator implements Comparator> { @Override public String toString() { - return "TransitionComparator [transitionConflightPolicy=" + transitionConflightPolicy + "]"; + return "TransitionComparator [transitionConflightPolicy=" + transitionConflictPolicy + "]"; } } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflightPolicy.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflictPolicy.java similarity index 62% rename from spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflightPolicy.java rename to spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflictPolicy.java index d8eb1210..b88fc692 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflightPolicy.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/TransitionConflictPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,23 @@ package org.springframework.statemachine.transition; /** - * Enumerations for possible transition conflight policies. + * Enumerations for possible transition conflict policies. In case multiple + * transitions become possible, thus machine having a need to choose one, these + * policies determine if transition is picked from originating child or parent + * states. * * @author Janne Valkealahti * */ -public enum TransitionConflightPolicy { +public enum TransitionConflictPolicy { /** - * Choose transition from a child. + * Policy choosing transition from a child. */ CHILD, /** - * Choose transition from a parent. + * Policy choosing from a parent. */ PARENT; } diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests.java index 96515d3c..8c62a63d 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,6 +62,7 @@ import org.springframework.statemachine.state.State; import org.springframework.statemachine.support.StateMachineInterceptor; import org.springframework.statemachine.support.StateMachineInterceptorAdapter; import org.springframework.statemachine.transition.Transition; +import org.springframework.statemachine.transition.TransitionConflictPolicy; /** * Tests for state machine configuration. @@ -1154,10 +1155,12 @@ public class DocsConfigurationSampleTests extends AbstractStateMachineTests { config .withConfiguration() .autoStartup(true) + .machineId("myMachineId") .beanFactory(new StaticListableBeanFactory()) .taskExecutor(new SyncTaskExecutor()) .taskScheduler(new ConcurrentTaskScheduler()) - .listener(new StateMachineListenerAdapter()); + .listener(new StateMachineListenerAdapter()) + .transitionConflictPolicy(TransitionConflictPolicy.CHILD); } } // end::snippetYA[] diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/TransitionComparatorTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/TransitionComparatorTests.java index acd0a3b2..45e511ec 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/TransitionComparatorTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/TransitionComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.statemachine.state.State; import org.springframework.statemachine.state.StateMachineState; import org.springframework.statemachine.transition.DefaultExternalTransition; import org.springframework.statemachine.transition.Transition; -import org.springframework.statemachine.transition.TransitionConflightPolicy; +import org.springframework.statemachine.transition.TransitionConflictPolicy; import org.springframework.statemachine.trigger.EventTrigger; /** @@ -82,13 +82,13 @@ public class TransitionComparatorTests { assertThat(comparator.compare(transitionFromS111ToS1, transitionFromS111ToS1), is(0)); assertThat(comparator.compare(transitionFromS11ToS1, transitionFromS11ToS1), is(0)); - comparator = new TransitionComparator<>(TransitionConflightPolicy.CHILD); + comparator = new TransitionComparator<>(TransitionConflictPolicy.CHILD); assertThat(comparator.compare(transitionFromS111ToS1, transitionFromS11ToS1), is(-1)); assertThat(comparator.compare(transitionFromS11ToS1, transitionFromS111ToS1), is(1)); assertThat(comparator.compare(transitionFromS111ToS1, transitionFromS111ToS1), is(0)); assertThat(comparator.compare(transitionFromS11ToS1, transitionFromS11ToS1), is(0)); - comparator = new TransitionComparator<>(TransitionConflightPolicy.PARENT); + comparator = new TransitionComparator<>(TransitionConflictPolicy.PARENT); assertThat(comparator.compare(transitionFromS111ToS1, transitionFromS11ToS1), is(1)); assertThat(comparator.compare(transitionFromS11ToS1, transitionFromS111ToS1), is(-1)); assertThat(comparator.compare(transitionFromS111ToS1, transitionFromS111ToS1), is(0)); diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionOrderTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionOrderTests.java index cd1f9a57..b4298ee1 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionOrderTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionOrderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -221,7 +221,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override @@ -264,7 +264,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override @@ -307,7 +307,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.CHILD); + .transitionConflictPolicy(TransitionConflictPolicy.CHILD); } @Override @@ -349,7 +349,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override @@ -393,7 +393,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override @@ -436,7 +436,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override @@ -483,7 +483,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.CHILD); + .transitionConflictPolicy(TransitionConflictPolicy.CHILD); } @Override @@ -530,7 +530,7 @@ public class TransitionOrderTests extends AbstractStateMachineTests { public void configure(StateMachineConfigurationConfigurer config) throws Exception { config .withConfiguration() - .transitionConflightPolicy(TransitionConflightPolicy.PARENT); + .transitionConflictPolicy(TransitionConflictPolicy.PARENT); } @Override