diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurer.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurer.java index 04e7e773..d9e65d01 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurer.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurer.java @@ -151,6 +151,7 @@ public class DefaultStateConfigurer return state(state, entryActions, exitActions); } + @SuppressWarnings("unchecked") @Override public StateConfigurer state(S state, E... deferred) { Collection d = null; diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/StateConfigurer.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/StateConfigurer.java index 73278b07..a15b700d 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/StateConfigurer.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configurers/StateConfigurer.java @@ -97,6 +97,7 @@ public interface StateConfigurer extends * @param deferred the deferred events * @return configurer for chaining */ + @SuppressWarnings("unchecked") StateConfigurer state(S state, E... deferred); /** diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/SubStateMachineTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/SubStateMachineTests.java index c2eb6dc9..7b0adfee 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/SubStateMachineTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/SubStateMachineTests.java @@ -413,7 +413,6 @@ public class SubStateMachineTests extends AbstractStateMachineTests { @EnableStateMachine public static class Config1 extends EnumStateMachineConfigurerAdapter { - @SuppressWarnings("unchecked") @Override public void configure(StateMachineStateConfigurer states) throws Exception { states diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ConfigurationTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ConfigurationTests.java index bff46cc3..6e1413fe 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ConfigurationTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ConfigurationTests.java @@ -225,7 +225,6 @@ public class ConfigurationTests extends AbstractStateMachineTests { @EnableStateMachine public static class Config5 extends EnumStateMachineConfigurerAdapter { - @SuppressWarnings("unchecked") @Override public void configure(StateMachineStateConfigurer states) throws Exception { TestEntryAction action1 = action1(); diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ManualBuilderTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ManualBuilderTests.java index 0d3a2407..d4245da5 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ManualBuilderTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ManualBuilderTests.java @@ -175,16 +175,6 @@ public class ManualBuilderTests { transitionLatch.countDown(); } - public void reset(int c1) { - reset(c1, 0); - } - - public void reset(int c1, int c2) { - stateChangedLatch = new CountDownLatch(c1); - transitionLatch = new CountDownLatch(c2); - stateChangedCount = 0; - } - } } diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurerTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurerTests.java index d3ab4799..738b076a 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurerTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/config/configurers/DefaultStateConfigurerTests.java @@ -85,7 +85,6 @@ public class DefaultStateConfigurerTests { @Test public void testActionsInitialFirst() throws Exception { - @SuppressWarnings("unchecked") Collection> exitActions = Arrays.asList(testExitAction()); DefaultStateConfigurer configurer = new DefaultStateConfigurer(); @@ -103,7 +102,6 @@ public class DefaultStateConfigurerTests { @Test public void testActionsJustState() throws Exception { - @SuppressWarnings("unchecked") Collection> entryActions = Arrays.asList(testEntryAction()); DefaultStateConfigurer configurer = new DefaultStateConfigurer(); diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/state/StateActionTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/state/StateActionTests.java index e72d65cc..d3427a97 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/state/StateActionTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/state/StateActionTests.java @@ -40,12 +40,12 @@ import org.springframework.statemachine.config.builders.StateMachineTransitionCo /** * Tests for state entry and exit actions. - * + * * @author Janne Valkealahti * */ public class StateActionTests extends AbstractStateMachineTests { - + @Test @SuppressWarnings("unchecked") public void testStateEntryExit() throws Exception { @@ -56,24 +56,22 @@ public class StateActionTests extends AbstractStateMachineTests { TestEntryAction testEntryAction = ctx.getBean("testEntryAction", TestEntryAction.class); assertThat(testExitAction, notNullValue()); assertThat(testEntryAction, notNullValue()); - + machine.start(); machine.sendEvent(TestEvents.E1); assertThat(testExitAction.onExecuteLatch.await(2, TimeUnit.SECONDS), is(true)); assertThat(testEntryAction.onExecuteLatch.await(2, TimeUnit.SECONDS), is(true)); - + ctx.close(); } - + @Configuration @EnableStateMachine public static class Config1 extends EnumStateMachineConfigurerAdapter { @Override public void configure(StateMachineStateConfigurer states) throws Exception { - @SuppressWarnings("unchecked") Collection> entryActions = Arrays.asList(testEntryAction()); - @SuppressWarnings("unchecked") Collection> exitActions = Arrays.asList(testExitAction()); states .withStates() @@ -100,7 +98,7 @@ public class StateActionTests extends AbstractStateMachineTests { public Action testExitAction() { return new TestExitAction(); } - + @Bean public TaskExecutor taskExecutor() { return new SyncTaskExecutor(); diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionTests.java index 82ce7b54..a892ca37 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/transition/TransitionTests.java @@ -261,9 +261,7 @@ public class TransitionTests extends AbstractStateMachineTests { @Override public void configure(StateMachineStateConfigurer states) throws Exception { - @SuppressWarnings("unchecked") Collection> entryActions = Arrays.asList(testEntryAction()); - @SuppressWarnings("unchecked") Collection> exitActions = Arrays.asList(testExitAction()); states .withStates() diff --git a/spring-statemachine-recipes/src/test/java/org/springframework/statemachine/recipes/TasksHandlerTests.java b/spring-statemachine-recipes/src/test/java/org/springframework/statemachine/recipes/TasksHandlerTests.java index e85e1278..2c59cf98 100644 --- a/spring-statemachine-recipes/src/test/java/org/springframework/statemachine/recipes/TasksHandlerTests.java +++ b/spring-statemachine-recipes/src/test/java/org/springframework/statemachine/recipes/TasksHandlerTests.java @@ -298,17 +298,6 @@ public class TasksHandlerTests { onTasksErrorLatch.countDown(); } - public void reset(int c1, int c2, int c3, int c4, int c5, int c6, int c7) { - onTasksStartedLatch = new CountDownLatch(c1); - onTasksContinueLatch = new CountDownLatch(c2); - onTaskPreExecuteLatch = new CountDownLatch(c3); - onTaskPostExecuteLatch = new CountDownLatch(c4); - onTaskFailedLatch = new CountDownLatch(c5); - onTasksSuccessLatch = new CountDownLatch(c6); - onTasksErrorLatch = new CountDownLatch(c7); - onTasksStarted = 0; - } - } } diff --git a/spring-statemachine-samples/persist/src/test/java/demo/persist/PersistTests.java b/spring-statemachine-samples/persist/src/test/java/demo/persist/PersistTests.java index fda8c2db..c0178e7e 100644 --- a/spring-statemachine-samples/persist/src/test/java/demo/persist/PersistTests.java +++ b/spring-statemachine-samples/persist/src/test/java/demo/persist/PersistTests.java @@ -98,7 +98,6 @@ public class PersistTests { volatile List> transitions = new ArrayList>(); List> statesEntered = new ArrayList>(); List> statesExited = new ArrayList>(); - volatile int transitionCount = 0; @Override public void stateChanged(State from, State to) { @@ -120,25 +119,9 @@ public class PersistTests { @Override public void transition(Transition transition) { transitions.add(transition); - transitionCount++; transitionLatch.countDown(); } - public void reset(int c1, int c2, int c3) { - reset(c1, c2, c3, 0); - } - - public void reset(int c1, int c2, int c3, int c4) { - stateChangedLatch = new CountDownLatch(c1); - stateEnteredLatch = new CountDownLatch(c2); - stateExitedLatch = new CountDownLatch(c3); - transitionLatch = new CountDownLatch(c4); - statesEntered.clear(); - statesExited.clear(); - transitionCount = 0; - transitions.clear(); - } - } } diff --git a/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java b/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java index 81183a8e..f86e9a10 100644 --- a/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java +++ b/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java @@ -158,11 +158,6 @@ public class ZookeeperStateMachineEnsembleTests extends AbstractZookeeperTests { eventLatch.countDown(); } - public void reset(int c1, int c2) { - joinedLatch = new CountDownLatch(c1); - eventLatch = new CountDownLatch(c2); - } - } private class TestStateMachine implements StateMachine {