Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9f728b3d
Commit
9f728b3d
authored
Jan 21, 2016
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong import
parent
a61b29e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
FlywayAutoConfiguration.java
...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+3
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file @
9f728b3d
...
@@ -24,7 +24,6 @@ import javax.annotation.PostConstruct;
...
@@ -24,7 +24,6 @@ import javax.annotation.PostConstruct;
import
javax.persistence.EntityManagerFactory
;
import
javax.persistence.EntityManagerFactory
;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.flywaydb.core.Flyway
;
import
org.flywaydb.core.Flyway
;
import
org.flywaydb.core.api.MigrationVersion
;
import
org.flywaydb.core.api.MigrationVersion
;
...
@@ -50,6 +49,7 @@ import org.springframework.core.io.ResourceLoader;
...
@@ -50,6 +49,7 @@ import org.springframework.core.io.ResourceLoader;
import
org.springframework.orm.jpa.AbstractEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.AbstractEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
import
org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
org.springframework.util.ObjectUtils
;
/**
/**
* {@link EnableAutoConfiguration Auto-configuration} for Flyway database migrations.
* {@link EnableAutoConfiguration Auto-configuration} for Flyway database migrations.
...
@@ -57,6 +57,7 @@ import org.springframework.util.Assert;
...
@@ -57,6 +57,7 @@ import org.springframework.util.Assert;
* @author Dave Syer
* @author Dave Syer
* @author Phillip Webb
* @author Phillip Webb
* @author Vedran Pavic
* @author Vedran Pavic
* @author Stephane Nicoll
* @since 1.1.0
* @since 1.1.0
*/
*/
@Configuration
@Configuration
...
@@ -189,7 +190,7 @@ public class FlywayAutoConfiguration {
...
@@ -189,7 +190,7 @@ public class FlywayAutoConfiguration {
@Override
@Override
public
Object
convert
(
Object
source
,
TypeDescriptor
sourceType
,
TypeDescriptor
targetType
)
{
public
Object
convert
(
Object
source
,
TypeDescriptor
sourceType
,
TypeDescriptor
targetType
)
{
String
value
=
ObjectUtils
.
t
oString
(
source
);
String
value
=
ObjectUtils
.
nullSafeT
oString
(
source
);
return
MigrationVersion
.
fromVersion
(
value
);
return
MigrationVersion
.
fromVersion
(
value
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment