O3-2440 Harmonize OpenMRS version(s) supported by Queue module

openmrs · Sep 27, 2023 · 175f0a1 · 175f0a1
1 parent 14c0ea2
commit 175f0a1
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryCountSubResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryCountSubResource.java
@@ -36,7 +36,7 @@
  */
 @SuppressWarnings("unused")
 @SubResource(parent = QueueResource.class, path = "count", supportedClass = QueueEntryCount.class, supportedOpenmrsVersions = {
-        "2.0 - 2.*" }, order = 12)
+        "2.3 - 9.*" }, order = 12)
 public class QueueEntryCountSubResource extends DelegatingSubResource<QueueEntryCount, Queue, QueueResource> {
 
 	@Override

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryMetricsResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryMetricsResource.java
@@ -33,7 +33,7 @@
  */
 @SuppressWarnings("unused")
 @Resource(name = RestConstants.VERSION_1
-        + "/queue-entry-metrics", supportedClass = QueueEntryMetric.class, supportedOpenmrsVersions = { "2.0 - 2.*" })
+        + "/queue-entry-metrics", supportedClass = QueueEntryMetric.class, supportedOpenmrsVersions = { "2.3 - 9.*" })
 public class QueueEntryMetricsResource extends DelegatingCrudResource<SimpleObject> {
 
 	@Override

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryNumberResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryNumberResource.java
@@ -34,7 +34,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 
 @Resource(name = RestConstants.VERSION_1
-        + "/queue-entry-number", supportedClass = QueueEntryNumber.class, supportedOpenmrsVersions = { "2.0 - 2.*" })
+        + "/queue-entry-number", supportedClass = QueueEntryNumber.class, supportedOpenmrsVersions = { "2.3 - 9.*" })
 public class QueueEntryNumberResource extends DelegatingCrudResource<SimpleObject> {
 
 	@Override

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntrySubResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntrySubResource.java
@@ -38,7 +38,7 @@
 
 @SuppressWarnings("unused")
 @SubResource(parent = QueueResource.class, path = "entry", supportedClass = QueueEntry.class, supportedOpenmrsVersions = {
-        "2.0 - 2.*" }, order = 10)
+        "2.3 - 9.*" }, order = 10)
 public class QueueEntrySubResource extends DelegatingSubResource<QueueEntry, Queue, QueueResource> {
 
 	@Override

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueMetricsResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueMetricsResource.java
@@ -32,7 +32,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 
 @Resource(name = RestConstants.VERSION_1 + "/queue-metrics", supportedClass = QueueMetric.class, supportedOpenmrsVersions = {
-        "2.0 - 2.*" })
+        "2.3 - 9.*" })
 public class QueueMetricsResource extends DelegatingCrudResource<SimpleObject> {
 
 	@Override

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueResource.java
@@ -38,7 +38,7 @@
 
 @SuppressWarnings("unused")
 @Resource(name = RestConstants.VERSION_1 + "/queue", supportedClass = Queue.class, supportedOpenmrsVersions = {
-        "2.0 - 2.*" })
+        "2.3 - 9.*" })
 public class QueueResource extends DelegatingCrudResource<Queue> {
 
 	private final QueueService queueService;

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueRoomResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/QueueRoomResource.java
@@ -35,7 +35,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 
 @Resource(name = RestConstants.VERSION_1 + "/queueroom", supportedClass = QueueRoom.class, supportedOpenmrsVersions = {
-        "2.0 - 2.*" })
+        "2.3 - 9.*" })
 public class QueueRoomResource extends DelegatingCrudResource<QueueRoom> {
 
 	private final QueueRoomService queueRoomService;

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/RoomProviderMapResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/RoomProviderMapResource.java
@@ -34,7 +34,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 
 @Resource(name = RestConstants.VERSION_1
-        + "/roomprovidermap", supportedClass = RoomProviderMap.class, supportedOpenmrsVersions = { "2.0 - 2.*" })
+        + "/roomprovidermap", supportedClass = RoomProviderMap.class, supportedOpenmrsVersions = { "2.3 - 9.*" })
 public class RoomProviderMapResource extends DelegatingCrudResource<RoomProviderMap> {
 
 	private final RoomProviderMapService roomProviderMapService;

diff --git a/omod/src/main/java/org/openmrs/module/queue/web/resources/VisitQueueEntryResource.java b/omod/src/main/java/org/openmrs/module/queue/web/resources/VisitQueueEntryResource.java
@@ -42,7 +42,7 @@
 @Slf4j
 @SuppressWarnings("unused")
 @Resource(name = RestConstants.VERSION_1
-        + "/visit-queue-entry", supportedClass = VisitQueueEntry.class, supportedOpenmrsVersions = { "2.0 - 2.*" })
+        + "/visit-queue-entry", supportedClass = VisitQueueEntry.class, supportedOpenmrsVersions = { "2.3 - 9.*" })
 public class VisitQueueEntryResource extends DelegatingCrudResource<VisitQueueEntry> {
 
 	private final VisitQueueEntryService visitQueueEntryService;

diff --git a/...g/openmrs/module/queue/web/resources/search/handlers/InActiveQueueEntrySearchHandler.java b/...g/openmrs/module/queue/web/resources/search/handlers/InActiveQueueEntrySearchHandler.java
@@ -31,7 +31,7 @@
 public class InActiveQueueEntrySearchHandler implements SearchHandler {
 
 	private final static SearchConfig SEARCH_CONFIG = new SearchConfig("default",
-	        RestConstants.VERSION_1 + "/visit-queue-entry", Collections.singletonList("2.0 - 2.*"),
+	        RestConstants.VERSION_1 + "/visit-queue-entry", Collections.singletonList("2.3 - 9.*"),
 	        new SearchQuery.Builder("Allows you to include/exclude inactive queue entries")
 	                .withOptionalParameters("includeInactive").build());
 

diff --git a/.../java/org/openmrs/module/queue/web/resources/search/handlers/QueueCountSearchHandler.java b/.../java/org/openmrs/module/queue/web/resources/search/handlers/QueueCountSearchHandler.java
@@ -31,7 +31,7 @@
 public class QueueCountSearchHandler implements SubResourceSearchHandler {
 
 	private final static SearchConfig SEARCH_CONFIG = new SearchConfig("default", RestConstants.VERSION_1 + "/queue/count",
-	        Collections.singletonList("2.0 - 2.*"),
+	        Collections.singletonList("2.3 - 9.*"),
 	        new SearchQuery.Builder("Allows you to find queue entries by status").withOptionalParameters("status").build());
 
 	@Override

diff --git a/.../java/org/openmrs/module/queue/web/resources/search/handlers/QueueEntrySearchHandler.java b/.../java/org/openmrs/module/queue/web/resources/search/handlers/QueueEntrySearchHandler.java
@@ -32,7 +32,7 @@
 public class QueueEntrySearchHandler implements SubResourceSearchHandler {
 
 	private final static SearchConfig SEARCH_CONFIG = new SearchConfig("default", RestConstants.VERSION_1 + "/queue/entry",
-	        Collections.singletonList("2.0 - 2.*"),
+	        Collections.singletonList("2.3 - 9.*"),
 	        new SearchQuery.Builder("Allows you to find queue entries by status").withOptionalParameters("status").build());
 
 	@Override

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
@@ -26,7 +26,7 @@
     <!-- <updateURL>https://modules.openmrs.org/modules/download/@MODULE_ID@/update.rdf</updateURL> -->
     <!-- /Base Module Properties -->
 
-    <require_version>2.0.5 - 2.*</require_version>
+    <require_version>2.3.0</require_version>
 
     <require_modules>
         <require_module>org.openmrs.module.webservices.rest</require_module>