From d5bf3c1a03b68b1e1b94755ab1f06c3ed56c75cc Mon Sep 17 00:00:00 2001 From: JyothsnaAshok <34093139+JyothsnaAshok@users.noreply.github.com> Date: Sun, 31 Dec 2017 19:04:45 +0530 Subject: [PATCH] RESTWS-692 Support openmrs platform 2.2.x (#318) --- .../v1_0/resource/openmrs1_10/CareSettingResource1_10.java | 2 +- .../resource/openmrs1_10/OrderEntryConfigResource1_10.java | 2 +- .../resource/openmrs1_10/OrderFrequencyResource1_10.java | 2 +- .../web/v1_0/resource/openmrs1_10/OrderResource1_10.java | 2 +- .../v1_0/resource/openmrs1_10/OrderTypeResource1_10.java | 2 +- .../v1_0/resource/openmrs1_10/OrderableResource1_10.java | 2 +- .../resource/openmrs1_10/ProgramEnrollmentResource1_10.java | 2 +- .../web/v1_0/resource/openmrs1_10/ProgramResource1_10.java | 2 +- .../resource/openmrs1_10/TestOrderSubclassHandler1_10.java | 2 +- .../search/openmrs1_10/DrugSearchByMappingHandler1_10.java | 2 +- .../web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java | 2 +- .../search/openmrs1_10/DrugsSearchByMappingHandler1_10.java | 2 +- .../resource/openmrs1_11/DrugIngredientResource1_11.java | 2 +- .../web/v1_0/resource/openmrs1_11/PersonResource1_11.java | 2 +- .../resource/openmrs1_12/OrderSetMemberResource1_12.java | 2 +- .../web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java | 2 +- .../v1_0/resource/openmrs1_8/ConceptClassResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java | 2 +- .../rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java | 2 +- .../rest/web/v1_0/resource/openmrs1_8/FormResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/HL7SourceResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/LocationTagResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/ModuleActionResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/ModuleResource1_8.java | 2 +- .../resource/openmrs1_8/PatientIdentifierResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/PatientStateResource1_8.java | 2 +- .../resource/openmrs1_8/PersonAttributeResource1_8.java | 2 +- .../resource/openmrs1_8/PersonAttributeTypeResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/PersonResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java | 2 +- .../resource/openmrs1_8/ProgramWorkflowResource1_8.java | 2 +- .../openmrs1_8/ProgramWorkflowStateResource1_8.java | 2 +- .../resource/openmrs1_8/RelationShipTypeResource1_8.java | 2 +- .../rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java | 2 +- .../resource/openmrs1_8/SystemInformationResource1_8.java | 2 +- .../web/v1_0/resource/openmrs1_8/TaskActionResource1_8.java | 2 +- .../v1_0/resource/openmrs1_8/TaskDefinitionResource1_8.java | 2 +- .../web/v1_0/search/openmrs1_8/ConceptSearchHandler1_8.java | 2 +- .../web/v1_0/search/openmrs1_8/LocationSearchHandler.java | 2 +- .../v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java | 2 +- .../openmrs1_8/PatientByIdentifierSearchHandler1_8.java | 2 +- .../search/openmrs1_8/RelationshipSearchHandler1_8.java | 2 +- .../web/v1_0/search/openmrs1_8/UserSearchHandler1_8.java | 2 +- .../v1_0/controller/openmrs1_8/UserController1_8Test.java | 6 +++--- .../resource/openmrs1_9/ConceptDescriptionResource1_9.java | 2 +- .../web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/ConceptMapTypeResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/ConceptNameResource1_9.java | 2 +- .../openmrs1_9/ConceptReferenceTermMapResource1_9.java | 2 +- .../openmrs1_9/ConceptReferenceTermResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/ConceptSearchResource1_9.java | 2 +- .../resource/openmrs1_9/ConceptStopwordResource1_9.java | 2 +- .../openmrs1_9/CustomDatatypeHandlerResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/CustomDatatypeResource1_9.java | 2 +- .../resource/openmrs1_9/EncounterProviderResource1_9.java | 2 +- .../web/v1_0/resource/openmrs1_9/EncounterResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/EncounterRoleResource1_9.java | 2 +- .../rest/web/v1_0/resource/openmrs1_9/FormResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/FormResourceResource1_9.java | 2 +- .../resource/openmrs1_9/LocationAttributeResource1_9.java | 2 +- .../openmrs1_9/LocationAttributeTypeResource1_9.java | 2 +- .../web/v1_0/resource/openmrs1_9/PatientResource1_9.java | 2 +- .../resource/openmrs1_9/ProviderAttributeResource1_9.java | 2 +- .../openmrs1_9/ProviderAttributeTypeResource1_9.java | 2 +- .../web/v1_0/resource/openmrs1_9/ProviderResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/RelationshipResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/SystemSettingResource1_9.java | 2 +- .../v1_0/resource/openmrs1_9/VisitAttributeResource1_9.java | 2 +- .../resource/openmrs1_9/VisitAttributeTypeResource1_9.java | 2 +- .../rest/web/v1_0/resource/openmrs1_9/VisitResource1_9.java | 2 +- .../web/v1_0/resource/openmrs1_9/VisitTypeResource1_9.java | 2 +- .../openmrs1_9/ConceptReferenceTermMapSearchHandler1_9.java | 2 +- .../openmrs1_9/ConceptReferenceTermSearchHandler1_9.java | 2 +- .../web/v1_0/search/openmrs1_9/ConceptSearchHandler1_9.java | 2 +- .../v1_0/search/openmrs1_9/ProviderSearchHandler1_9.java | 2 +- .../rest/web/v1_0/test/GenericChildResource.java | 2 +- .../resource/openmrs2_0/ConceptAttributeResource2_0.java | 2 +- .../openmrs2_0/ConceptAttributeTypeResource2_0.java | 2 +- .../resource/openmrs2_0/ConceptDatatypeResource2_0.java | 2 +- .../web/v1_0/resource/openmrs2_0/ConceptResource2_0.java | 2 +- .../resource/openmrs2_0/DrugOrderSubclassHandler2_0.java | 2 +- .../rest/web/v1_0/resource/openmrs2_0/DrugResource2_0.java | 2 +- .../web/v1_0/resource/openmrs2_0/LocationResource2_0.java | 2 +- .../v1_0/resource/openmrs2_0/PatientAllergyResource2_0.java | 2 +- .../openmrs2_0/PatientIdentifierTypeResource2_0.java | 2 +- .../v1_0/resource/openmrs2_0/PersonAddressResource2_0.java | 2 +- .../rest/web/v1_0/resource/openmrs2_0/UserResource2_0.java | 2 +- .../v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java | 2 +- .../resource/openmrs2_1/CohortMembershipResource2_1.java | 2 +- .../web/v1_0/resource/openmrs2_1/CohortResource2_1.java | 2 +- .../v1_0/resource/openmrs2_1/ConceptSourceResource2_1.java | 2 +- .../rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java | 2 +- .../web/v1_0/resource/openmrs2_1/PersonNameResource2_1.java | 2 +- 97 files changed, 99 insertions(+), 99 deletions(-) diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java index 31875922e..00f663da1 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java @@ -35,7 +35,7 @@ * {@link org.openmrs.CareSetting}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/caresetting", supportedClass = CareSetting.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class CareSettingResource1_10 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderEntryConfigResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderEntryConfigResource1_10.java index 6264e0f3b..92c8de843 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderEntryConfigResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderEntryConfigResource1_10.java @@ -21,7 +21,7 @@ // the framework requires we specify a supportedClass, even though this shouldn't have one @Resource(name = RestConstants.VERSION_1 + "/orderentryconfig", supportedClass = OrderService.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderEntryConfigResource1_10 implements Listable { @Override diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java index 3e562bba8..868dffa2c 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java @@ -30,7 +30,7 @@ * {@link Resource} for {@link OrderFrequency}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/orderfrequency", supportedClass = OrderFrequency.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderFrequencyResource1_10 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java index b713ef7f2..c678c73ce 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java @@ -45,7 +45,7 @@ * , supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/order", supportedClass = Order.class, supportedOpenmrsVersions = { "1.10.*", - "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderResource1_10 extends OrderResource1_8 { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java index 2ad6e70d5..d78d99fbe 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java @@ -36,7 +36,7 @@ * {@link Resource} for {@link org.openmrs.OrderType}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/ordertype", supportedClass = OrderType.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderTypeResource1_10 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderableResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderableResource1_10.java index c580ff206..d14397686 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderableResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderableResource1_10.java @@ -43,7 +43,7 @@ * orderable. It returns ConceptSearchResults instead of Concepts */ @Resource(name = RestConstants.VERSION_1 + "/orderable", supportedClass = ConceptSearchResult.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderableResource1_10 extends BaseDelegatingResource implements Searchable { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramEnrollmentResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramEnrollmentResource1_10.java index 7379c8639..5eccd58ef 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramEnrollmentResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramEnrollmentResource1_10.java @@ -36,7 +36,7 @@ import java.util.Set; @Resource(name = RestConstants.VERSION_1 + "/programenrollment", supportedClass = PatientProgram.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProgramEnrollmentResource1_10 extends ProgramEnrollmentResource1_8 { @Override diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10.java index 70981dfbc..3e7d5e8b7 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10.java @@ -24,7 +24,7 @@ import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.ProgramResource1_8; @Resource(name = RestConstants.VERSION_1 + "/program", supportedClass = Program.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProgramResource1_10 extends ProgramResource1_8 { @Override diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java index b9741f5ec..157e3dd5c 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java @@ -45,7 +45,7 @@ * {@link org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.OrderResource1_8} */ @SubClassHandler(supportedClass = TestOrder.class, supportedOpenmrsVersions = { "1.10.*", "1.11.*", "1.12.*", "2.0.*", - "2.1.*" }) + "2.1.*", "2.2.*" }) public class TestOrderSubclassHandler1_10 extends BaseDelegatingSubclassHandler implements DelegatingSubclassHandler { /** diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java index 143a8bfa5..fd8c6352f 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java @@ -56,7 +56,7 @@ public class DrugSearchByMappingHandler1_10 implements SearchHandler { .withOptionalParameters(REQUEST_PARAM_CODE, REQUEST_PARAM_MAP_TYPES).build(); private final SearchConfig searchConfig = new SearchConfig("getDrugByMapping", RestConstants.VERSION_1 + "/drug", - Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), searchQuery); + Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), searchQuery); /** * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig() diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java index 27f96e765..8447a20fa 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java @@ -54,7 +54,7 @@ public class DrugSearchHandler1_10 implements SearchHandler { .withOptionalParameters(REQUEST_PARAM_LOCALE, REQUEST_PARAM_EXACT_LOCALE).build(); private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/drug", Arrays.asList( - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), searchQuery); + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), searchQuery); /** * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig() diff --git a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java index e396aa72a..99d1fd8cf 100644 --- a/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java +++ b/omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java @@ -55,7 +55,7 @@ public class DrugsSearchByMappingHandler1_10 implements SearchHandler { .withOptionalParameters(REQUEST_PARAM_CODE, REQUEST_PARAM_MAP_TYPES).build(); private final SearchConfig searchConfig = new SearchConfig("getDrugsByMapping", RestConstants.VERSION_1 + "/drug", - Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), searchQuery); + Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), searchQuery); /** * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig() diff --git a/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java b/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java index 21a190239..aecf39e22 100644 --- a/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java +++ b/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java @@ -37,7 +37,7 @@ * {@link Resource} for DrugIngredient, supporting standard CRUD operations */ @SubResource(parent = DrugResource1_11.class, path = "ingredient", supportedClass = DrugIngredient.class, supportedOpenmrsVersions = { - "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class DrugIngredientResource1_11 extends DelegatingSubResource { @Override diff --git a/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11.java b/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11.java index add1f50b5..ddef0c9f1 100644 --- a/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11.java +++ b/omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11.java @@ -28,7 +28,7 @@ * {@link Resource} for Person, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/person", order = 1, supportedClass = Person.class, supportedOpenmrsVersions = { - "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PersonResource1_11 extends PersonResource1_8 { /** diff --git a/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetMemberResource1_12.java b/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetMemberResource1_12.java index e0441230a..5f668b97b 100644 --- a/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetMemberResource1_12.java +++ b/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetMemberResource1_12.java @@ -40,7 +40,7 @@ * {@link Resource} for OrderSetMembers, supporting standard CRUD operations */ @SubResource(parent = OrderSetResource1_12.class, path = "ordersetmember", supportedClass = OrderSetMember.class, supportedOpenmrsVersions = { - "1.12.*", "2.0.*", "2.1.*" }) + "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderSetMemberResource1_12 extends DelegatingSubResource { @Override diff --git a/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java b/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java index c9263968a..a1df7ffa3 100644 --- a/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java +++ b/omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java @@ -35,7 +35,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/orderset", supportedClass = OrderSet.class, supportedOpenmrsVersions = { - "1.12.*", "2.0.*", "2.1.*" }) + "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class OrderSetResource1_12 extends MetadataDelegatingCrudResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptClassResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptClassResource1_8.java index ea30562e9..0340b4a82 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptClassResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptClassResource1_8.java @@ -25,7 +25,7 @@ * {@link Resource} for {@link ConceptClass}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptclass", supportedClass = ConceptClass.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptClassResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java index ef024a23a..87108ba9f 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java @@ -27,7 +27,7 @@ * {@link Resource} for {@link EncounterType}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/encountertype", supportedClass = EncounterType.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class EncounterTypeResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java index 6a1b5a081..6e3106f05 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java @@ -40,7 +40,7 @@ * {@link Resource} for {@link FieldAnswer}, supporting standard CRUD operations */ @SubResource(parent = FieldResource1_8.class, path = "answer", supportedClass = FieldAnswer.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FieldAnswerResource1_8 extends DelegatingSubResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java index 730a22626..4d6643f15 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java @@ -34,7 +34,7 @@ * {@link Resource} for {@link Field}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/field", supportedClass = Field.class, supportedOpenmrsVersions = { "1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FieldResource1_8 extends MetadataDelegatingCrudResource { public Model getGETModel(Representation rep) { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java index 75c16d802..c12e8dea6 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java @@ -29,7 +29,7 @@ * {@link Resource} for {@link FieldType}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/fieldtype", supportedClass = FieldType.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FieldTypeResource1_8 extends MetadataDelegatingCrudResource { public Model getGETModel(Representation rep) { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java index 3936641db..6ad5ad26d 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java @@ -39,7 +39,7 @@ * {@link Resource} for {@link FormField}, supporting standard CRUD operations */ @SubResource(parent = FormResource1_8.class, path = "formfield", supportedClass = FormField.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FormFieldResource1_8 extends DelegatingSubResource { public Model getGETModel(Representation rep) { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormResource1_8.java index 3d90f9f50..20901a5f2 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormResource1_8.java @@ -36,7 +36,7 @@ * {@link Resource} for {@link Form}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/form", supportedClass = Form.class, supportedOpenmrsVersions = { "1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FormResource1_8 extends MetadataDelegatingCrudResource
{ /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java index 46e6cd5b9..cd0f851d4 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java @@ -36,7 +36,7 @@ * {@link Resource} for {@link IncomingHl7Message1_8}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/hl7", supportedClass = IncomingHl7Message1_8.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class HL7MessageResource1_8 extends DataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7SourceResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7SourceResource1_8.java index d52c09fde..97352c215 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7SourceResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7SourceResource1_8.java @@ -26,7 +26,7 @@ * {@link Resource} for {@link HL7Source}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/hl7source", supportedClass = HL7Source.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class HL7SourceResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/LocationTagResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/LocationTagResource1_8.java index 65b49bf00..37fdfd3cf 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/LocationTagResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/LocationTagResource1_8.java @@ -29,7 +29,7 @@ * Allows standard CRUD for the {@link LocationTag} domain object */ @Resource(name = RestConstants.VERSION_1 + "/locationtag", supportedClass = LocationTag.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class LocationTagResource1_8 extends MetadataDelegatingCrudResource { private LocationService service() { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java index e3fed2fab..d7e9b2935 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java @@ -40,7 +40,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/moduleaction", supportedClass = ModuleAction.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ModuleActionResource1_8 extends BaseDelegatingResource implements Creatable { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java index d24a32544..c608e3046 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java @@ -40,7 +40,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/module", supportedClass = Module.class, supportedOpenmrsVersions = { "1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ModuleResource1_8 extends BaseDelegatingReadableResource implements Uploadable { private ModuleFactoryWrapper moduleFactoryWrapper = new ModuleFactoryWrapper(); diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java index 1b62538c5..28a0db49a 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java @@ -40,7 +40,7 @@ * Sub-resource for patient identifiers */ @SubResource(parent = PatientResource1_8.class, path = "identifier", supportedClass = PatientIdentifier.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PatientIdentifierResource1_8 extends DelegatingSubResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java index 785dd80da..661a4f7f0 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java @@ -44,7 +44,7 @@ * {@link Resource} for PatientState, supporting standard CRUD operations */ @SubResource(parent = ProgramEnrollmentResource1_8.class, path = "state", supportedClass = PatientState.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PatientStateResource1_8 extends DelegatingSubResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java index 34d99d35a..278f21e55 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java @@ -43,7 +43,7 @@ * {@link Resource} for PersonAttributes, supporting standard CRUD operations */ @SubResource(parent = PersonResource1_8.class, path = "attribute", supportedClass = PersonAttribute.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PersonAttributeResource1_8 extends DelegatingSubResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeTypeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeTypeResource1_8.java index b64a11315..c4e0d8050 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeTypeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeTypeResource1_8.java @@ -38,7 +38,7 @@ * Allows standard CRUD for the {@link PersonAttributeType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/personattributetype", supportedClass = PersonAttributeType.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PersonAttributeTypeResource1_8 extends MetadataDelegatingCrudResource { public PersonAttributeTypeResource1_8() { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8.java index 18d29b360..3ae6492a6 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonResource1_8.java @@ -50,7 +50,7 @@ * {@link Resource} for Person, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/person", order = 2, supportedClass = Person.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) //order must be greater than that for PatientResource(order=0) RESTWS-273 public class PersonResource1_8 extends DataDelegatingCrudResource { diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java index 44e304e78..87f9a0452 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java @@ -30,7 +30,7 @@ * {@link Resource} for Privilege, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/privilege", supportedClass = Privilege.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PrivilegeResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowResource1_8.java index 2f1bf4040..5cfb4d632 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowResource1_8.java @@ -29,7 +29,7 @@ import org.openmrs.module.webservices.rest.web.response.ResponseException; @Resource(name = RestConstants.VERSION_1 + "/workflow", supportedClass = ProgramWorkflow.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }, order = 1) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }, order = 1) public class ProgramWorkflowResource1_8 extends MetadataDelegatingCrudResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowStateResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowStateResource1_8.java index f73671969..4af0a502b 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowStateResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramWorkflowStateResource1_8.java @@ -36,7 +36,7 @@ import java.util.List; @SubResource(parent = ProgramWorkflowResource1_8.class, path = "state", supportedClass = ProgramWorkflowState.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProgramWorkflowStateResource1_8 extends DelegatingSubResource { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java index 4e80256bb..68b9e837e 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java @@ -32,7 +32,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/relationshiptype", supportedClass = RelationshipType.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class RelationShipTypeResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java index e96d90f01..8a703e0d2 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java @@ -38,7 +38,7 @@ * {@link Resource} for Role, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/role", supportedClass = Role.class, supportedOpenmrsVersions = { "1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class RoleResource1_8 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8.java index fad203293..77ca6ece7 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8.java @@ -20,7 +20,7 @@ import org.openmrs.module.webservices.rest.web.response.ResponseException; @Resource(name = RestConstants.VERSION_1 + "/systeminformation", supportedClass = AdministrationServiceImpl.class, supportedOpenmrsVersions = { - "1.10.*", "1.11.*", "1.12.*", "1.8.*", "1.9.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "1.8.*", "1.9.*", "2.0.*", "2.1.*", "2.2.*" }) public class SystemInformationResource1_8 implements Listable { @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskActionResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskActionResource1_8.java index aebd39191..ae3f3fe24 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskActionResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskActionResource1_8.java @@ -38,7 +38,7 @@ import java.util.Collection; @Resource(name = RestConstants.VERSION_1 + "/taskaction", supportedClass = TaskAction.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class TaskActionResource1_8 extends BaseDelegatingResource implements Creatable { private TaskServiceWrapper taskServiceWrapper = new TaskServiceWrapper(); diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskDefinitionResource1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskDefinitionResource1_8.java index 9a4dec485..eabc62c2b 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskDefinitionResource1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/TaskDefinitionResource1_8.java @@ -31,7 +31,7 @@ * Resource for Task Definitions, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/taskdefinition", supportedClass = TaskDefinition.class, supportedOpenmrsVersions = { - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class TaskDefinitionResource1_8 extends MetadataDelegatingCrudResource { private TaskServiceWrapper taskServiceWrapper = new TaskServiceWrapper(); diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ConceptSearchHandler1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ConceptSearchHandler1_8.java index ddf5d93f5..c813fe8e9 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ConceptSearchHandler1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ConceptSearchHandler1_8.java @@ -48,7 +48,7 @@ public class ConceptSearchHandler1_8 implements SearchHandler { ConceptService conceptService; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/concept", - Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), Arrays.asList( + Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), Arrays.asList( new SearchQuery.Builder("Allows you to find concepts by source and code").withRequiredParameters("source") .withOptionalParameters("code").build(), new SearchQuery.Builder( "Allows you to find concepts by name and class").withRequiredParameters("name") diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/LocationSearchHandler.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/LocationSearchHandler.java index 30e10e6db..f6745c543 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/LocationSearchHandler.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/LocationSearchHandler.java @@ -32,7 +32,7 @@ public class LocationSearchHandler implements SearchHandler { private static final String VIEW_LOCATIONS = "View Locations"; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/location", - Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find locations by tag uuid or tag name").withRequiredParameters("tag").build()); /** diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java index 3e207a33d..157b61b78 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java @@ -42,7 +42,7 @@ public class ObservationSearchHandler1_8 implements SearchHandler { private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/obs", Arrays.asList( - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), Arrays.asList(new SearchQuery.Builder( + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), Arrays.asList(new SearchQuery.Builder( "Allows you to find Observations by patient and concept").withRequiredParameters("patient", "concept").build())); @Override diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java index d26f5e6d5..a1262ba39 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java @@ -35,7 +35,7 @@ public class PatientByIdentifierSearchHandler1_8 implements SearchHandler { RestHelperService restHelperService; private final SearchConfig searchConfig = new SearchConfig("patientByIdentifier", RestConstants.VERSION_1 + "/patient", - Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), + Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), Arrays.asList(new SearchQuery.Builder("Allows you to find Patients by identifier") .withRequiredParameters("identifier").withOptionalParameters("searchType").build())); diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/RelationshipSearchHandler1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/RelationshipSearchHandler1_8.java index 4c00490e1..8c47636e4 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/RelationshipSearchHandler1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/RelationshipSearchHandler1_8.java @@ -35,7 +35,7 @@ public class RelationshipSearchHandler1_8 implements SearchHandler { private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/relationship", - Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), Arrays.asList( + Arrays.asList("1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), Arrays.asList( new SearchQuery.Builder("Allows you to find relationship by person uuid").withRequiredParameters("person") .build(), new SearchQuery.Builder( "Allows you to find relationships between two persons by specifying their uuids") diff --git a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/UserSearchHandler1_8.java b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/UserSearchHandler1_8.java index ff396de79..f0fb782b7 100644 --- a/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/UserSearchHandler1_8.java +++ b/omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/UserSearchHandler1_8.java @@ -40,7 +40,7 @@ public class UserSearchHandler1_8 implements SearchHandler { UserService userService; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/user", Arrays.asList( - "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find users by username").withRequiredParameters("username").build()); /** diff --git a/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java b/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java index f9e446d59..c7b205e2f 100644 --- a/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java +++ b/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java @@ -75,7 +75,7 @@ public static class UserSearchHandlerWithRequiredUsernameAndOptionalLocalesParam @Override public SearchConfig getSearchConfig() { return new SearchConfig("config-for-first-test", RestConstants.VERSION_1 + "/user", Arrays.asList("1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find users by username").withRequiredParameters(new SearchParameter("username", "admin")) .withOptionalParameters("preferredLocales").build()); } @@ -100,7 +100,7 @@ public static class UserSearchHandlerWithRequiredIdAndOptionalUsernameParams imp @Override public SearchConfig getSearchConfig() { return new SearchConfig("config-for-second-test", RestConstants.VERSION_1 + "/user", Arrays.asList("1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find users by username").withRequiredParameters(new SearchParameter("systemId")) .withOptionalParameters(new SearchParameter("username", "bruno")).build()); } @@ -125,7 +125,7 @@ public static class UserSearchHandlerWithOptionalParam implements SearchHandler @Override public SearchConfig getSearchConfig() { return new SearchConfig("config-for-third-test", RestConstants.VERSION_1 + "/user", Arrays.asList("1.8.*", - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find users by username").withOptionalParameters(new SearchParameter("username", "bruno")) .build()); } diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptDescriptionResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptDescriptionResource1_9.java index bd6b404f1..2a89fcb9c 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptDescriptionResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptDescriptionResource1_9.java @@ -17,7 +17,7 @@ * Implemented to increase the resource version. */ @SubResource(parent = ConceptResource1_9.class, path = "description", supportedClass = ConceptDescription.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptDescriptionResource1_9 extends ConceptDescriptionResource1_8 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java index ee167fdbb..b6b0bf106 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java @@ -29,7 +29,7 @@ * {@link Resource} for {@link ConceptMap}, supporting standard CRUD operations */ @SubResource(path = "mapping", parent = ConceptResource1_8.class, supportedClass = ConceptMap.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptMapResource1_9 extends ConceptMapResource1_8 { @Override diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapTypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapTypeResource1_9.java index f46180556..63c001848 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapTypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapTypeResource1_9.java @@ -34,7 +34,7 @@ * {@link Resource} for {@link ConceptMapType}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptmaptype", supportedClass = ConceptMapType.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptMapTypeResource1_9 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptNameResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptNameResource1_9.java index 0cb1c6344..fec40564e 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptNameResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptNameResource1_9.java @@ -17,7 +17,7 @@ * Implemented to increase the resource version. */ @SubResource(parent = ConceptResource1_9.class, path = "name", supportedClass = ConceptName.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptNameResource1_9 extends ConceptNameResource1_8 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermMapResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermMapResource1_9.java index aba5330f4..7825c652e 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermMapResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermMapResource1_9.java @@ -35,7 +35,7 @@ * {@link Resource} for {@link ConceptReferenceTermMap}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptreferencetermmap", supportedClass = ConceptReferenceTermMap.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptReferenceTermMapResource1_9 extends DelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermResource1_9.java index 735f7f218..b49e53a16 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptReferenceTermResource1_9.java @@ -40,7 +40,7 @@ * {@link Resource} for {@link ConceptReferenceTerm}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptreferenceterm", supportedClass = ConceptReferenceTerm.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptReferenceTermResource1_9 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptSearchResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptSearchResource1_9.java index 3dff07f1c..7a69473ac 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptSearchResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptSearchResource1_9.java @@ -46,7 +46,7 @@ * their weights */ @Resource(name = RestConstants.VERSION_1 + "/conceptsearch", supportedClass = ConceptSearchResult.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptSearchResource1_9 extends BaseDelegatingResource implements Searchable { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java index a5137ec5d..6d34c5a69 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java @@ -33,7 +33,7 @@ * {@link Resource} for {@link ConceptStopWord}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptstopword", supportedClass = ConceptStopWord.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ConceptStopwordResource1_9 extends DelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeHandlerResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeHandlerResource1_9.java index 14e7f9bf2..066e5e13e 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeHandlerResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeHandlerResource1_9.java @@ -26,7 +26,7 @@ import org.openmrs.module.webservices.rest.web.response.ResponseException; @SubResource(parent = CustomDatatypeResource1_9.class, path = "handlers", supportedClass = CustomDatatypeHandlerRepresentation.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class CustomDatatypeHandlerResource1_9 extends DelegatingSubResource { @Override diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeResource1_9.java index 443e42cbb..5660b2fe9 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CustomDatatypeResource1_9.java @@ -37,7 +37,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/customdatatype", supportedClass = CustomDatatypeRepresentation.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class CustomDatatypeResource1_9 extends DelegatingCrudResource { @Override diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterProviderResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterProviderResource1_9.java index 198b5f963..de6c98b62 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterProviderResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterProviderResource1_9.java @@ -45,7 +45,7 @@ * supporting standard CRUD operations */ @SubResource(path = "encounterprovider", parent = EncounterResource1_9.class, supportedClass = EncounterProvider.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class EncounterProviderResource1_9 extends DelegatingSubResource { @Override diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterResource1_9.java index 520308122..953cde58e 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterResource1_9.java @@ -29,7 +29,7 @@ * {@link Resource} for {@link EncounterResource1_9}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/encounter", supportedClass = Encounter.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class EncounterResource1_9 extends org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.EncounterResource1_8 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterRoleResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterRoleResource1_9.java index 873f4e9c9..e2c03b9c9 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterRoleResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/EncounterRoleResource1_9.java @@ -26,7 +26,7 @@ * {@link Resource} for {@link EncounterRole}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/encounterrole", supportedClass = EncounterRole.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class EncounterRoleResource1_9 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResource1_9.java index 6b8365bef..6ec139020 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResource1_9.java @@ -26,7 +26,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/form", supportedClass = Form.class, order = 10, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FormResource1_9 extends FormResource1_8 { // TODO: Find out why autowiring is failing, in the mean time use Context.getService diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java index ec29b91ae..cf1f83ea9 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java @@ -41,7 +41,7 @@ @SuppressWarnings("SpringJavaAutowiredMembersInspection") @SubResource(parent = FormResource1_8.class, path = "resource", supportedClass = FormResource.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class FormResourceResource1_9 extends DelegatingSubResource { @RepHandler(RefRepresentation.class) diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeResource1_9.java index 02c8067b9..4f27d33a5 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeResource1_9.java @@ -26,7 +26,7 @@ * {@link Resource} for LocationAttributes, supporting standard CRUD operations */ @SubResource(parent = LocationResource1_9.class, path = "attribute", supportedClass = LocationAttribute.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class LocationAttributeResource1_9 extends BaseAttributeCrudResource1_9 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeTypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeTypeResource1_9.java index b4dd3dc08..1c60e3729 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeTypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/LocationAttributeTypeResource1_9.java @@ -26,7 +26,7 @@ * Allows standard CRUD for the {@link LocationAttributeType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/locationattributetype", supportedClass = LocationAttributeType.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class LocationAttributeTypeResource1_9 extends BaseAttributeTypeCrudResource1_9 { public LocationAttributeTypeResource1_9() { diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/PatientResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/PatientResource1_9.java index 20b77cb40..34c5e4833 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/PatientResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/PatientResource1_9.java @@ -22,7 +22,7 @@ import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.PatientResource1_8; @Resource(name = RestConstants.VERSION_1 + "/patient", supportedClass = Patient.class, supportedOpenmrsVersions = { "1.9.*", - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class PatientResource1_9 extends PatientResource1_8 { @Override diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeResource1_9.java index 61d4c5ffd..fb9046875 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeResource1_9.java @@ -26,7 +26,7 @@ * {@link Resource} for ProviderAttributes, supporting standard CRUD operations */ @SubResource(parent = ProviderResource1_9.class, path = "attribute", supportedClass = ProviderAttribute.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProviderAttributeResource1_9 extends BaseAttributeCrudResource1_9 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeTypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeTypeResource1_9.java index 195d9b2d7..9dcbebc7e 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeTypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderAttributeTypeResource1_9.java @@ -26,7 +26,7 @@ * Allows standard CRUD for the {@link ProviderAttributeType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/providerattributetype", supportedClass = ProviderAttributeType.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProviderAttributeTypeResource1_9 extends BaseAttributeTypeCrudResource1_9 { public ProviderAttributeTypeResource1_9() { diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderResource1_9.java index 91b4badba..5bbbd4e96 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ProviderResource1_9.java @@ -41,7 +41,7 @@ * {@link Resource} for Provider, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/provider", supportedClass = Provider.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class ProviderResource1_9 extends MetadataDelegatingCrudResource { public ProviderResource1_9() { diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/RelationshipResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/RelationshipResource1_9.java index 5cff7e481..1b631e5f5 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/RelationshipResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/RelationshipResource1_9.java @@ -23,7 +23,7 @@ * standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/relationship", supportedClass = Relationship.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class RelationshipResource1_9 extends RelationshipResource1_8 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java index 52433b61e..415ef59e8 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java @@ -41,7 +41,7 @@ * {@link Resource} for {@link GlobalProperty}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/systemsetting", supportedClass = GlobalProperty.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class SystemSettingResource1_9 extends DelegatingCrudResource { public static final String GENERAL = "General Settings"; diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeResource1_9.java index 8076edb19..f35cd8677 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeResource1_9.java @@ -27,7 +27,7 @@ * {@link Resource} for VisitAttributes, supporting standard CRUD operations */ @SubResource(parent = VisitResource1_9.class, path = "attribute", supportedClass = VisitAttribute.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class VisitAttributeResource1_9 extends BaseAttributeCrudResource1_9 { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeTypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeTypeResource1_9.java index 589d10b97..d9ec88100 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeTypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitAttributeTypeResource1_9.java @@ -26,7 +26,7 @@ * Allows standard CRUD for the {@link VisitAttributeType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/visitattributetype", supportedClass = VisitAttributeType.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class VisitAttributeTypeResource1_9 extends BaseAttributeTypeCrudResource1_9 { private VisitService getService() { diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitResource1_9.java index 46cd95926..e18bd96d3 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitResource1_9.java @@ -49,7 +49,7 @@ * {@link Resource} for {@link Visit}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/visit", supportedClass = Visit.class, supportedOpenmrsVersions = { "1.9.*", - "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class VisitResource1_9 extends DataDelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitTypeResource1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitTypeResource1_9.java index 258c3c62f..0c5dd7d8b 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitTypeResource1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/VisitTypeResource1_9.java @@ -29,7 +29,7 @@ * {@link Resource} for {@link VisitType}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/visittype", supportedClass = VisitType.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class VisitTypeResource1_9 extends MetadataDelegatingCrudResource { /** diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermMapSearchHandler1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermMapSearchHandler1_9.java index f034fc9d2..10759b3db 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermMapSearchHandler1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermMapSearchHandler1_9.java @@ -47,7 +47,7 @@ public class ConceptReferenceTermMapSearchHandler1_9 implements SearchHandler { RestHelperService restHelperService; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 - + "/conceptreferencetermmap", Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), + + "/conceptreferencetermmap", Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), Arrays.asList(new SearchQuery.Builder( "Allows you to find term maps by reference 'termA' (uuid) and 'maptype' (uuid or name)") .withRequiredParameters("termA").withOptionalParameters("maptype").build(), new SearchQuery.Builder( diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java index fdaa1fd63..7291fe7ef 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java @@ -47,7 +47,7 @@ public class ConceptReferenceTermSearchHandler1_9 implements SearchHandler { private static String SEARCH_TYPE_ALIKE = "alike"; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/conceptreferenceterm", - Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find terms by source and code or name").withOptionalParameters("source", "codeOrName", "searchType").build()); diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptSearchHandler1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptSearchHandler1_9.java index 805569870..9e79149aa 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptSearchHandler1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptSearchHandler1_9.java @@ -47,7 +47,7 @@ public class ConceptSearchHandler1_9 implements SearchHandler { RestHelperService restHelperService; private final SearchConfig searchConfig = new SearchConfig("byTerm", RestConstants.VERSION_1 + "/concept", - Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find concepts which map to term, uuid of term given as input").withRequiredParameters( "term").build()); diff --git a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ProviderSearchHandler1_9.java b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ProviderSearchHandler1_9.java index 6eb79b641..5e3fb49fb 100644 --- a/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ProviderSearchHandler1_9.java +++ b/omod-1.9/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ProviderSearchHandler1_9.java @@ -34,7 +34,7 @@ public class ProviderSearchHandler1_9 implements SearchHandler { private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/provider", - Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*"), new SearchQuery.Builder( + Arrays.asList("1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*"), new SearchQuery.Builder( "Allows you to find providers by user uuid").withRequiredParameters("user").build()); /** diff --git a/omod-1.9/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/test/GenericChildResource.java b/omod-1.9/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/test/GenericChildResource.java index 32c2a48d3..9b50d4ed3 100644 --- a/omod-1.9/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/test/GenericChildResource.java +++ b/omod-1.9/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/test/GenericChildResource.java @@ -21,7 +21,7 @@ import org.openmrs.module.webservices.rest.web.response.ResponseException; @Resource(name = RestConstants.VERSION_1 + "/genericChild", supportedClass = GenericChild.class, supportedOpenmrsVersions = { - "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*" }) + "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*" }) public class GenericChildResource extends DelegatingCrudResource { @Override diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeResource2_0.java index 67c235f35..ffe4e213f 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeResource2_0.java @@ -28,7 +28,7 @@ * {@link Resource} for ConceptAttributes, supporting standard CRUD operations */ @SubResource(parent = ConceptResource2_0.class, path = "attribute", supportedClass = ConceptAttribute.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class ConceptAttributeResource2_0 extends BaseAttributeCrudResource1_9 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeTypeResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeTypeResource2_0.java index f7009f7b6..4a7c6a749 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeTypeResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptAttributeTypeResource2_0.java @@ -23,7 +23,7 @@ * Allows standard CRUD for the {@link ConceptAttributeType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/conceptattributetype", supportedClass = ConceptAttributeType.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class ConceptAttributeTypeResource2_0 extends BaseAttributeTypeCrudResource1_9 { public ConceptAttributeTypeResource2_0() { diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptDatatypeResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptDatatypeResource2_0.java index 54451423a..8a5835224 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptDatatypeResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptDatatypeResource2_0.java @@ -20,7 +20,7 @@ * {@link Resource} for {@link ConceptDatatype}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/conceptdatatype", supportedClass = ConceptDatatype.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class ConceptDatatypeResource2_0 extends ConceptDatatypeResource1_8 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptResource2_0.java index e25977312..660ad3ec5 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptResource2_0.java @@ -26,7 +26,7 @@ import java.util.List; @Resource(name = RestConstants.VERSION_1 + "/concept", supportedClass = Concept.class, supportedOpenmrsVersions = { "2.0.*", - "2.1.*" }) + "2.1.*", "2.2.*" }) public class ConceptResource2_0 extends ConceptResource1_11 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugOrderSubclassHandler2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugOrderSubclassHandler2_0.java index bd5130f29..c0247cacc 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugOrderSubclassHandler2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugOrderSubclassHandler2_0.java @@ -21,7 +21,7 @@ * Exposes the {@link org.openmrs.DrugOrder} subclass as a type in * {@link org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_10.DrugOrderSubclassHandler1_10} */ -@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "2.0.*", "2.1.*" }) +@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "2.0.*", "2.1.*", "2.2.*" }) public class DrugOrderSubclassHandler2_0 extends DrugOrderSubclassHandler1_10 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugResource2_0.java index 4e7630e53..a6d884484 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/DrugResource2_0.java @@ -23,7 +23,7 @@ * {@link Resource} for {@link Drug}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/drug", order = 1, supportedClass = Drug.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class DrugResource2_0 extends DrugResource1_11 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/LocationResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/LocationResource2_0.java index 8ebde65e5..abd666ec1 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/LocationResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/LocationResource2_0.java @@ -22,7 +22,7 @@ * {@link Resource} for {@link Location}, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/location", supportedClass = Location.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class LocationResource2_0 extends LocationResource1_9 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientAllergyResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientAllergyResource2_0.java index 2fe788bd0..bd0decabe 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientAllergyResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientAllergyResource2_0.java @@ -40,7 +40,7 @@ import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_9.PatientResource1_9; @SubResource(parent = PatientResource1_9.class, path = "allergy", supportedClass = Allergy.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class PatientAllergyResource2_0 extends DelegatingSubResource { @Override diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientIdentifierTypeResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientIdentifierTypeResource2_0.java index d2b7cf091..601edeaee 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientIdentifierTypeResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PatientIdentifierTypeResource2_0.java @@ -20,7 +20,7 @@ * Allows standard CRUD for the {@link PatientIdentifierType} domain object */ @Resource(name = RestConstants.VERSION_1 + "/patientidentifiertype", supportedClass = PatientIdentifierType.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class PatientIdentifierTypeResource2_0 extends PatientIdentifierTypeResource1_8 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PersonAddressResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PersonAddressResource2_0.java index ddb749166..5d717595f 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PersonAddressResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/PersonAddressResource2_0.java @@ -23,7 +23,7 @@ * {@link Resource} for PersonAddress, supporting standard CRUD operations */ @SubResource(parent = PersonResource1_8.class, path = "address", supportedClass = PersonAddress.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class PersonAddressResource2_0 extends PersonAddressResource1_8 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0.java index 7f1be988c..2f956f33f 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0.java @@ -22,7 +22,7 @@ * {@link Resource} for User, supporting standard CRUD operations */ @Resource(name = RestConstants.VERSION_1 + "/user", supportedClass = UserAndPassword1_8.class, supportedOpenmrsVersions = { - "2.0.*", "2.1.*" }) + "2.0.*", "2.1.*", "2.2.*" }) public class UserResource2_0 extends UserResource1_8 { /** diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java index a56343678..ebb9c2eb2 100644 --- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java +++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_0/EncounterSearchHandler2_0.java @@ -43,7 +43,7 @@ public class EncounterSearchHandler2_0 implements SearchHandler { private static final String DATE_TO = "todate"; private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/encounter", - Arrays.asList("2.0.*", "2.1.*"), Arrays.asList(new SearchQuery.Builder( + Arrays.asList("2.0.*", "2.1.*", "2.2.*"), Arrays.asList(new SearchQuery.Builder( "Allows you to find Encounter by patient and encounterType (and optionally by from and to date range)") .withRequiredParameters("patient").withOptionalParameters("encounterType", DATE_FROM, DATE_TO, "order") .build())); diff --git a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortMembershipResource2_1.java b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortMembershipResource2_1.java index 6192fbe2e..26b50b8bf 100644 --- a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortMembershipResource2_1.java +++ b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortMembershipResource2_1.java @@ -34,7 +34,7 @@ import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException; import org.openmrs.module.webservices.rest.web.response.ResponseException; -@SubResource(parent = CohortResource2_1.class, path = "membership", supportedClass = CohortMembership.class, supportedOpenmrsVersions = { "2.1.*" }) +@SubResource(parent = CohortResource2_1.class, path = "membership", supportedClass = CohortMembership.class, supportedOpenmrsVersions = { "2.1.*", "2.2.*" }) public class CohortMembershipResource2_1 extends DelegatingSubResource { @Override diff --git a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortResource2_1.java b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortResource2_1.java index 8d2158515..428880ebc 100644 --- a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortResource2_1.java +++ b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/CohortResource2_1.java @@ -23,7 +23,7 @@ * In openmrs-core 2.1 we did a complete rewrite of cohort membership, so although the Cohort class * itself didn't change we update the resource here. */ -@Resource(name = RestConstants.VERSION_1 + "/cohort", supportedClass = Cohort.class, supportedOpenmrsVersions = { "2.1.*" }) +@Resource(name = RestConstants.VERSION_1 + "/cohort", supportedClass = Cohort.class, supportedOpenmrsVersions = { "2.1.*", "2.2.*" }) public class CohortResource2_1 extends CohortResource1_8 { @Override diff --git a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ConceptSourceResource2_1.java b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ConceptSourceResource2_1.java index cdc6fa2fd..b22a3d3ad 100644 --- a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ConceptSourceResource2_1.java +++ b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ConceptSourceResource2_1.java @@ -26,7 +26,7 @@ /** * {@link Resource} for {@link ConceptSource}, supporting standard CRUD operations */ -@Resource(name = RestConstants.VERSION_1 + "/conceptsource", supportedClass = ConceptSource.class, supportedOpenmrsVersions = { "2.1.*" }) +@Resource(name = RestConstants.VERSION_1 + "/conceptsource", supportedClass = ConceptSource.class, supportedOpenmrsVersions = { "2.1.*", "2.2.*" }) public class ConceptSourceResource2_1 extends ConceptSourceResource2_0 { @Override diff --git a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java index e3d95f7b3..b7165615e 100644 --- a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java +++ b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java @@ -23,7 +23,7 @@ * Resource for `obs`, supporting the new properties added in openmrs-core 2.1 (status and * interpretation) */ -@Resource(name = RestConstants.VERSION_1 + "/obs", supportedClass = Obs.class, supportedOpenmrsVersions = { "2.1.*" }) +@Resource(name = RestConstants.VERSION_1 + "/obs", supportedClass = Obs.class, supportedOpenmrsVersions = { "2.1.*", "2.2.*" }) public class ObsResource2_1 extends ObsResource1_11 { @Override diff --git a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/PersonNameResource2_1.java b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/PersonNameResource2_1.java index aed4271f8..1b4f16b1c 100644 --- a/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/PersonNameResource2_1.java +++ b/omod-2.1/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/PersonNameResource2_1.java @@ -17,7 +17,7 @@ import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_11.PersonResource1_11; import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs2_0.PersonNameResource2_0; -@SubResource(parent = PersonResource1_11.class, path = "name", supportedClass = PersonName.class, supportedOpenmrsVersions = { "2.1.*" }) +@SubResource(parent = PersonResource1_11.class, path = "name", supportedClass = PersonName.class, supportedOpenmrsVersions = { "2.1.*", "2.2.*" }) public class PersonNameResource2_1 extends PersonNameResource2_0 { @Override