Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Keep Liquibase-specific DataSource open for use by LiquibaseEndpoint

Browse Source 
Closes gh-13832
This commit is contained in:
Andy Wilkinson
2018-10-15 15:26:26 +01:00
parent d4ec45e192
commit 0fedf8d2af
4 changed files with 156 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/DataSourceClosingSpringLiquibase.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.liquibase;
import java.lang.reflect.Method;
import javax.sql.DataSource;
import liquibase.exception.LiquibaseException;
import liquibase.integration.spring.SpringLiquibase;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.util.ReflectionUtils;
/**
* A custom {@link SpringLiquibase} extension that closes the underlying
* {@link DataSource} once the database has been migrated.
*
* @author Andy Wilkinson
* @since 2.0.6
*/
public class DataSourceClosingSpringLiquibase extends SpringLiquibase
implements DisposableBean {
private volatile boolean closeDataSourceOnceMigrated = true;
public void setCloseDataSourceOnceMigrated(boolean closeDataSourceOnceMigrated) {
this.closeDataSourceOnceMigrated = closeDataSourceOnceMigrated;
}
@Override
public void afterPropertiesSet() throws LiquibaseException {
super.afterPropertiesSet();
if (this.closeDataSourceOnceMigrated) {
closeDataSource();
}
}
private void closeDataSource() {
Class<?> dataSourceClass = getDataSource().getClass();
Method closeMethod = ReflectionUtils.findMethod(dataSourceClass, "close");
if (closeMethod != null) {
ReflectionUtils.invokeMethod(closeMethod, getDataSource());
}
}
@Override
public void destroy() throws Exception {
if (!this.closeDataSourceOnceMigrated) {
closeDataSource();
}
}
}

25
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View File

@@ -16,7 +16,6 @@
package org.springframework.boot.autoconfigure.liquibase;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.function.Supplier;
@@ -26,7 +25,6 @@ import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import liquibase.change.DatabaseChange;
import liquibase.exception.LiquibaseException;
import liquibase.integration.spring.SpringLiquibase;
import org.springframework.beans.factory.ObjectProvider;
@@ -52,7 +50,6 @@ import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
/**
* {@link EnableAutoConfiguration Auto-configuration} for Liquibase.
@@ -207,26 +204,4 @@ public class LiquibaseAutoConfiguration {
}
/**
* A custom {@link SpringLiquibase} extension that closes the underlying
* {@link DataSource} once the database has been migrated.
*/
private static final class DataSourceClosingSpringLiquibase extends SpringLiquibase {
@Override
public void afterPropertiesSet() throws LiquibaseException {
super.afterPropertiesSet();
closeDataSource();
}
private void closeDataSource() {
Class<?> dataSourceClass = getDataSource().getClass();
Method closeMethod = ReflectionUtils.findMethod(dataSourceClass, "close");
if (closeMethod != null) {
ReflectionUtils.invokeMethod(closeMethod, getDataSource());
}
}
}
}