HSEARCH-4674 Make sure that correct *.properties file is read when co…

…nfiguring the session
hibernate · Dec 8, 2022 · 3cf380d · 3cf380d
1 parent 2e8c755
commit 3cf380d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 0 deletions.
diff --git a/...test/java/modules/orm/elasticsearch/coordination/outboxpolling/service/AuthorService.java b/...test/java/modules/orm/elasticsearch/coordination/outboxpolling/service/AuthorService.java
@@ -58,6 +58,7 @@ public void triggerValidationFailure() {
 	}
 
 	private StandardServiceRegistryBuilder applyConnectionProperties(StandardServiceRegistryBuilder registryBuilder) {
+		registryBuilder.loadProperties( "actual-hibernate.properties" );
 		// DB properties:
 		Map<String, Object> db = new HashMap<>();
 		DatabaseContainer.configuration().add( db );

diff --git a/...h/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties b/...h/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties
diff --git a/...ibernate/search/integrationtest/java/modules/orm/elasticsearch/service/AuthorService.java b/...ibernate/search/integrationtest/java/modules/orm/elasticsearch/service/AuthorService.java
@@ -58,6 +58,7 @@ public void triggerValidationFailure() {
 	}
 
 	private StandardServiceRegistryBuilder applyConnectionProperties(StandardServiceRegistryBuilder registryBuilder) {
+		registryBuilder.loadProperties( "actual-hibernate.properties" );
 		// DB properties:
 		Map<String, Object> db = new HashMap<>();
 		DatabaseContainer.configuration().add( db );

diff --git a/...h/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties b/...h/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties
diff --git a/...a/org/hibernate/search/integrationtest/java/modules/orm/lucene/service/AuthorService.java b/...a/org/hibernate/search/integrationtest/java/modules/orm/lucene/service/AuthorService.java
@@ -40,6 +40,7 @@ private SessionFactory createSessionFactory() {
 	}
 
 	private StandardServiceRegistryBuilder applyConnectionProperties(StandardServiceRegistryBuilder registryBuilder) {
+		registryBuilder.loadProperties( "actual-hibernate.properties" );
 		// DB properties:
 		Map<String, Object> db = new HashMap<>();
 		DatabaseContainer.configuration().add( db );

diff --git a/...e/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties b/...e/src/main/resources/hibernate.properties → ...ain/resources/actual-hibernate.properties