Update the module to platform 3.x

wikumChamith · wikumChamith · commit 93606dd359b4 · 2025-10-02T14:13:29.000+05:30
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        java-version: [ 8, 11, 17, 21, 24 ]
+        java-version: [21, 24 ]
 
     runs-on: ${{ matrix.platform }}
     env:
diff --git a/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java b/omod/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java
@@ -29,6 +29,7 @@
 import org.openmrs.web.WebUtil;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
+import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.ServletRequestDataBinder;
@@ -147,7 +148,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		view = getSuccessView();
 		
 		Object[] args = new Object[] { WebUtil.escapeHTML(task.getName()) };
-		String success = getMessageSourceAccessor().getMessage("Scheduler.taskForm.saved", args);
+		String success = new MessageSourceAccessor(Context.getMessageSourceService()).getMessage("Scheduler.taskForm.saved", args);
 		httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, success);
 		
 		return new ModelAndView(new RedirectView(view));
diff --git a/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java b/omod/src/main/java/org/openmrs/web/controller/ConceptFormController.java
@@ -58,6 +58,7 @@
 import org.openmrs.api.ConceptsLockedException;
 import org.openmrs.api.DuplicateConceptNameException;
 import org.openmrs.api.context.Context;
+import org.openmrs.messagesource.MessageSourceService;
 import org.openmrs.module.legacyui.GeneralUtils;
 import org.openmrs.module.web.extension.ConceptUsageExtension;
 import org.openmrs.module.web.extension.provider.Link;
@@ -139,7 +140,7 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
 	protected ModelAndView processFormSubmission(HttpServletRequest request, HttpServletResponse response, Object object,
 	        BindException errors) throws Exception {
 		
-		if (getMessageSourceAccessor().getMessage("Concept.cancel").equals(request.getParameter("action"))) {
+		if (Context.getMessageSourceService().getMessage("Concept.cancel").equals(request.getParameter("action"))) {
 			return new ModelAndView(new RedirectView("index.htm"));
 		}
 		
@@ -194,7 +195,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		if (Context.isAuthenticated()) {
 			
 			ConceptFormBackingObject conceptBackingObject = (ConceptFormBackingObject) obj;
-			MessageSourceAccessor msa = getMessageSourceAccessor();
+			MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 			String action = request.getParameter("action");
 			
 			if (action.equals(msa.getMessage("general.retire"))) {
diff --git a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java
@@ -378,7 +378,7 @@ protected Map<String, Object> referenceData(HttpServletRequest request) throws E
 				//ignore
 			}
 			
-			hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, null));
+			hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, Context.getLocale()));
 			addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_CANNOT_MATCH_USERNAME_OR_SYSTEMID),
 			    mss.getMessage("options.login.password.cannotMatchUsername"));
 			addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_REQUIRES_UPPER_AND_LOWER_CASE),
diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
@@ -74,7 +74,7 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer
 		}
 		cp.setMappedConcept(c);
 		
-		MessageSourceAccessor msa = getMessageSourceAccessor();
+		MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 		if (action.equals(msa.getMessage("general.cancel"))) {
 			httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "general.canceled");
 			return new ModelAndView(new RedirectView(getSuccessView()));
@@ -121,7 +121,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		String view = getFormView();
 		
 		Locale locale = Context.getLocale();
-		MessageSourceAccessor msa = getMessageSourceAccessor();
+		MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 		
 		if (Context.isAuthenticated()) {
 			// this concept proposal
diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java b/omod/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java
@@ -58,7 +58,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			String success = "";
 			String error = "";
 			
-			MessageSourceAccessor msa = getMessageSourceAccessor();
+			MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 			String deleted = msa.getMessage("general.deleted");
 			String notDeleted = msa.getMessage("general.cannot.delete");
 			String textFieldType = msa.getMessage("FieldType.fieldType");
diff --git a/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java b/omod/src/main/java/org/openmrs/web/controller/form/FormFormController.java
@@ -76,7 +76,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		
 		if (Context.isAuthenticated()) {
 			Form form = (Form) obj;
-			MessageSourceAccessor msa = getMessageSourceAccessor();
+			MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 			String action = request.getParameter("action");
 			try {
 				if (action == null) {
diff --git a/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java b/omod/src/main/java/org/openmrs/web/controller/maintenance/GlobalPropertyController.java
@@ -64,7 +64,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 			action = "cancel";
 		}
 		
-		if (action.equals(getMessageSourceAccessor().getMessage("general.save"))) {
+		if (action.equals(Context.getMessageSourceService().getMessage("general.save"))) {
 			HttpSession httpSession = request.getSession();
 			
 			if (Context.isAuthenticated()) {
diff --git a/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java b/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java
@@ -249,7 +249,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
 		
 		if (Context.isAuthenticated()) {
 			
-			MessageSourceAccessor msa = getMessageSourceAccessor();
+			MessageSourceAccessor msa = new MessageSourceAccessor(Context.getMessageSourceService());
 			String action = request.getParameter("action");
 			PatientService ps = Context.getPatientService();
 			
diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml
@@ -28,7 +28,7 @@
 				<ref bean="themeChangeInterceptor" />
 			</list>
 		</property>
-		<property name="order"><value>100</value></property>
+		<property name="order" value="100"/>
 		<property name="mappings">
 			<props>
 				<prop key="admin/patients/patient.form">patientForm</prop>
diff --git a/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java
@@ -20,8 +20,8 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.GlobalProperty;
 import org.openmrs.User;
 import org.openmrs.api.context.Context;
@@ -30,8 +30,8 @@
 import org.openmrs.util.OpenmrsConstants;
 import org.openmrs.util.Security;
 import org.openmrs.web.OptionsForm;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
 import org.openmrs.web.test.WebTestHelper;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -49,7 +49,7 @@ public class OptionsFormControllerTest extends BaseModuleWebContextSensitiveTest
 	@Autowired
 	private WebTestHelper testHelper;
 	
-	@Before
+	@BeforeEach
 	public void setUp() {
 		Context.authenticate("admin", "test");
 		user = Context.getAuthenticatedUser();
diff --git a/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java
@@ -42,7 +42,7 @@ private Map<String, Object> getModelFromController(Integer patientId) throws Exc
 		
 		request.setAttribute(WebConstants.INIT_REQ_UNIQUE_ID, "1");
 		request.getSession().setAttribute(WebConstants.OPENMRS_PORTLET_LAST_REQ_ID, "0");
-		request.setAttribute("javax.servlet.include.servlet_path", "testPortlet");
+		request.setAttribute("jakarta.servlet.include.servlet_path", "testPortlet");
 		request.setAttribute("org.openmrs.portlet.parameters", new HashMap());
 		request.setAttribute("org.openmrs.portlet.patientId", patientId);
 		
diff --git a/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java
@@ -22,14 +22,14 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.MessageSource;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.validation.BindException;
 
 public class GlobalPropertyControllerTest extends BaseModuleWebContextSensitiveTest {
 	
-	@Autowired
 	private MessageSource messageSource;
 	
 	@Autowired
@@ -39,6 +39,7 @@ public class GlobalPropertyControllerTest extends BaseModuleWebContextSensitiveT
 	
 	@Before
 	public void before() {
+		messageSource = Context.getMessageSourceService();
 		administrationService = Context.getAdministrationService();
 	}
 	
diff --git a/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java b/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.hibernate.Hibernate;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/omod/src/test/resources/org/openmrs/web/taglib/include/PrivilegeTagTest.xml b/omod/src/test/resources/org/openmrs/web/taglib/include/PrivilegeTagTest.xml
@@ -11,9 +11,9 @@
 
 -->
 <dataset>
-  <privilege privilege="Manage Patients" description="Able to manage patients" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57"/>
-  <privilege privilege="View Patients" description="Able to view patients" uuid="83756836-aa91-44d0-97de-2cfcf3a64808"/>
-  <privilege privilege="Edit Patients" description="Able to edit patients" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f"/>
+  <privilege name="Manage Patients" privilege="Manage Patients" description="Able to manage patients" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
+  <privilege name="View Patients" privilege="View Patients" description="Able to view patients" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
+  <privilege name="Edit Patients" privilege="Edit Patients" description="Able to edit patients" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
   
   <role role="Data Clerk" description="Takes care of entering, editing patients." uuid="dddf8f8e-c6e3-49d3-8f70-2107a60f7df2"/>
   <role role="Clinician" description="Looks up patients." uuid="fa2fd77d-a586-4e89-9bd0-193a34b6d01e"/>
diff --git a/omod/src/test/resources/org/openmrs/web/taglib/include/RequireTagTest.xml b/omod/src/test/resources/org/openmrs/web/taglib/include/RequireTagTest.xml
@@ -14,9 +14,9 @@
   <person person_id="2" gender="M" dead="false" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="2d70a8dc-d233-460b-8717-35169091f03f"/>
   <person_name person_name_id="2" preferred="true" person_id="2" given_name="John" middle_name=" " family_name="Doe" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="55ccd5eb-aaab-458f-9507-7beffda23855"/>
   
-  <privilege privilege="Manage WhirleyGigs" description="Able to manage whirleygigs" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57"/>
-  <privilege privilege="Manage WhoopDeDoos" description="Able to manage whoopdedoos" uuid="83756836-aa91-44d0-97de-2cfcf3a64808"/>
-  <privilege privilege="Manage Thingamajigs" description="Able to manage thingamajigs" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f"/>
+  <privilege name="Manage WhirleyGigs" privilege="Manage WhirleyGigs" description="Able to manage whirleygigs" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
+  <privilege name="Manage WhoopDeDoos" privilege="Manage WhoopDeDoos" description="Able to manage whoopdedoos" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
+  <privilege name="Manage Thingamajigs" privilege="Manage Thingamajigs" description="Able to manage thingamajigs" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" retired="false" date_created="2008-08-15 15:46:47.0"/>
   
   <role role="WhirleyGig Manager" description="Works with WhirleyGigs only" uuid="dddf8f8e-c6e3-49d3-8f70-2107a60f7df2"/>
   <role role="Manager" description="Works with all objects" uuid="fa2fd77d-a586-4e89-9bd0-193a34b6d01e"/>

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ protected Map<String, Object> referenceData(HttpServletRequest request) throws E`
`378`	`378`	`//ignore`
`379`	`379`	`}`
`380`	`380`
`381`		`- hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, null));`
	`381`	`+ hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, Context.getLocale()));`
`382`	`382`	`addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_CANNOT_MATCH_USERNAME_OR_SYSTEMID),`
`383`	`383`	`mss.getMessage("options.login.password.cannotMatchUsername"));`
`384`	`384`	`addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_REQUIRES_UPPER_AND_LOWER_CASE),`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse`
`64`	`64`	`action = "cancel";`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (action.equals(getMessageSourceAccessor().getMessage("general.save"))) {`
	`67`	`+ if (action.equals(Context.getMessageSourceService().getMessage("general.save"))) {`
`68`	`68`	`HttpSession httpSession = request.getSession();`
`69`	`69`
`70`	`70`	`if (Context.isAuthenticated()) {`