Added the feature of including properties from @PropertyGetter as well

Author: capernix

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/SchemaIntrospectionServiceImpl.java

@@ -21,6 +21,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.impl.BaseOpenmrsService;
+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.api.SchemaIntrospectionService;
 import org.openmrs.module.webservices.rest.web.resource.api.Resource;
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceHandler;
@@ -139,7 +141,52 @@ public Map<String, String> discoverAvailableProperties(Class<?> delegateType) {
 	@Override
 	public Map<String, String> discoverResourceProperties(Resource resource) {
 		Class<?> delegateType = getDelegateType(resource);
-		return discoverAvailableProperties(delegateType);
+		Map<String, String> properties = discoverAvailableProperties(delegateType);
+		
+		// Also discover properties defined by PropertyGetter and PropertySetter annotations
+		if (resource != null) {
+			discoverAnnotatedProperties(resource.getClass(), properties);
+		}
+		
+		return properties;
+	}
+	
+	/**
+	 * Discovers properties defined by PropertyGetter and PropertySetter annotations in a resource class
+	 * and its superclasses
+	 *
+	 * @param resourceClass The resource class to scan for annotations
+	 * @param properties The map to add discovered properties to
+	 */
+	private void discoverAnnotatedProperties(Class<?> resourceClass, Map<String, String> properties) {
+		// Process the current class and all its superclasses
+		Class<?> currentClass = resourceClass;
+		while (currentClass != null && !currentClass.equals(Object.class)) {
+			// Process all methods in the class
+			for (Method method : currentClass.getDeclaredMethods()) {
+				// Check for PropertyGetter annotation
+				PropertyGetter getter = method.getAnnotation(PropertyGetter.class);
+				if (getter != null) {
+					String propertyName = getter.value();
+					Type returnType = method.getGenericReturnType();
+					properties.put(propertyName, getTypeName(returnType));
+				}
+				
+				// Check for PropertySetter annotation
+				PropertySetter setter = method.getAnnotation(PropertySetter.class);
+				if (setter != null && method.getParameterTypes().length > 1) {
+					String propertyName = setter.value();
+					// For setters, use the type of the second parameter (after the delegate)
+					Type paramType = method.getGenericParameterTypes()[1];
+					// Only add if not already discovered through a getter
+					if (!properties.containsKey(propertyName)) {
+						properties.put(propertyName, getTypeName(paramType));
+					}
+				}
+			}
+			// Move up to the superclass
+			currentClass = currentClass.getSuperclass();
+		}
 	}
 
 	/**

omod-common/src/test/java/org/openmrs/module/webservices/rest/web/api/impl/SchemaIntrospectionServiceImplTest.java

@@ -18,13 +18,18 @@
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.hasSize;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Patient;
+import org.openmrs.PatientIdentifier;
 import org.openmrs.Person;
 import org.openmrs.module.webservices.rest.web.RequestContext;
+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.resource.api.Resource;
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingCrudResource;
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription;
@@ -152,6 +157,29 @@ public void discoverResourceProperties_shouldCombineGetDelegateTypeAndDiscoverAv
 		assertThat(properties, hasKey("birthdate"));
 	}
 
+	/**
+	 * @see SchemaIntrospectionServiceImpl#discoverResourceProperties(Resource)
+	 */
+	@Test
+	public void discoverResourceProperties_shouldIncludePropertiesFromAnnotations() {
+		TestPatientResourceWithAnnotations resource = new TestPatientResourceWithAnnotations();
+		Map<String, String> properties = service.discoverResourceProperties(resource);
+		
+		// Verify standard properties from the delegate type
+		assertThat(properties, hasKey("uuid"));
+		assertThat(properties, hasKey("patientId"));
+		
+		// Verify properties defined by @PropertyGetter annotations
+		assertThat(properties, hasKey("activeIdentifiers"));
+		assertThat(properties, hasKey("displayName"));
+		assertThat(properties, hasEntry("activeIdentifiers", "List<PatientIdentifier>"));
+		assertThat(properties, hasEntry("displayName", "String"));
+		
+		// Verify properties defined by @PropertySetter annotations
+		assertThat(properties, hasKey("preferredName"));
+		assertThat(properties, hasEntry("preferredName", "String"));
+	}
+	
 	/**
 	 * Mock DelegatingCrudResource for testing
 	 */
@@ -187,6 +215,58 @@ public void delete(Patient delegate, String reason, RequestContext context) thro
 		}
 	}
 
+	/**
+	 * Mock DelegatingCrudResource for testing PropertyGetter and PropertySetter annotations
+	 */
+	private class TestPatientResourceWithAnnotations extends DelegatingCrudResource<Patient> {
+		
+		@PropertyGetter("activeIdentifiers")
+		public List<PatientIdentifier> getActiveIdentifiers(Patient patient) {
+			return new ArrayList<PatientIdentifier>();
+		}
+		
+		@PropertyGetter("displayName")
+		public String getDisplayName(Patient patient) {
+			return patient.getPersonName().getFullName();
+		}
+		
+		@PropertySetter("preferredName")
+		public void setPreferredName(Patient patient, String name) {
+			// Implementation not needed for test
+		}
+		
+		// Standard resource methods
+		
+		@Override
+		public Patient newDelegate() {
+			return new Patient();
+		}
+		
+		@Override
+		public Patient save(Patient delegate) {
+			return delegate;
+		}
+		
+		@Override
+		public Patient getByUniqueId(String uniqueId) {
+			return new Patient();
+		}
+		
+		@Override
+		public void purge(Patient delegate, RequestContext context) {
+		}
+		
+		@Override
+		public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
+			return null;
+		}
+		
+		@Override
+		public void delete(Patient delegate, String reason, RequestContext context) throws ResourceDoesNotSupportOperationException {
+			throw new ResourceDoesNotSupportOperationException();
+		}
+	}
+	
 	/**
 	 * Mock DelegatingSubResource for testing
 	 */