From 2fb774e837077bb6b9992366f803f5c6c47d4590 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Fri, 29 May 2015 11:24:39 +0100 Subject: [PATCH] Polish --- .../statemachine/config/EnumStateMachineFactory.java | 11 +++-------- .../StateMachineConfigurationImportSelector.java | 1 + .../StateMachineFactoryConfiguration.java | 1 - .../statemachine/support/AbstractStateMachine.java | 2 ++ .../statemachine/transition/InitialTransition.java | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java index e242f0f9..0732dc26 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java @@ -91,6 +91,7 @@ public class EnumStateMachineFactory, E extends Enum> exten this.stateMachineStates = stateMachineStates; } + @SuppressWarnings("unchecked") @Override public StateMachine getStateMachine() { @@ -144,14 +145,13 @@ public class EnumStateMachineFactory, E extends Enum> exten for (Collection> regionStateDatas : regionsStateDatas) { machine = buildMachine(machineMap, stateMap, regionStateDatas, transitionsData, getBeanFactory(), contextEvents, defaultExtendedState, stateMachineTransitions); - regionStack.push(new MachineStackItem(machine, peek.getParent(), peek)); + regionStack.push(new MachineStackItem(machine)); } Collection> regions = new ArrayList>(); for (MachineStackItem si : regionStack) { regions.add(si.machine); } - @SuppressWarnings("unchecked") S parent = (S)peek.getParent(); RegionState rstate = new RegionState(parent, regions, null, null, null, new DefaultPseudoState(PseudoStateKind.INITIAL)); @@ -248,14 +248,9 @@ public class EnumStateMachineFactory, E extends Enum> exten private static class MachineStackItem { StateMachine machine; - Object parent; - StateData stateData; - public MachineStackItem(StateMachine machine, Object parent, StateData stateData) { - super(); + public MachineStackItem(StateMachine machine) { this.machine = machine; - this.parent = parent; - this.stateData = stateData; } } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineConfigurationImportSelector.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineConfigurationImportSelector.java index 2a7c6428..7ba2fed1 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineConfigurationImportSelector.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineConfigurationImportSelector.java @@ -17,6 +17,7 @@ package org.springframework.statemachine.config.configuration; import java.util.Map; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportSelector; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineFactoryConfiguration.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineFactoryConfiguration.java index ed43c6be..034ff950 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineFactoryConfiguration.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineFactoryConfiguration.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; 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 a7de8323..6c57d328 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 @@ -302,6 +302,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo return transitions; } + @SuppressWarnings("unchecked") @Override public void doWithAllRegions(StateMachineFunction> stateMachineAccess) { stateMachineAccess.apply(this); @@ -636,6 +637,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo return results; } + @SuppressWarnings({ "rawtypes", "unchecked" }) private synchronized List> getStateMachineHandlers(State sourceState, State targetState) { BeanFactory beanFactory = getBeanFactory(); diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/InitialTransition.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/InitialTransition.java index 96a9da74..46c19afb 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/InitialTransition.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/InitialTransition.java @@ -66,7 +66,7 @@ public class InitialTransition implements Transition { * Instantiates a new initial transition. * * @param target the initial target state - * @param action the initial actions + * @param actions the initial actions */ public InitialTransition(State target, Collection> actions) { this.target = target;