From 9f728b3d593425b3b53d29176b46eecc4f36d491 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 21 Jan 2016 10:37:40 +0100 Subject: [PATCH] Fix wrong import --- .../boot/autoconfigure/flyway/FlywayAutoConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index a91177d931e..014792bdd49 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -24,7 +24,6 @@ import javax.annotation.PostConstruct; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; -import org.apache.commons.lang.ObjectUtils; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationVersion; @@ -50,6 +49,7 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; /** * {@link EnableAutoConfiguration Auto-configuration} for Flyway database migrations. @@ -57,6 +57,7 @@ import org.springframework.util.Assert; * @author Dave Syer * @author Phillip Webb * @author Vedran Pavic + * @author Stephane Nicoll * @since 1.1.0 */ @Configuration @@ -189,7 +190,7 @@ public class FlywayAutoConfiguration { @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { - String value = ObjectUtils.toString(source); + String value = ObjectUtils.nullSafeToString(source); return MigrationVersion.fromVersion(value); }