Added the ability to scan properties of @PropertyGetter and @PropertySetter

Author: capernix

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

@@ -21,8 +21,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.impl.BaseOpenmrsService;
+<<<<<<< HEAD
 import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.PropertySetter;
+=======
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 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;
@@ -141,6 +144,7 @@ public Map<String, String> discoverAvailableProperties(Class<?> delegateType) {
 	@Override
 	public Map<String, String> discoverResourceProperties(Resource resource) {
 		Class<?> delegateType = getDelegateType(resource);
+<<<<<<< HEAD
 		Map<String, String> properties = discoverAvailableProperties(delegateType);
 
 		// Also discover properties defined by PropertyGetter and PropertySetter annotations
@@ -187,6 +191,9 @@ private void discoverAnnotatedProperties(Class<?> resourceClass, Map<String, Str
 			// Move up to the superclass
 			currentClass = currentClass.getSuperclass();
 		}
+=======
+		return discoverAvailableProperties(delegateType);
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 	}
 
 	/**

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

@@ -18,18 +18,26 @@
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.hasSize;
 
+<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.List;
+=======
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Patient;
+<<<<<<< HEAD
 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.Person;
+import org.openmrs.module.webservices.rest.web.RequestContext;
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 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;
@@ -158,6 +166,7 @@ public void discoverResourceProperties_shouldCombineGetDelegateTypeAndDiscoverAv
 	}
 
 	/**
+<<<<<<< HEAD
 	 * @see SchemaIntrospectionServiceImpl#discoverResourceProperties(Resource)
 	 */
 	@Test
@@ -181,6 +190,8 @@ public void discoverResourceProperties_shouldIncludePropertiesFromAnnotations()
 	}
 
 	/**
+=======
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 	 * Mock DelegatingCrudResource for testing
 	 */
 	private class TestPatientResource extends DelegatingCrudResource<Patient> {
@@ -216,6 +227,7 @@ public void delete(Patient delegate, String reason, RequestContext context) thro
 	}
 
 	/**
+<<<<<<< HEAD
 	 * Mock DelegatingCrudResource for testing PropertyGetter and PropertySetter annotations
 	 */
 	private class TestPatientResourceWithAnnotations extends DelegatingCrudResource<Patient> {
@@ -268,6 +280,8 @@ public void delete(Patient delegate, String reason, RequestContext context) thro
 	}
 
 	/**
+=======
+>>>>>>> 5e7f50da0571fa2aab7d12e68375741437297f10
 	 * Mock DelegatingSubResource for testing
 	 */
 	private class TestPatientSubResource extends DelegatingSubResource<Patient, Person, TestPersonResource> {