From 6a66d7a38437092276d96a2b7fc0be22eaa034a6 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Tue, 23 Jan 2018 10:12:36 +0000
Subject: [PATCH] Fix merge error

- Fix changed signatures from spring data in JpaRepositoryTests.
- Relates to #435
---
 .../statemachine/data/jpa/JpaRepositoryTests.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-statemachine-data/jpa/src/test/java/org/springframework/statemachine/data/jpa/JpaRepositoryTests.java b/spring-statemachine-data/jpa/src/test/java/org/springframework/statemachine/data/jpa/JpaRepositoryTests.java
index 46417746..9f2d8d6e 100644
--- a/spring-statemachine-data/jpa/src/test/java/org/springframework/statemachine/data/jpa/JpaRepositoryTests.java
+++ b/spring-statemachine-data/jpa/src/test/java/org/springframework/statemachine/data/jpa/JpaRepositoryTests.java
@@ -262,7 +262,7 @@ public class JpaRepositoryTests extends AbstractRepositoryTests {
 		stateMachineRepository.save(machine1);
 		assertThat(stateMachineRepository.count(), is(1l));
 
-		JpaRepositoryStateMachine machine1x = stateMachineRepository.findOne("machine1");
+		JpaRepositoryStateMachine machine1x = stateMachineRepository.findById("machine1").get();
 		assertThat(machine1x.getMachineId(), is(machine1.getMachineId()));
 		assertThat(machine1x.getState(), is(machine1.getState()));
 		assertThat(machine1x.getStateMachineContext().length, is(1));