Kavitha | update versions, beans and schedulers

api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.bahmni.module</groupId>
 		<artifactId>bahmni-ipd</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>bahmni-ipd-api</artifactId>

api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/RollOverNonMedicationTasks.java

@@ -1,30 +1,22 @@
 package org.openmrs.module.ipd.api.scheduler.tasks;
 
+import org.openmrs.api.context.Context;
 import org.openmrs.module.ipd.api.events.IPDEventManager;
 import org.openmrs.module.ipd.api.events.model.IPDEvent;
 import org.openmrs.module.ipd.api.events.model.IPDEventType;
 import org.openmrs.scheduler.tasks.AbstractTask;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
 
 
-public class RollOverNonMedicationTasks extends AbstractTask implements ApplicationContextAware {
-
-    private static ApplicationContext context;
+public class RollOverNonMedicationTasks extends AbstractTask {
 
     @Override
     public void execute() {
-        IPDEventManager eventManager = context.getBean(IPDEventManager.class);
+        IPDEventManager eventManager = Context.getRegisteredComponents(IPDEventManager.class).get(0);
         IPDEventType eventType = eventManager.getEventTypeForEncounter(String.valueOf(IPDEventType.ROLLOVER_TASK));
         if (eventType != null) {
             IPDEvent ipdEvent = new IPDEvent(null, null, eventType);
             eventManager.processEvent(ipdEvent);
         }
     }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.context = applicationContext;
-    }
-}
+}

api/src/main/java/org/openmrs/module/ipd/api/scheduler/tasks/ShiftStartTasks.java

@@ -1,29 +1,22 @@
 package org.openmrs.module.ipd.api.scheduler.tasks;
 
+import org.openmrs.api.context.Context;
 import org.openmrs.module.ipd.api.events.IPDEventManager;
 import org.openmrs.module.ipd.api.events.model.IPDEvent;
 import org.openmrs.module.ipd.api.events.model.IPDEventType;
 import org.openmrs.scheduler.tasks.AbstractTask;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
 
 
-public class ShiftStartTasks extends AbstractTask implements ApplicationContextAware {
+public class ShiftStartTasks extends AbstractTask {
 
-    private static ApplicationContext context;
     @Override
     public void execute() {
-        IPDEventManager eventManager = context.getBean(IPDEventManager.class);
+        IPDEventManager eventManager = Context.getRegisteredComponents(IPDEventManager.class).get(0);
         IPDEventType eventType = eventManager.getEventTypeForEncounter(String.valueOf(IPDEventType.SHIFT_START_TASK));
         if (eventType != null) {
             IPDEvent ipdEvent = new IPDEvent(null, null, eventType);
             eventManager.processEvent(ipdEvent);
         }
     }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.context = applicationContext;
-    }
-}
+}

api/src/main/resources/moduleApplicationContext.xml

@@ -123,7 +123,4 @@
         </property>
     </bean>
 
-    <bean id="shiftStartTasks" class="org.openmrs.module.ipd.api.scheduler.tasks.ShiftStartTasks"/>
-    <bean id="rollOverNonMedicationTasks" class="org.openmrs.module.ipd.api.scheduler.tasks.RollOverNonMedicationTasks"/>
-
 </beans>

omod/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>bahmni-ipd</artifactId>
 		<groupId>org.bahmni.module</groupId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>bahmni-ipd-omod</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.bahmni.module</groupId>
 	<artifactId>bahmni-ipd</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Bahmni IPD</name>
 	<description>Bahmni IPD module contains all backend APIs for IPD</description>
@@ -48,7 +48,7 @@
 		<jacocoVersion>0.7.9</jacocoVersion>
 		<lombokVersion>1.18.26</lombokVersion>
 		<openmrsFhir2Version>2.1.0</openmrsFhir2Version>
-		<fhir2ExtensionVersion>1.3.0</fhir2ExtensionVersion>
+		<fhir2ExtensionVersion>1.4.0-SNAPSHOT</fhir2ExtensionVersion>
 		<bahmniVersion>1.2.0</bahmniVersion>
 		<emrapi-omod.version>1.36.0</emrapi-omod.version>
 		<medicationAdminstrationVersion>1.0.0</medicationAdminstrationVersion>