remove sessionFactory bean in HibernateConfig

dhis2 · Nov 15, 2023 · 4fbe455 · 4fbe455
1 parent 7ca34ed
commit 4fbe455
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java b/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java
@@ -52,7 +52,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
@@ -108,13 +107,6 @@ public DefaultHibernateCacheManager cacheManager(
     return cacheManager;
   }
 
-  @Bean("sessionFactory")
-  @Primary
-  public SessionFactory sessionFactory(
-      @Qualifier("entityManagerFactory") EntityManagerFactory entityManager) {
-    return entityManager.unwrap(SessionFactory.class);
-  }
-
   @Bean
   public DbmsManager dbmsManager(
       JdbcTemplate jdbcTemplate,

diff --git a/.../dhis-web-api/src/main/java/org/hisp/dhis/webapi/servlet/DhisWebApiWebAppInitializer.java b/.../dhis-web-api/src/main/java/org/hisp/dhis/webapi/servlet/DhisWebApiWebAppInitializer.java
@@ -40,7 +40,7 @@
 import org.hisp.dhis.system.startup.StartupListener;
 import org.hisp.dhis.webapi.security.config.WebMvcConfig;
 import org.springframework.core.annotation.Order;
-import org.springframework.orm.hibernate5.support.OpenSessionInViewFilter;
+import org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
@@ -104,8 +104,9 @@ public static void setupServlets(
         .addMappingForUrlPatterns(null, false, "/api/*");
 
     FilterRegistration.Dynamic openSessionInViewFilter =
-        context.addFilter("openSessionInViewFilter", OpenSessionInViewFilter.class);
-    openSessionInViewFilter.setInitParameter("sessionFactoryBeanName", "sessionFactory");
+        context.addFilter("openSessionInViewFilter", OpenEntityManagerInViewFilter.class);
+    openSessionInViewFilter.setInitParameter(
+        "entityManagerFactoryBeanName", "entityManagerFactory");
     openSessionInViewFilter.addMappingForUrlPatterns(null, false, "/*");
     openSessionInViewFilter.addMappingForServletNames(null, false, "dispatcher");