refactor(persistence): simplify persistence service hierarchy (#2731)

by merging classes: * TenantHibernatePersistenceService * AbstractHibernatePersistenceService * AbstractDBPersistenceService and by removing extra useless interface TenantPersistenceService Also removed unused Datasource object
bonitasoft · Oct 3, 2023 · 7c18410 · 7c18410
1 parent e7fc47c
commit 7c18410
Show file tree

Hide file tree

Showing 6 changed files with 218 additions and 379 deletions.
diff --git a/...on-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/SQLUtils.java b/...on-tests/bonita-integration-tests-local/src/test/java/org/bonitasoft/engine/SQLUtils.java
@@ -16,7 +16,7 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-import org.bonitasoft.engine.persistence.AbstractHibernatePersistenceService;
+import org.bonitasoft.engine.persistence.HibernatePersistenceService;
 import org.bonitasoft.engine.persistence.ReadPersistenceService;
 import org.bonitasoft.engine.service.ServiceAccessorSingleton;
 import org.hibernate.SessionFactory;
@@ -45,7 +45,7 @@ private static SessionFactory getSessionFactory() throws NoSuchFieldException, I
 
     private static SessionFactory createSessionFactory() throws NoSuchFieldException, IllegalAccessException {
         ReadPersistenceService persistenceService = ServiceAccessorSingleton.getInstance().getReadPersistenceService();
-        Field sessionFactoryField = AbstractHibernatePersistenceService.class.getDeclaredField("sessionFactory");
+        Field sessionFactoryField = HibernatePersistenceService.class.getDeclaredField("sessionFactory");
         sessionFactoryField.setAccessible(true);
         return (SessionFactory) sessionFactoryField.get(persistenceService);
     }

diff --git a/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml b/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml
@@ -1023,11 +1023,10 @@
         </property>
     </bean>
 
-    <bean id="persistenceService" class="org.bonitasoft.engine.persistence.TenantHibernatePersistenceService" destroy-method="destroy">
+    <bean id="persistenceService" class="org.bonitasoft.engine.persistence.HibernatePersistenceService" destroy-method="destroy">
         <constructor-arg name="hbmConfigurationProvider" ref="hbmConfigurationProvider" />
         <constructor-arg name="extraHibernateProperties" ref="extraHibernateProperties" />
         <constructor-arg name="sequenceManager" ref="sequenceManager" />
-        <constructor-arg name="datasource" ref="bonitaNonXaDataSource" />
         <constructor-arg name="queryBuilderFactory" ref="queryBuilderFactory" />
     </bean>
 

diff --git a/...istence/src/main/java/org/bonitasoft/engine/persistence/AbstractDBPersistenceService.java b/...istence/src/main/java/org/bonitasoft/engine/persistence/AbstractDBPersistenceService.java