From 4568f8073054bd96dc4fc4e732146e891a30e936 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 11 Jul 2018 09:01:28 +0100
Subject: [PATCH] Polish instance check

- Remove possible call to expensive
  BeanFactory#toString.
- Backport #569
- Relates #573
---
 .../annotation/AbstractImportingAnnotationConfiguration.java   | 3 +--
 .../statemachine/processor/StateMachineHandlerCallHelper.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractImportingAnnotationConfiguration.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractImportingAnnotationConfiguration.java
index 9a80ceb3..ab9a3af9 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractImportingAnnotationConfiguration.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractImportingAnnotationConfiguration.java
@@ -128,8 +128,7 @@ public abstract class AbstractImportingAnnotationConfiguration<B extends Annotat
 
 	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		Assert.isInstanceOf(ListableBeanFactory.class, beanFactory,
-				"beanFactory be of type ListableBeanFactory but was " + beanFactory);
+		Assert.isInstanceOf(ListableBeanFactory.class, beanFactory);
 		this.beanFactory = beanFactory;
 	}
 
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/processor/StateMachineHandlerCallHelper.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/processor/StateMachineHandlerCallHelper.java
index 307aec0f..8ee2ed55 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/processor/StateMachineHandlerCallHelper.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/processor/StateMachineHandlerCallHelper.java
@@ -109,8 +109,7 @@ public class StateMachineHandlerCallHelper<S, E> implements InitializingBean, Be
 			// in a same way further things will be skipped in afterPropertiesSet()
 			return;
 		}
-		Assert.state(beanFactory instanceof ListableBeanFactory,
-				"Bean factory must be instance of ListableBeanFactory, was " + beanFactory);
+		Assert.isInstanceOf(ListableBeanFactory.class, beanFactory);
 		this.beanFactory = (ListableBeanFactory)beanFactory;
 	}