From 4b1ac6e7a0abc50a705c1de0a6090fbe8f002eb3 Mon Sep 17 00:00:00 2001
From: MOHANKUMAR T <mohan13081999@gmail.com>
Date: Wed, 11 Sep 2024 23:09:15 +0530
Subject: [PATCH] BAH-4106 | Fix. Remove @Repository annotation and create
 beans through xml

---
 .../fhirExtension/dao/impl/TaskDaoImpl.java   |  1 -
 .../dao/impl/TaskRequestedPeriodDaoImpl.java  |  1 -
 .../resources/webModuleApplicationContext.xml | 26 +++++++++----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskDaoImpl.java b/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskDaoImpl.java
index 4f7ba59..ca28352 100644
--- a/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskDaoImpl.java
+++ b/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskDaoImpl.java
@@ -20,7 +20,6 @@
 import java.util.Date;
 import java.util.List;
 
-@Repository
 public class TaskDaoImpl implements TaskDao {
 	
 	private SessionFactory sessionFactory;
diff --git a/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskRequestedPeriodDaoImpl.java b/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskRequestedPeriodDaoImpl.java
index c254968..d961da9 100644
--- a/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskRequestedPeriodDaoImpl.java
+++ b/api/src/main/java/org/openmrs/module/fhirExtension/dao/impl/TaskRequestedPeriodDaoImpl.java
@@ -9,7 +9,6 @@
 
 // TODO: This Dao is to be removed after support openmrs R5
 
-@Repository
 public class TaskRequestedPeriodDaoImpl implements TaskRequestedPeriodDao {
 	
 	private SessionFactory sessionFactory;
diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml
index eae1778..a456186 100644
--- a/omod/src/main/resources/webModuleApplicationContext.xml
+++ b/omod/src/main/resources/webModuleApplicationContext.xml
@@ -27,23 +27,21 @@
 	<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"/>
 
 	<context:component-scan base-package="org.openmrs.module.fhirExtension" />
+	<bean id="taskDao" class="org.openmrs.module.fhirExtension.dao.impl.TaskDaoImpl">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="taskRequestedPeriodDao" class="org.openmrs.module.fhirExtension.dao.impl.TaskRequestedPeriodDaoImpl">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
 	<bean id="taskServiceTarget" class="org.openmrs.module.fhirExtension.service.impl.TaskServiceImpl">
 		<property name="visitService" ref="visitService"/>
 		<property name="fhirTaskDao" ref="fhirTaskDaoImpl"/>
-		<property name="taskDao">
-			<bean class="org.openmrs.module.fhirExtension.dao.impl.TaskDaoImpl">
-				<property name="sessionFactory">
-					<ref bean="sessionFactory" />
-				</property>
-			</bean>
-		</property>
-		<property name="taskRequestedPeriodDao">
-			<bean class="org.openmrs.module.fhirExtension.dao.impl.TaskRequestedPeriodDaoImpl">
-				<property name="sessionFactory">
-					<ref bean="sessionFactory" />
-				</property>
-			</bean>
-		</property>
+		<property name="taskDao" ref="taskDao"/>
+		<property name="taskRequestedPeriodDao" ref="taskRequestedPeriodDao"/>
 	</bean>
 	<bean id="taskService"
 		  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">