HSEARCH-4674 Change how spring receives properties for test execution

hibernate · Nov 8, 2023 · b9c1d35 · b9c1d35
1 parent 8b0787b
commit b9c1d35
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 17 deletions.
diff --git a/integrationtest/mapper/orm-spring/pom.xml b/integrationtest/mapper/orm-spring/pom.xml
@@ -18,7 +18,7 @@
             Remove Hibernate system properties from parent settings:
             They are supposed to be handled by the spring.datasource subsystem
             and not by the Hibernate internal pool!
-            See also the failsafe configuration.
+            See also the DatabaseContainer#springConfiguration().
          -->
         <failsafe.jvm.args.hibernate-orm></failsafe.jvm.args.hibernate-orm>
     </properties>
@@ -89,20 +89,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skip>${failsafe.spring.skip}</skip>
-                    <!--
-                        Since we do not pass the Hibernate ORM settings through system properties directly
-                        (see the override of the failsafe.jvm.args.hibernate-orm near the top of this file),
-                        we need to pass the settings some other way.
-                        Here we chose to use environment variables.
-                     -->
-                    <environmentVariables>
-                        <HIBERNATE_DIALECT>${db.dialect}</HIBERNATE_DIALECT>
-                        <JDBC_DRIVER>${jdbc.driver}</JDBC_DRIVER>
-                        <JDBC_URL>${jdbc.url}</JDBC_URL>
-                        <JDBC_USERNAME>${jdbc.user}</JDBC_USERNAME>
-                        <JDBC_PASSWORD>${jdbc.pass}</JDBC_PASSWORD>
-                        <JDBC_ISOLATION>${jdbc.isolation}</JDBC_ISOLATION>
-                    </environmentVariables>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/...va/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java b/...va/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java
@@ -23,6 +23,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.search.engine.environment.bean.BeanHolder;
 import org.hibernate.search.engine.environment.bean.BeanReference;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.integrationtest.common.extension.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.BackendMappingHandle;
@@ -31,6 +32,7 @@
 import org.hibernate.search.util.impl.test.extension.StaticCounters;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -58,6 +60,7 @@
  * then checking the Spring-defined hooks (@PostConstruct and @PreDestroy) have been called
  * exactly as many times as expected.
  */
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @TestForIssue(jiraKey = { "HSEARCH-1316", "HSEARCH-3171" })
 class SpringBeanResolutionIT {
 

diff --git a/...ate/search/integrationtest/spring/extension/HibernateSpringPropertiesSetterExtension.java b/...ate/search/integrationtest/spring/extension/HibernateSpringPropertiesSetterExtension.java
@@ -0,0 +1,19 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.integrationtest.spring.extension;
+
+import org.hibernate.search.util.impl.integrationtest.mapper.orm.DatabaseContainer;
+
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class HibernateSpringPropertiesSetterExtension implements BeforeAllCallback {
+	@Override
+	public void beforeAll(ExtensionContext context) {
+		DatabaseContainer.springConfiguration();
+	}
+}
diff --git a/...-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java b/...-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringIT.java
@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.integrationtest.spring.jta.dao.SnertDAO;
 import org.hibernate.search.integrationtest.spring.jta.entity.Snert;
 import org.hibernate.search.mapper.orm.session.impl.HibernateOrmSearchSessionHolder;
@@ -30,6 +31,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaAndSpringApplicationConfiguration.class)
 @ActiveProfiles("jta")

diff --git a/.../test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java b/.../test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringMoreComplexIT.java
@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.integrationtest.spring.jta.dao.BoxDAO;
 import org.hibernate.search.integrationtest.spring.jta.entity.Box;
 import org.hibernate.search.integrationtest.spring.jta.entity.Doughnut;
@@ -32,6 +33,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaAndSpringApplicationConfiguration.class)
 @ActiveProfiles("jta")

diff --git a/...g/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java b/...g/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringOutboxIT.java
@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.integrationtest.spring.jta.dao.SnertDAO;
 import org.hibernate.search.integrationtest.spring.jta.entity.Snert;
 import org.hibernate.search.mapper.orm.session.impl.HibernateOrmSearchSessionHolder;
@@ -29,6 +30,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaAndSpringOutboxApplicationConfiguration.class)
 @ActiveProfiles({ "jta", "outbox" })

diff --git a/...ibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java b/...ibernate/search/integrationtest/spring/jta/timeout/RaisedTimeoutJtaAndSpringOutboxIT.java
@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.integrationtest.spring.jta.JtaAndSpringOutboxApplicationConfiguration;
 import org.hibernate.search.integrationtest.spring.jta.dao.SnertDAO;
 import org.hibernate.search.integrationtest.spring.jta.entity.Snert;
@@ -30,6 +31,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaAndSpringOutboxApplicationConfiguration.class)
 @ActiveProfiles({ "jta", "outbox", "transaction-timeout", "raised-timeout" })

diff --git a/...ate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java b/...ate/search/integrationtest/spring/jta/timeout/TransactionTimeoutJtaAndSpringOutboxIT.java
@@ -13,6 +13,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.search.integrationtest.spring.extension.HibernateSpringPropertiesSetterExtension;
 import org.hibernate.search.integrationtest.spring.jta.JtaAndSpringOutboxApplicationConfiguration;
 import org.hibernate.search.integrationtest.spring.jta.dao.SnertDAO;
 import org.hibernate.search.integrationtest.spring.jta.entity.Snert;
@@ -29,6 +30,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(HibernateSpringPropertiesSetterExtension.class)
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaAndSpringOutboxApplicationConfiguration.class)
 @ActiveProfiles({ "jta", "outbox", "transaction-timeout" })

diff --git a/...ain/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/DatabaseContainer.java b/...ain/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/DatabaseContainer.java
@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Future;
-import java.util.Locale;
+import java.util.function.Consumer;
 
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Ulimit;
@@ -32,8 +32,10 @@ public final class DatabaseContainer {
 	private DatabaseContainer() {
 	}
 
+	private static final Object LOCK = new Object();
 	private static final SupportedDatabase DATABASE;
 	private static final HibernateSearchJdbcDatabaseContainer DATABASE_CONTAINER;
+	private static Boolean H2_INITIALIZED = Boolean.FALSE;
 
 
 	static {
@@ -46,11 +48,36 @@ private DatabaseContainer() {
 
 
 	public static Configuration configuration() {
+		return configure( Configuration::addAsSystemProperties );
+	}
+
+	public static Configuration springConfiguration() {
+		return configure( Configuration::addAsSpringSystemProperties );
+	}
+
+	private static Configuration configure(Consumer<Configuration> propertySetter) {
 		if ( !SupportedDatabase.H2.equals( DATABASE ) ) {
 			DATABASE_CONTAINER.start();
 		}
 		Configuration configuration = DATABASE.configuration( DATABASE_CONTAINER );
-		configuration.addAsSystemProperties();
+
+		if ( DATABASE_CONTAINER != null && !DATABASE_CONTAINER.isRunning() ) {
+			synchronized (DATABASE_CONTAINER) {
+				if ( !DATABASE_CONTAINER.isRunning() ) {
+					DATABASE_CONTAINER.start();
+					propertySetter.accept( configuration );
+				}
+			}
+		}
+		else if ( !H2_INITIALIZED ) {
+			synchronized (LOCK) {
+				if ( !H2_INITIALIZED ) {
+					propertySetter.accept( configuration );
+					H2_INITIALIZED = Boolean.TRUE;
+				}
+			}
+		}
+
 		return configuration;
 	}
 
@@ -365,6 +392,15 @@ private void addAsSystemProperties() {
 			System.setProperty( "hibernate.connection.password", this.pass );
 			System.setProperty( "hibernate.connection.isolation", this.isolation );
 		}
+
+		private void addAsSpringSystemProperties() {
+			System.setProperty( "HIBERNATE_DIALECT", this.dialect );
+			System.setProperty( "JDBC_DRIVER", this.driver );
+			System.setProperty( "JDBC_URL", this.url );
+			System.setProperty( "JDBC_USERNAME", this.user );
+			System.setProperty( "JDBC_PASSWORD", this.pass );
+			System.setProperty( "JDBC_ISOLATION", this.isolation );
+		}
 	}
 
 }