fix failing tests

Author: mherman22

omod-2.0/src/test/java/org/openmrs/module/webservices/rest/resource/SubDetailsResource.java

@@ -64,6 +64,11 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 		return new DelegatingResourceDescription();
 	}
 
+	@Override
+	public DelegatingResourceDescription getCreatableProperties() throws ResourceDoesNotSupportOperationException {
+		return new DelegatingResourceDescription();
+	}
+
 	@Override
 	public SubDetails newDelegate() {
 		return new SubDetails();

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

@@ -41,6 +41,7 @@
 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;
@@ -284,7 +285,7 @@ public static String getResourceNameBySupportedClass(Class<?> supportedClass) {
     }
 
     public static String getSubResourceNameBySupportedClass(Class<?> supportedClass) {
-        org.openmrs.module.webservices.rest.web.resource.api.Resource resourceHandler = Context.getService(RestService.class).getResourceHandlerForSupportedClass(supportedClass);
+        org.openmrs.module.webservices.rest.web.resource.api.Resource resourceHandler = getResourceHandlerForSupportedClass(supportedClass);
 
         if (resourceHandler == null) {
             return null;
@@ -397,4 +398,15 @@ 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 (resourcesBySupportedClasses == null) {
+            Context.getService(RestService.class).initializeResources();
+        }
+        return resourcesBySupportedClasses.get(resourceClass);
+    }
 }

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

@@ -23,7 +23,9 @@
  * Database related methods for the Rest Web Services
  */
 public interface RestService {
-	
+
+	void initializeResources();
+
 	/**
 	 * Parses a representation requested by the client via the http request
 	 * 
@@ -74,13 +76,6 @@ public interface RestService {
 	 */
 	public List<DelegatingResourceHandler<?>> getResourceHandlers() throws APIException;
 
-
-	/**
-	 * @param resourceClass the resource class e.g PatientIdentifier.class
-	 * @return the resource handler for the provided class e.g PatientIdentifierResource1_8
-	 */
-	Resource getResourceHandlerForSupportedClass(Class<?> resourceClass);
-
 	/**
 	 * Initializes all Resources and Search handlers for use; called after module startup
 	 */

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

@@ -49,7 +49,7 @@ public class RestServiceImpl implements RestService {
 
 	volatile Map<String, ResourceDefinition> resourceDefinitionsByNames;
 
-	volatile Map<Class<?>, Resource> resourcesBySupportedClasses;
+	public static volatile Map<Class<?>, Resource> resourcesBySupportedClasses;
 
 	private volatile Map<CompositeSearchHandlerKeyValue, Set<SearchHandler>> searchHandlersByParameter;
 
@@ -144,8 +144,9 @@ public int hashCode() {
 			return result;
 		}
 	}
-	
-	private void initializeResources() {
+
+	@Override
+	public void initializeResources() {
 		if (resourceDefinitionsByNames != null) {
 			return;
 		}
@@ -689,19 +690,6 @@ public Set<SearchHandler> getSearchHandlers(String resourceName) {
 		}
 		return searchHandlersByResource.get(resourceName);
 	}
-
-	/**
-	 * @see RestService#getResourceHandlerForSupportedClass(Class)
-	 * <strong>Should</strong> return search resources for given resource class
-	 * @param resourceClass the resource class e.g. PatientIdentifier
-	 */
-	@Override
-	public Resource getResourceHandlerForSupportedClass(Class<?> resourceClass) {
-		if (resourcesBySupportedClasses == null) {
-			initializeResources();
-		}
-		return resourcesBySupportedClasses.get(resourceClass);
-	}
 
 	/**
 	 * @see RestService#initialize()