O3-4412 - Queue module causes startup failure intermittently (#79)

openmrs · Jan 29, 2025 · e507046 · e507046
1 parent a7f3aa0
commit e507046
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/queue/web/Legacy1xRestController.java b/omod/src/main/java/org/openmrs/module/queue/web/Legacy1xRestController.java
@@ -44,6 +44,9 @@
 import org.openmrs.module.queue.web.resources.QueueEntryResource;
 import org.openmrs.module.queue.web.resources.QueueRoomResource;
 import org.openmrs.module.queue.web.resources.RoomProviderMapResource;
+import org.openmrs.module.queue.web.resources.parser.QueueEntrySearchCriteriaParser;
+import org.openmrs.module.queue.web.resources.parser.QueueRoomSearchCriteriaParser;
+import org.openmrs.module.queue.web.resources.parser.RoomProviderMapSearchCriteriaParser;
 import org.openmrs.module.webservices.rest.SimpleObject;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
@@ -74,6 +77,15 @@ public class Legacy1xRestController extends BaseRestController {
 	@Autowired
 	QueueServicesWrapper services;
 
+	@Autowired
+	QueueEntrySearchCriteriaParser queueEntrySearchCriteriaParser;
+
+	@Autowired
+	QueueRoomSearchCriteriaParser queueRoomSearchCriteriaParser;
+
+	@Autowired
+	RoomProviderMapSearchCriteriaParser roomProviderMapSearchCriteriaParser;
+
 	@Autowired
 	private QueueEntryMetricRestController queueEntryMetricRestController;
 
@@ -84,9 +96,9 @@ public class Legacy1xRestController extends BaseRestController {
 	private final RoomProviderMapResource roomProviderMapResource;
 
 	public Legacy1xRestController() {
-		queueEntryResource = new QueueEntryResource();
-		queueRoomResource = new QueueRoomResource();
-		roomProviderMapResource = new RoomProviderMapResource();
+		queueEntryResource = new QueueEntryResource(services, queueEntrySearchCriteriaParser);
+		queueRoomResource = new QueueRoomResource(services, queueRoomSearchCriteriaParser);
+		roomProviderMapResource = new RoomProviderMapResource(services, roomProviderMapSearchCriteriaParser);
 	}
 
 	@RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/visit-queue-entry", method = GET)