Hacking

See spring-projectsgh-23735

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java

@@ -57,6 +57,11 @@
 @Import({ DataSourcePoolMetadataProvidersConfiguration.class, DataSourceInitializationConfiguration.class })
 public class DataSourceAutoConfiguration {
 
+	/**
+	 * The name of the bean that initializes the datasource using data.sql and schema.sql.
+	 */
+	public static final String DATASOURCE_INITIALIZER_INVOKER_BEAN_NAME = "dataSourceInitializerInvoker";
+
 	@Configuration(proxyBeanMethods = false)
 	@Conditional(EmbeddedDatabaseCondition.class)
 	@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializationConfiguration.java

@@ -20,6 +20,8 @@
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
@@ -31,9 +33,15 @@
  * @author Stephane Nicoll
  */
 @Configuration(proxyBeanMethods = false)
-@Import({ DataSourceInitializerInvoker.class, DataSourceInitializationConfiguration.Registrar.class })
+@Import(DataSourceInitializationConfiguration.Registrar.class)
 class DataSourceInitializationConfiguration {
 
+	@Bean(name = DataSourceAutoConfiguration.DATASOURCE_INITIALIZER_INVOKER_BEAN_NAME)
+	DataSourceInitializerInvoker dataSourceInitializerInvoker(ApplicationContext applicationContext,
+			DataSourceProperties properties) {
+		return new DataSourceInitializerInvoker(applicationContext, properties);
+	}
+
 	/**
 	 * {@link ImportBeanDefinitionRegistrar} to register the
 	 * {@link DataSourceInitializerPostProcessor} without causing early bean instantiation

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerInvoker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -22,7 +22,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.log.LogMessage;
@@ -39,21 +38,17 @@ class DataSourceInitializerInvoker implements ApplicationListener<DataSourceSche
 
 	private static final Log logger = LogFactory.getLog(DataSourceInitializerInvoker.class);
 
-	private final ObjectProvider<DataSource> dataSource;
+	private final ApplicationContext applicationContext;
 
 	private final DataSourceProperties properties;
 
-	private final ApplicationContext applicationContext;
-
 	private DataSourceInitializer dataSourceInitializer;
 
 	private boolean initialized;
 
-	DataSourceInitializerInvoker(ObjectProvider<DataSource> dataSource, DataSourceProperties properties,
-			ApplicationContext applicationContext) {
-		this.dataSource = dataSource;
-		this.properties = properties;
+	DataSourceInitializerInvoker(ApplicationContext applicationContext, DataSourceProperties properties) {
 		this.applicationContext = applicationContext;
+		this.properties = properties;
 	}
 
 	@Override
@@ -95,7 +90,7 @@ public void onApplicationEvent(DataSourceSchemaCreatedEvent event) {
 
 	private DataSourceInitializer getDataSourceInitializer() {
 		if (this.dataSourceInitializer == null) {
-			DataSource ds = this.dataSource.getIfUnique();
+			DataSource ds = this.applicationContext.getBeanProvider(DataSource.class).getIfUnique();
 			if (ds != null) {
 				this.dataSourceInitializer = new DataSourceInitializer(ds, this.properties, this.applicationContext);
 			}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -17,16 +17,20 @@
 package org.springframework.boot.autoconfigure.orm.jpa;
 
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 
 import org.hibernate.engine.spi.SessionImplementor;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.data.jpa.EntityManagerFactoryDependsOnPostProcessor;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
 /**
@@ -45,4 +49,19 @@
 @Import(HibernateJpaConfiguration.class)
 public class HibernateJpaAutoConfiguration {
 
+	/**
+	 * Post processor to ensure that the event listener that handles schema initialization
+	 * is fully initialized before any {@link EntityManagerFactory} beans.
+	 */
+	@ConditionalOnBean(value = AbstractEntityManagerFactoryBean.class,
+			name = DataSourceAutoConfiguration.DATASOURCE_INITIALIZER_INVOKER_BEAN_NAME)
+	static class DataSourceInitializerEntityManagerFactoryDependsOnPostProcessor
+			extends EntityManagerFactoryDependsOnPostProcessor {
+
+		DataSourceInitializerEntityManagerFactoryDependsOnPostProcessor() {
+			super(DataSourceAutoConfiguration.DATASOURCE_INITIALIZER_INVOKER_BEAN_NAME);
+		}
+
+	}
+
 }