use getResourceHandlers() instead

Author: mherman22

omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerGenerationUtil.java

@@ -284,26 +284,27 @@ public static String getResourceNameBySupportedClass(Class<?> supportedClass) {
     }
 
     public static String getSubResourceNameBySupportedClass(Class<?> supportedClass) {
-        org.openmrs.module.webservices.rest.web.resource.api.Resource resourceHandler = getResourceHandlerForSupportedClass(supportedClass);
-
-        if (resourceHandler == null) {
-            return null;
-        }
+        List<DelegatingResourceHandler<?>> resourceHandlers = Context.getService(RestService.class).getResourceHandlers();
+        for (DelegatingResourceHandler<?> resourceHandler : resourceHandlers) {
+            if (resourceHandler == null) {
+                return null;
+            }
 
-        Resource annotation = resourceHandler.getClass().getAnnotation(Resource.class);
-        SubResource subResourceAnnotation = resourceHandler.getClass().getAnnotation(SubResource.class);
+            Resource annotation = resourceHandler.getClass().getAnnotation(Resource.class);
+            SubResource subResourceAnnotation = resourceHandler.getClass().getAnnotation(SubResource.class);
 
-        if (annotation != null && annotation.supportedClass().equals(supportedClass)) {
-            return annotation.name().substring(annotation.name().indexOf('/') + 1);
-        } else if (subResourceAnnotation != null && subResourceAnnotation.supportedClass().equals(supportedClass)) {
-            Resource parentResourceAnnotation = subResourceAnnotation.parent().getAnnotation(Resource.class);
+            if (annotation != null && annotation.supportedClass().equals(supportedClass)) {
+                return annotation.name().substring(annotation.name().indexOf('/') + 1);
+            } else if (subResourceAnnotation != null && subResourceAnnotation.supportedClass().equals(supportedClass)) {
+                Resource parentResourceAnnotation = subResourceAnnotation.parent().getAnnotation(Resource.class);
 
-            String resourceName = subResourceAnnotation.path();
-            String resourceParentName = parentResourceAnnotation.name().substring(
-                    parentResourceAnnotation.name().indexOf('/') + 1);
+                String resourceName = subResourceAnnotation.path();
+                String resourceParentName = parentResourceAnnotation.name().substring(
+                        parentResourceAnnotation.name().indexOf('/') + 1);
 
-            String combinedName = capitalize(resourceParentName) + capitalize(resourceName);
-            return combinedName.replace("/", "");
+                String combinedName = capitalize(resourceParentName) + capitalize(resourceName);
+                return combinedName.replace("/", "");
+            }
         }
         return null;
     }
@@ -397,16 +398,4 @@ public static Class<?> getGenericType(Class<?> resourceHandlerClass) {
 
         return null;
     }
-
-    /**
-     * <strong>Should</strong> return search resources for given resource class
-     * @param resourceClass the resource class e.g. PatientIdentifier
-     */
-    public static org.openmrs.module.webservices.rest.web.resource.api.Resource getResourceHandlerForSupportedClass(Class<?> resourceClass) {
-        if (Context.getService(RestService.class).getResource(resourceClass) == null) {
-            Context.getService(RestService.class).initialize();
-        }
-        return Context.getService(RestService.class).getResource(resourceClass);
-    }
-
 }

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

@@ -78,14 +78,6 @@ public interface RestService {
 	 * Initializes all Resources and Search handlers for use; called after module startup
 	 */
 	public void initialize();
-
-	/**
-	 * Retrieves the resource handler for the given supported class.
-	 *
-	 * @param resourceClass the class for which to get the resource handler
-	 * @return the corresponding Resource handler, or {@code null} if none exists
-	 */
-	public Resource getResource(Class<?> resourceClass);
 
 	/**
 	 * Returns all search handlers.

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

@@ -79,10 +79,6 @@ public void setOpenmrsClassScanner(OpenmrsClassScanner openmrsClassScanner) {
 		this.openmrsClassScanner = openmrsClassScanner;
 	}
 
-	public Resource getResource(Class<?> resourceClass) {
-		return resourcesBySupportedClasses.get(resourceClass);
-	}
-
 	public RestServiceImpl() {
 	}