Fixes for RESTWS-980 (Plugin, ConditionResource, etc.)

Author: capernix

omod-2.4/pom.xml

@@ -97,6 +97,24 @@
                     <header>${project.parent.basedir}/license-header.txt</header>
                 </configuration>
             </plugin>
+            <plugin>
+				<groupId>org.openmrs.plugin</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<version>1.0.0-SNAPSHOT</version>
+				<configuration>
+					<scanPackages>
+						<scanPackage>org.openmrs.module.webservices.rest.web.v1_0.resource</scanPackage>
+					</scanPackages>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>openapi</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 </project>

omod-2.4/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_2/ConditionResource2_2.java

@@ -42,7 +42,14 @@
         "2.2.* - 9.*" })
 public class ConditionResource2_2 extends DataDelegatingCrudResource<Condition> {
 
-	private ConditionService conditionService = Context.getConditionService();
+	private ConditionService conditionService;
+
+	private ConditionService getConditionService() {
+    if (conditionService == null) {
+        conditionService = Context.getConditionService();
+    }
+    return conditionService;
+	}
 
 	/**
 	 * @see org.openmrs.module.webservices.rest.web.resource.impl.DelegatingCrudResource#getRepresentationDescription(Representation)
@@ -180,7 +187,7 @@ public DelegatingResourceDescription getUpdatableProperties() {
 	 */
 	@Override
 	public Condition getByUniqueId(String uuid) {
-		return conditionService.getConditionByUuid(uuid);
+		return getConditionService().getConditionByUuid(uuid);
 	}
 
 	/**
@@ -189,7 +196,7 @@ public Condition getByUniqueId(String uuid) {
 	 */
 	@Override
 	protected void delete(Condition condition, String reason, RequestContext requestContext) throws ResponseException {
-		conditionService.voidCondition(condition, reason);
+		getConditionService().voidCondition(condition, reason);
 	}
 
 	/**
@@ -205,7 +212,7 @@ public Condition newDelegate() {
 	 */
 	@Override
 	public Condition save(Condition condition) {
-		return conditionService.saveCondition(condition);
+		return getConditionService().saveCondition(condition);
 	}
 
 	/**
@@ -214,7 +221,7 @@ public Condition save(Condition condition) {
 	 */
 	@Override
 	public void purge(Condition condition, RequestContext requestContext) throws ResponseException {
-		conditionService.purgeCondition(condition);
+		getConditionService().purgeCondition(condition);
 	}
 
 	/**
@@ -237,7 +244,6 @@ public String getDisplayString(Condition condition) {
 	protected PageableResult doSearch(RequestContext context) {
 		String patientUuid = context.getRequest().getParameter("patientUuid");
 		String includeInactive = context.getRequest().getParameter("includeInactive");
-		ConditionService conditionService = Context.getConditionService();
 		if (StringUtils.isBlank(patientUuid)) {
 			return new EmptySearchResult();
 		}
@@ -249,13 +255,13 @@ protected PageableResult doSearch(RequestContext context) {
 		if (StringUtils.isNotBlank(includeInactive)) {
 			boolean isIncludeInactive = BooleanUtils.toBoolean(includeInactive);
 			if (isIncludeInactive) {
-				return new NeedsPaging<Condition>(conditionService.getAllConditions(patient), context);
+				return new NeedsPaging<Condition>(getConditionService().getAllConditions(patient), context);
 			} else {
-				return new NeedsPaging<Condition>(conditionService.getActiveConditions(patient), context);
+				return new NeedsPaging<Condition>(getConditionService().getActiveConditions(patient), context);
 			}
 		}
 		else {
-			return new NeedsPaging<Condition>(conditionService.getActiveConditions(patient), context);
+			return new NeedsPaging<Condition>(getConditionService().getActiveConditions(patient), context);
 		}
 	}
 }

omod/pom.xml

@@ -82,7 +82,8 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>					<execution>
+				<executions>					
+					<execution>
 						<id>Expand resources</id>
 						<goals>
 							<goal>unpack-dependencies</goal>