Encapsulate resource handler map by adding a getter method instead of making it public

Author: mherman22

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

@@ -41,7 +41,6 @@
 import java.util.Set;
 import java.util.UUID;
 
-import static org.openmrs.module.webservices.rest.web.api.impl.RestServiceImpl.resourcesBySupportedClasses;
 import static org.openmrs.module.webservices.rest.web.representation.Representation.DEFAULT;
 import static org.openmrs.module.webservices.rest.web.representation.Representation.FULL;
 import static org.openmrs.module.webservices.rest.web.representation.Representation.REF;
@@ -404,9 +403,10 @@ public static Class<?> getGenericType(Class<?> resourceHandlerClass) {
      * @param resourceClass the resource class e.g. PatientIdentifier
      */
     public static org.openmrs.module.webservices.rest.web.resource.api.Resource getResourceHandlerForSupportedClass(Class<?> resourceClass) {
-        if (resourcesBySupportedClasses == null) {
+        if (Context.getService(RestService.class).getResource(resourceClass) == null) {
             Context.getService(RestService.class).initialize();
         }
-        return resourcesBySupportedClasses.get(resourceClass);
+        return Context.getService(RestService.class).getResource(resourceClass);
     }
+
 }

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

@@ -78,6 +78,14 @@ 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

@@ -48,8 +48,8 @@
 public class RestServiceImpl implements RestService {
 
 	volatile Map<String, ResourceDefinition> resourceDefinitionsByNames;
-	
-	public static volatile Map<Class<?>, Resource> resourcesBySupportedClasses;
+
+	static volatile Map<Class<?>, Resource> resourcesBySupportedClasses;
 
 	private volatile Map<CompositeSearchHandlerKeyValue, Set<SearchHandler>> searchHandlersByParameter;
 
@@ -78,7 +78,11 @@ public OpenmrsClassScanner getOpenmrsClassScanner() {
 	public void setOpenmrsClassScanner(OpenmrsClassScanner openmrsClassScanner) {
 		this.openmrsClassScanner = openmrsClassScanner;
 	}
-	
+
+	public Resource getResource(Class<?> resourceClass) {
+		return resourcesBySupportedClasses.get(resourceClass);
+	}
+
 	public RestServiceImpl() {
 	}