From c213f62aefa02372c2525e07ba2b5efbb12a2da4 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Tue, 14 May 2019 07:09:19 +0100
Subject: [PATCH] Reactive test changes for core

- Relates #750
---
 .../persist/AbstractStateMachinePersister.java            | 4 ++--
 .../statemachine/service/DefaultStateMachineService.java  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/persist/AbstractStateMachinePersister.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/persist/AbstractStateMachinePersister.java
index 6cd57c76..925b8a76 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/persist/AbstractStateMachinePersister.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/persist/AbstractStateMachinePersister.java
@@ -68,7 +68,7 @@ public abstract class AbstractStateMachinePersister<S, E, T> implements StateMac
 	@Override
 	public final StateMachine<S, E> restore(StateMachine<S, E> stateMachine, T contextObj) throws Exception {
 		final StateMachineContext<S, E> context = stateMachinePersist.read(contextObj);
-		stateMachine.stop();
+		stateMachine.stopReactively().block();
 		stateMachine.getStateMachineAccessor().doWithAllRegions(new StateMachineFunction<StateMachineAccess<S, E>>() {
 
 			@Override
@@ -76,7 +76,7 @@ public abstract class AbstractStateMachinePersister<S, E, T> implements StateMac
 				function.resetStateMachine(context);
 			}
 		});
-		stateMachine.start();
+		stateMachine.startReactively().block();
 		return stateMachine;
 	}
 
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java
index cba0feba..ef4a9140 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java
@@ -111,7 +111,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
 			StateMachine<S, E> stateMachine = machines.remove(machineId);
 			if (stateMachine != null) {
 				log.info("Found machine with id " + machineId);
-				stateMachine.stop();
+				stateMachine.stopReactively().block();
 			}
 		}
 	}
@@ -163,7 +163,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
 		if (stateMachineContext == null) {
 			return stateMachine;
 		}
-		stateMachine.stop();
+		stateMachine.stopReactively().block();
 		// only go via top region
 		stateMachine.getStateMachineAccessor().doWithRegion(new StateMachineFunction<StateMachineAccess<S, E>>() {
 
@@ -180,7 +180,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
 			if (!((Lifecycle) stateMachine).isRunning()) {
 				StartListener<S, E> listener = new StartListener<>(stateMachine);
 				stateMachine.addStateListener(listener);
-				stateMachine.start();
+				stateMachine.startReactively().block();
 				try {
 					listener.latch.await();
 				} catch (InterruptedException e) {
@@ -195,7 +195,7 @@ public class DefaultStateMachineService<S, E> implements StateMachineService<S,
 			if (((Lifecycle) stateMachine).isRunning()) {
 				StopListener<S, E> listener = new StopListener<>(stateMachine);
 				stateMachine.addStateListener(listener);
-				stateMachine.stop();
+				stateMachine.stopReactively().block();
 				try {
 					listener.latch.await();
 				} catch (InterruptedException e) {