From a4197877f8cdfd826d9398349cb567454dd36ff7 Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T Date: Wed, 3 Dec 2025 19:14:28 +0530 Subject: [PATCH 1/2] BAH-4319 | Refactor. Initialize beans for service and Dao from moduleApplicationContext.xml --- .../dao/impl/EpisodeAttributeTypeDaoImpl.java | 5 +- .../episodes/dao/impl/EpisodeDAOImpl.java | 6 +- .../service/EpisodeAttributeTypeService.java | 1 - .../impl/EpisodeAttributeTypeServiceImpl.java | 5 +- .../service/impl/EpisodeServiceImpl.java | 7 +- .../resources/moduleApplicationContext.xml | 69 +++++++++++++++++++ 6 files changed, 86 insertions(+), 7 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java index aa8d3be..8e40d6d 100644 --- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java @@ -9,7 +9,6 @@ import java.util.List; -@Repository public class EpisodeAttributeTypeDaoImpl implements EpisodeAttributeTypeDao { private static final String HQL_SELECT_ALL_EPISODE_ATTRIBUTE_TYPE = "FROM EpisodeAttributeType"; @@ -20,6 +19,10 @@ public class EpisodeAttributeTypeDaoImpl implements EpisodeAttributeTypeDao { private SessionFactory sessionFactory; + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + public EpisodeAttributeTypeDaoImpl(SessionFactory sessionFactory) { this.sessionFactory = sessionFactory; } diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java index 4008e53..86e7732 100644 --- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java @@ -11,12 +11,14 @@ import java.util.List; -@Repository public class EpisodeDAOImpl implements EpisodeDAO { - @Autowired private SessionFactory sessionFactory; + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + @Override public void save(Episode episode) { session().save(episode); diff --git a/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java b/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java index 846a8a3..c6895d2 100644 --- a/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java +++ b/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java @@ -1,6 +1,5 @@ package org.openmrs.module.episodes.service; -import org.openmrs.ConceptAttributeType; import org.openmrs.annotation.Authorized; import org.openmrs.module.episodes.EpisodeAttributeType; import org.springframework.transaction.annotation.Transactional; diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java index c282e95..796f238 100644 --- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java @@ -11,12 +11,15 @@ import java.util.Date; import java.util.List; -@Service @Transactional public class EpisodeAttributeTypeServiceImpl implements EpisodeAttributeTypeService { private EpisodeAttributeTypeDao episodeAttributeTypeDao; + public void setEpisodeAttributeTypeDao(EpisodeAttributeTypeDao episodeAttributeTypeDao) { + this.episodeAttributeTypeDao = episodeAttributeTypeDao; + } + public EpisodeAttributeTypeServiceImpl(EpisodeAttributeTypeDao episodeAttributeTypeDao) { this.episodeAttributeTypeDao = episodeAttributeTypeDao; } diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java index 6e3b13f..149013d 100644 --- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java @@ -11,12 +11,15 @@ import java.util.List; -@Component @Transactional public class EpisodeServiceImpl implements EpisodeService { - @Autowired + private EpisodeDAO episodeDAO; + public void setEpisodeDAO(EpisodeDAO episodeDAO) { + this.episodeDAO = episodeDAO; + } + @Override public void save(Episode episode) { episodeDAO.save(episode); diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml index a542b35..2bec760 100644 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -25,4 +25,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.openmrs.module.episodes.service.EpisodeService + + + + + + + + + org.openmrs.module.episodes.service.EpisodeAttributeTypeService + + + + + + + From 9af6abc5e3db763bef234a2355a93ddaa622867a Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T Date: Wed, 3 Dec 2025 21:08:47 +0530 Subject: [PATCH 2/2] BAH-4319 | Refactor. Switch to constructor injections --- .../dao/impl/EpisodeAttributeTypeDaoImpl.java | 4 ---- .../episodes/dao/impl/EpisodeDAOImpl.java | 2 +- .../impl/EpisodeAttributeTypeServiceImpl.java | 4 ---- .../service/impl/EpisodeServiceImpl.java | 2 +- .../resources/moduleApplicationContext.xml | 18 ++++-------------- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java index 8e40d6d..83a5790 100644 --- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java @@ -19,10 +19,6 @@ public class EpisodeAttributeTypeDaoImpl implements EpisodeAttributeTypeDao { private SessionFactory sessionFactory; - public void setSessionFactory(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - public EpisodeAttributeTypeDaoImpl(SessionFactory sessionFactory) { this.sessionFactory = sessionFactory; } diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java index 86e7732..60df014 100644 --- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java @@ -15,7 +15,7 @@ public class EpisodeDAOImpl implements EpisodeDAO { private SessionFactory sessionFactory; - public void setSessionFactory(SessionFactory sessionFactory) { + public EpisodeDAOImpl(SessionFactory sessionFactory) { this.sessionFactory = sessionFactory; } diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java index 796f238..bfb61ec 100644 --- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java @@ -16,10 +16,6 @@ public class EpisodeAttributeTypeServiceImpl implements EpisodeAttributeTypeServ private EpisodeAttributeTypeDao episodeAttributeTypeDao; - public void setEpisodeAttributeTypeDao(EpisodeAttributeTypeDao episodeAttributeTypeDao) { - this.episodeAttributeTypeDao = episodeAttributeTypeDao; - } - public EpisodeAttributeTypeServiceImpl(EpisodeAttributeTypeDao episodeAttributeTypeDao) { this.episodeAttributeTypeDao = episodeAttributeTypeDao; } diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java index 149013d..bb21361 100644 --- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java @@ -16,7 +16,7 @@ public class EpisodeServiceImpl implements EpisodeService { private EpisodeDAO episodeDAO; - public void setEpisodeDAO(EpisodeDAO episodeDAO) { + public EpisodeServiceImpl(EpisodeDAO episodeDAO) { this.episodeDAO = episodeDAO; } diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml index 2bec760..28d0f07 100644 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -23,17 +23,11 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> - - - - - + - - - + @@ -42,9 +36,7 @@ - - - + @@ -61,9 +53,7 @@ - - - +