RESTWS-502 - Should be able to get display property in custom represe…

…ntations
openmrs · May 16, 2015 · 49ddecc · 49ddecc
1 parent 1bbdc37
commit 49ddecc
Show file tree

Hide file tree

Showing 53 changed files with 175 additions and 106 deletions.
diff --git a/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java b/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java
@@ -49,7 +49,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			description.addProperty("description");
 			description.addProperty("retired");
 			description.addProperty("careSettingType");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addSelfLink();
 			if (rep instanceof DefaultRepresentation) {
 				description.addLink("full", ".?v=" + RestConstants.REPRESENTATION_FULL);

diff --git a/...mrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java b/...mrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java
@@ -43,7 +43,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-            description.addProperty("display", findMethod("getDisplayString"));
+            description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("frequencyPerDay");
 			description.addProperty("retired");
@@ -54,7 +54,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-            description.addProperty("display", findMethod("getDisplayString"));
+            description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("frequencyPerDay");
 			description.addProperty("concept", Representation.DEFAULT);

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java
@@ -68,7 +68,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			description.addProperty("urgency");
 			description.addProperty("instructions");
 			description.addProperty("commentToFulfiller");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addSelfLink();
 			description.addLink("full", ".?v=" + RestConstants.REPRESENTATION_FULL);
 			return description;
@@ -91,7 +91,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			description.addProperty("urgency");
 			description.addProperty("instructions");
 			description.addProperty("commentToFulfiller");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("auditInfo", findMethod("getAuditInfo"));
 			description.addSelfLink();
 			return description;

diff --git a/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java b/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java
@@ -44,6 +44,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("javaClassName");
 			description.addProperty("retired");

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/AllergyResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/AllergyResource1_8.java
@@ -18,6 +18,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.PropertySetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.api.RestService;
@@ -86,6 +87,7 @@ public DelegatingResourceDescription getCreatableProperties() {
 	 * @param allergy
 	 * @return String ConceptName
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(Allergy allergy) {
 		if (allergy.getAllergen() == null)
 			return "";

diff --git a/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/BaseActiveListItemResource1_8.java b/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/BaseActiveListItemResource1_8.java
@@ -38,7 +38,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("person", Representation.REF);
 			description.addProperty("activeListType", Representation.REF);
 			description.addProperty("startDate");
@@ -53,7 +53,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("person", Representation.REF);
 			description.addProperty("activeListType", Representation.REF);
 			description.addProperty("startDate");

diff --git a/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortMemberResource1_8.java b/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortMemberResource1_8.java
@@ -20,6 +20,7 @@
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.SubResource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -96,19 +97,19 @@ public CohortMember1_8 getByUniqueId(String uniqueId) {
 	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
 		if (rep instanceof RefRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addSelfLink();
 			return description;
 		} else if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("patient");
 			description.addSelfLink();
 			description.addLink("full", ".?v=" + RestConstants.REPRESENTATION_FULL);
 			return description;
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("patient");
 			//description.addProperty("auditInfo", findMethod("getAuditInfo"));
 			description.addSelfLink();
@@ -253,8 +254,9 @@ else if (context.getRepresentation().equals(Representation.FULL))
 	 * @param member the patient
 	 * @return string that contains cohort member's identifier and full name
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(CohortMember1_8 member) {
-		
+
 		if (member.getPatient().getPatientIdentifier() == null)
 			return "";
 

diff --git a/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortResource1_8.java b/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortResource1_8.java
@@ -17,6 +17,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -66,7 +67,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("voided");
@@ -77,7 +78,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("memberIds");
@@ -149,6 +150,7 @@ public Cohort save(Cohort cohort) {
 	 * @param cohort
 	 * @return cohort's name
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(Cohort cohort) {
 		return cohort.getName();
 	}

diff --git a/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDatatypeResource1_8.java b/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDatatypeResource1_8.java
@@ -43,7 +43,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("hl7Abbreviation");
@@ -54,7 +54,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("hl7Abbreviation");

diff --git a/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDescriptionResource1_8.java b/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDescriptionResource1_8.java
@@ -46,12 +46,12 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof RefRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addSelfLink();
 			return description;
 		} else if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("description");
 			description.addProperty("locale");
@@ -167,6 +167,7 @@ public ConceptDescription newDelegate() {
 	 * @param conceptDescription the concept description object.
 	 * @return the display string.
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(ConceptDescription conceptDescription) {
 		return conceptDescription.getDescription();
 	}

diff --git a/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptMapResource1_8.java b/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptMapResource1_8.java
@@ -21,6 +21,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.annotation.SubResource;
 import org.openmrs.module.webservices.rest.web.api.RestHelperService;
@@ -44,7 +45,7 @@ public class ConceptMapResource1_8 extends DelegatingSubResource<ConceptMap, Con
 	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("source", Representation.REF);
 			description.addProperty("sourceCode");
@@ -53,7 +54,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			return description;
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("source", Representation.DEFAULT);
 			description.addProperty("sourceCode");
@@ -82,6 +83,7 @@ public DelegatingResourceDescription getCreatableProperties() {
 	 * @param conceptMap the concept map object.
 	 * @return the display string.
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(ConceptMap conceptMap) {
 		if (conceptMap.getSource() == null) {
 			return "";

diff --git a/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptNameResource1_8.java b/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptNameResource1_8.java
@@ -44,7 +44,7 @@ public class ConceptNameResource1_8 extends DelegatingSubResource<ConceptName, C
 	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("name");
 			description.addProperty("locale");
@@ -55,7 +55,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			return description;
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("name");
 			description.addProperty("locale");
@@ -179,6 +179,7 @@ public ConceptName newDelegate() {
 	 * @param conceptName the concept name object.
 	 * @return the display string.
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(ConceptName conceptName) {
 		return conceptName.getName();
 	}

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java
@@ -131,7 +131,7 @@ public List<Representation> getAvailableRepresentations() {
     protected DelegatingResourceDescription fullRepresentationDescription(Concept delegate) {
         DelegatingResourceDescription description = new DelegatingResourceDescription();
         description.addProperty("uuid");
-        description.addProperty("display", findMethod("getDisplayName"));
+        description.addProperty("display");
         description.addProperty("name", Representation.DEFAULT);
         description.addProperty("datatype", Representation.DEFAULT);
         description.addProperty("conceptClass", Representation.DEFAULT);
@@ -170,7 +170,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayName"));
+			description.addProperty("display");
 			description.addProperty("name", Representation.DEFAULT);
 			description.addProperty("datatype", Representation.REF);
 			description.addProperty("conceptClass", Representation.REF);
@@ -291,6 +291,7 @@ public static List<ConceptMap> getMappings(Concept instance) {
 	 * 
 	 * @param instance the delegate instance to get the display name off
 	 */
+	@PropertyGetter("display")
 	public String getDisplayName(Concept instance) {
 		ConceptName cn = instance.getName();
 		return cn == null ? null : cn.getName();

diff --git a/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptSourceResource1_8.java b/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptSourceResource1_8.java
@@ -45,7 +45,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("hl7Code");
@@ -56,7 +56,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("name");
 			description.addProperty("description");
 			description.addProperty("hl7Code");

diff --git a/...ava/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugResource1_8.java b/...ava/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugResource1_8.java
@@ -78,7 +78,7 @@ public void purge(Drug delegate, RequestContext context) throws ResponseExceptio
 	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("name");
 			description.addProperty("description");
@@ -96,7 +96,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			return description;
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("uuid");
 			description.addProperty("name");
 			description.addProperty("description");

diff --git a/...rg/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterResource1_8.java b/...rg/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterResource1_8.java
@@ -55,7 +55,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		if (rep instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("encounterDatetime");
 			description.addProperty("patient", Representation.REF);
 			description.addProperty("location", Representation.REF);
@@ -71,7 +71,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		} else if (rep instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
 			description.addProperty("uuid");
-			description.addProperty("display", findMethod("getDisplayString"));
+			description.addProperty("display");
 			description.addProperty("encounterDatetime");
 			description.addProperty("patient", Representation.REF);
 			description.addProperty("location");
@@ -168,6 +168,7 @@ public void purge(Encounter enc, RequestContext context) throws ResponseExceptio
 	 * @param encounter
 	 * @return encounter type and date
 	 */
+	@PropertyGetter("display")
 	public String getDisplayString(Encounter encounter) {
 		String ret = encounter.getEncounterType() == null ? "?" : encounter.getEncounterType().getName();
 		ret += " ";