Only exposed combined formNameSpaceAndPath

Author: suubi-joshua

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

@@ -46,7 +46,7 @@
  * {@link Resource} for Diagnosis, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/patientdiagnoses", supportedClass = Diagnosis.class, supportedOpenmrsVersions = {
-        "2.2.* - 9.*" })
+        "2.2.* - 2.4.*" })
 public class DiagnosisResource2_2 extends DataDelegatingCrudResource<Diagnosis> {
 
 	/**

omod-2.5/pom.xml

@@ -145,21 +145,21 @@
         <dependency>
             <groupId>org.openmrs.api</groupId>
             <artifactId>openmrs-api</artifactId>
-            <version>${openmrs.version.2.5.0}</version><!--$NO-MVN-MAN-VER$-->
+            <version>${openmrs.version.2.5.0}</version>
         </dependency>
 
         <dependency>
             <groupId>org.openmrs.api</groupId>
             <artifactId>openmrs-api</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${openmrs.version.2.5.0}</version><!--$NO-MVN-MAN-VER$-->
+            <version>${openmrs.version.2.5.0}</version>
         </dependency>
 
         <dependency>
             <groupId>org.openmrs.web</groupId>
             <artifactId>openmrs-web</artifactId>
-            <version>${openmrs.version.2.5.0}</version> <!-- $NO-MVN-MAN-VER$ -->
+            <version>${openmrs.version.2.5.0}</version> 
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
@@ -173,15 +173,15 @@
             <artifactId>openmrs-web</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${openmrs.version.2.5.0}</version> <!-- $NO-MVN-MAN-VER$-->
+            <version>${openmrs.version.2.5.0}</version> 
         </dependency>
 
         <dependency>
             <groupId>org.openmrs.test</groupId>
             <artifactId>openmrs-test</artifactId>
             <type>pom</type>
             <scope>test</scope>
-            <version>${openmrs.version.2.5.0}</version> <!-- $NO-MVN-MAN-VER$ -->
+            <version>${openmrs.version.2.5.0}</version> 
         </dependency>
 
         <dependency>
@@ -215,5 +215,4 @@
             </plugin>
         </plugins>
     </build>
-     
 </project>

omod-2.5/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_5/DiagnosisResource2_5.java

@@ -33,16 +33,12 @@ public class DiagnosisResource2_5 extends DiagnosisResource2_2 {
 	public DelegatingResourceDescription getRepresentationDescription(Representation representation) {
 		if (representation instanceof DefaultRepresentation) {
 			DelegatingResourceDescription description = super.getRepresentationDescription(representation);
-			description.addProperty("formNamespace");
-			description.addProperty("formPath");
 			description.addProperty("formNamespaceAndPath");
 
 			return description;
 
 		} else if (representation instanceof FullRepresentation) {
 			DelegatingResourceDescription description = super.getRepresentationDescription(representation);
-			description.addProperty("formNamespace");
-			description.addProperty("formPath");
 			description.addProperty("formNamespaceAndPath");
 
 			return description;
@@ -58,9 +54,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 	public DelegatingResourceDescription getCreatableProperties() throws ResourceDoesNotSupportOperationException {
 		DelegatingResourceDescription description = super.getCreatableProperties();
 
-		description.addRequiredProperty("formNamespace");
-		description.addRequiredProperty("formPath");
-		description.addProperty("formNamespaceAndPath");
+		description.addRequiredProperty("formNamespaceAndPath");
 
 		return description;
 
@@ -73,9 +67,7 @@ public DelegatingResourceDescription getCreatableProperties() throws ResourceDoe
 	public DelegatingResourceDescription getUpdatableProperties() throws ResourceDoesNotSupportOperationException {
 		DelegatingResourceDescription description = super.getUpdatableProperties();
 
-		description.addRequiredProperty("formNamespace");
-		description.addRequiredProperty("formPath");
-		description.addProperty("formNamespaceAndPath");
+		description.addRequiredProperty("formNamespaceAndPath");
 
 		return description;
 	}