RESTWS-939: DiagnosisResource should support formFieldPath property

omod-2.2/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/DiagnosisResource2_2.java

@@ -16,6 +16,7 @@
 import org.openmrs.Diagnosis;
 import org.openmrs.Patient;
 import org.openmrs.api.context.Context;
+import org.openmrs.module.ModuleUtil;
 import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -98,6 +99,9 @@ public void purge(Diagnosis diagnosis, RequestContext requestContext) throws Res
 	public DelegatingResourceDescription getRepresentationDescription(Representation representation) {
 		if (representation instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
+			if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+				description.addProperty("formNamespaceAndPath");
+			}
 			description.addProperty("uuid");
 			description.addProperty("diagnosis", Representation.REF);
 			description.addProperty("condition", Representation.REF);
@@ -112,6 +116,9 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 			return description;
 		} else if (representation instanceof FullRepresentation) {
 			DelegatingResourceDescription description = new DelegatingResourceDescription();
+			if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+				description.addProperty("formNamespaceAndPath");
+			}
 			description.addProperty("uuid");
 			description.addProperty("diagnosis");
 			description.addProperty("patient", Representation.REF);
@@ -135,6 +142,9 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 	public Model getGETModel(Representation rep) {
 		ModelImpl model = (ModelImpl) super.getGETModel(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
+			if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+				model.property("formNamespaceAndPath", new StringProperty());
+			}
 			model
 			        .property("uuid", new StringProperty())
 			        .property("diagnosis", new StringProperty())
@@ -169,7 +179,10 @@ public String getDisplayString(Diagnosis diagnosis) {
 	@Override
 	public DelegatingResourceDescription getCreatableProperties() throws ResourceDoesNotSupportOperationException {
 		DelegatingResourceDescription description = new DelegatingResourceDescription();
-
+		if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+			description.addProperty("formNamespaceAndPath");
+		}
+
 		description.addRequiredProperty("diagnosis");
 		description.addRequiredProperty("encounter");
 		description.addRequiredProperty("condition");
@@ -185,15 +198,18 @@ public DelegatingResourceDescription getCreatableProperties() throws ResourceDoe
 	 */
 	@Override
 	public Model getCREATEModel(Representation rep) {
-
-		return new ModelImpl()
+		ModelImpl model = (ModelImpl) super.getCREATEModel(rep);
+		if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+			model.property("formNamespaceAndPath", new StringProperty());
+		}
+		model
 		        .property("diagnosis", new StringProperty())
 		        .property("encounter", new StringProperty())
 		        .property("condition", new StringProperty())
 		        .property("certainty", new StringProperty())
 		        .property("patient", new StringProperty().example("uuid"))
 		        .property("rank", new IntegerProperty());
-
+		return model;
 	}
 
 	/**
@@ -202,14 +218,17 @@ public Model getCREATEModel(Representation rep) {
 	@Override
 	public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoesNotSupportOperationException {
 		DelegatingResourceDescription description = new DelegatingResourceDescription();
+		if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+			description.addProperty("formNamespaceAndPath");
+		}
 		description.addRequiredProperty("diagnosis");
 		description.addRequiredProperty("condition");
 		description.addRequiredProperty("rank");
 		description.removeProperty("patient");
 		description.addRequiredProperty("voided");
 		description.addRequiredProperty("certainty");
 		description.addRequiredProperty("encounter");
-		
+
 		return description;
 	}
 
@@ -218,13 +237,18 @@ public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoe
 	 */
 	@Override
 	public Model getUPDATEModel(Representation rep) {
-		return new ModelImpl()
+		ModelImpl model = (ModelImpl) super.getUPDATEModel(rep);
+		if (ModuleUtil.isOpenmrsVersionInVersions("2.5.* - 9.*")) {
+			model.property("formNamespaceAndPath", new StringProperty());
+		}
+		model
 		        .property("diagnosis", new StringProperty())
 		        .property("condition", new StringProperty())
 		        .property("encounter", new StringProperty())
 		        .property("certainty", new EnumProperty(ConditionVerificationStatus.class))
 		        .property("rank", new IntegerProperty())
 		        .property("voided", new BooleanProperty());
+		return model;
 	}
 
 	@Override