Merge 5a45e99 into 023de3c

openmrs · Nov 29, 2017 · 8ef8228 · 8ef8228
2 parents 023de3c + 5a45e99
commit 8ef8228
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 57 deletions.
diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java
@@ -22,7 +22,7 @@
 import org.openmrs.Order;
 import org.openmrs.Patient;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
@@ -112,8 +112,7 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 	public Model getCREATEModel(Representation rep) {
 		ModelImpl model = new ModelImpl()
 		        .property("encounter", new StringProperty().example("uuid"))
-		        .property("action", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Order.Action.class)))
+		        .property("action", new EnumProperty(Order.Action.class))
 		        .property("accessionNumber", new StringProperty())
 		        .property("dateActivated", new DateProperty())
 		        .property("scheduledDate", new DateProperty())
@@ -124,8 +123,7 @@ public Model getCREATEModel(Representation rep) {
 		        .property("autoExpireDate", new DateProperty())
 		        .property("orderer", new StringProperty().example("uuid"))
 		        .property("previousOrder", new StringProperty().example("uuid"))
-		        .property("urgency", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Order.Urgency.class)))
+		        .property("urgency", new EnumProperty(Order.Urgency.class))
 		        .property("orderReason", new StringProperty().example("uuid"))
 		        .property("orderReasonNonCoded", new StringProperty())
 		        .property("instructions", new StringProperty())

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/AllergyResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/AllergyResource1_8.java
@@ -19,7 +19,7 @@
 import org.openmrs.activelist.AllergySeverity;
 import org.openmrs.activelist.AllergyType;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
@@ -66,11 +66,9 @@ public DelegatingResourceDescription getRepresentationDescription(Representation
 	@Override
 	public Model getGETModel(Representation rep) {
 		ModelImpl model = ((ModelImpl) super.getGETModel(rep))
-		        .property("allergyType", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(AllergyType.class)))
+		        .property("allergyType", new EnumProperty(AllergyType.class))
 		        .property("reaction", new RefProperty("#/definitions/ConceptGetRef"))
-		        .property("severity", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(AllergySeverity.class)))
+		        .property("severity", new EnumProperty(AllergySeverity.class))
 		        .property("allergen", new RefProperty("#/definitions/ConceptGetRef"));
 		if (rep instanceof FullRepresentation) {
 			model
@@ -83,12 +81,10 @@ public Model getGETModel(Representation rep) {
 	@Override
 	public Model getCREATEModel(Representation rep) {
 		return ((ModelImpl) super.getCREATEModel(rep))
-		        .property("allergyType", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(AllergyType.class)))
+		        .property("allergyType", new EnumProperty(AllergyType.class))
 		        .property("reaction", new ObjectProperty()
 		                .property("uuid", new StringProperty()))
-		        .property("severity", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(AllergySeverity.class)))
+		        .property("severity", new EnumProperty(AllergySeverity.class))
 		        .property("allergen", new StringProperty());
 	}
 

diff --git a/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptNameResource1_8.java b/.../openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptNameResource1_8.java
@@ -21,7 +21,7 @@
 import org.openmrs.ConceptName;
 import org.openmrs.api.ConceptNameType;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
@@ -80,8 +80,7 @@ public Model getGETModel(Representation rep) {
 			        .property("name", new StringProperty())
 			        .property("locale", new StringProperty().example("en"))
 			        .property("localePreferred", new BooleanProperty())
-			        .property("conceptNameType", new StringProperty()
-			                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ConceptNameType.class)));
+			        .property("conceptNameType", new EnumProperty(ConceptNameType.class));
 		}
 		return model;
 	}
@@ -92,8 +91,7 @@ public Model getCREATEModel(Representation rep) {
 		        .property("name", new StringProperty())
 		        .property("locale", new StringProperty().example("en"))
 		        .property("localePreferred", new BooleanProperty()._default(false))
-		        .property("conceptNameType", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ConceptNameType.class)))
+		        .property("conceptNameType", new EnumProperty(ConceptNameType.class))
 		        .required("name").required("locale");
 	}
 

diff --git a/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java b/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java
@@ -17,7 +17,7 @@
 import io.swagger.models.properties.StringProperty;
 import org.openmrs.module.Module;
 import org.openmrs.module.ModuleException;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.helper.ModuleAction;
 import org.openmrs.module.webservices.helper.ModuleFactoryWrapper;
 import org.openmrs.module.webservices.rest.SimpleObject;
@@ -239,18 +239,16 @@ public DelegatingResourceDescription getCreatableProperties() throws ResourceDoe
 	public Model getGETModel(Representation rep) {
 		return ((ModelImpl) super.getGETModel(rep))
 		        .property("modules", new ArrayProperty(new RefProperty("#/definitions/ModuleGetRef")))
-		        .property("action", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ModuleAction.Action.class)));
+		        .property("action", new EnumProperty(ModuleAction.Action.class));
 	}
 
 	@Override
 	public Model getCREATEModel(Representation rep) {
 		return new ModelImpl()
 		        .property("modules", new ArrayProperty(new StringProperty().example("moduleId")))
 		        .property("allModules", new BooleanProperty())
-		        .property("action", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ModuleAction.Action.class)))
-
+		        .property("action", new EnumProperty(ModuleAction.Action.class))
+
 		        .required("action");
 	}
 

diff --git a/...odule/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierTypeResource1_8.java b/...odule/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierTypeResource1_8.java
@@ -16,7 +16,7 @@
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.api.PatientService;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
@@ -125,8 +125,7 @@ public Model getGETModel(Representation rep) {
 			        .property("required", new BooleanProperty())
 			        .property("checkDigit", new BooleanProperty())
 			        .property("validator", new StringProperty())
-			        .property("locationBehavior", new StringProperty()
-			                ._enum(SwaggerSpecificationCreator.getEnumsAsList(PatientIdentifierType.LocationBehavior.class)))
+			        .property("locationBehavior", new EnumProperty(PatientIdentifierType.LocationBehavior.class))
 			        .property("uniquenessBehavior", new StringProperty()); //FIXME check type
 		}
 		return model;
@@ -140,8 +139,7 @@ public Model getCREATEModel(Representation rep) {
 		        .property("required", new BooleanProperty())
 		        .property("checkDigit", new BooleanProperty())
 		        .property("validator", new StringProperty())
-		        .property("locationBehavior", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(PatientIdentifierType.LocationBehavior.class)))
+		        .property("locationBehavior", new EnumProperty(PatientIdentifierType.LocationBehavior.class))
 		        .property("uniquenessBehavior", new StringProperty()); //FIXME check type
 	}
 

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProblemResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProblemResource1_8.java
@@ -18,7 +18,7 @@
 import org.openmrs.activelist.Problem;
 import org.openmrs.activelist.ProblemModifier;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
@@ -44,8 +44,7 @@ public Model getGETModel(Representation rep) {
 		ModelImpl model = (ModelImpl) super.getGETModel(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			model
-			        .property("modifier", new StringProperty()
-			                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ProblemModifier.class)))
+			        .property("modifier", new EnumProperty(ProblemModifier.class))
 			        .property("sortWeight", new DoubleProperty());
 		}
 		if (rep instanceof DefaultRepresentation) {
@@ -98,8 +97,7 @@ public DelegatingResourceDescription getCreatableProperties() {
 	public Model getCREATEModel(Representation rep) {
 		return ((ModelImpl) super.getCREATEModel(rep))
 		        .property("problem", new RefProperty("#/definitions/ConceptCreate"))
-		        .property("modifier", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(ProblemModifier.class)))
+		        .property("modifier", new EnumProperty(ProblemModifier.class))
 		        .property("sortWeight", new DoubleProperty())
 
 		        .required("problem");

diff --git a/...java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java b/...java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_1/ObsResource2_1.java
@@ -13,7 +13,7 @@
 import io.swagger.models.ModelImpl;
 import io.swagger.models.properties.StringProperty;
 import org.openmrs.Obs;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+import org.openmrs.module.webservices.docs.swagger.core.property.EnumProperty;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
@@ -30,19 +30,15 @@ public class ObsResource2_1 extends ObsResource1_11 {
 	@Override
 	public Model getGETModel(Representation rep) {
 		return ((ModelImpl) super.getGETModel(rep))
-		        .property("status", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Obs.Status.class)))
-		        .property("interpretation", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Obs.Interpretation.class)));
+		        .property("status", new EnumProperty(Obs.Status.class))
+		        .property("interpretation", new EnumProperty(Obs.Interpretation.class));
 	}
 
 	@Override
 	public Model getCREATEModel(Representation rep) {
 		return ((ModelImpl) super.getCREATEModel(rep))
-		        .property("status", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Obs.Status.class)))
-		        .property("interpretation", new StringProperty()
-		                ._enum(SwaggerSpecificationCreator.getEnumsAsList(Obs.Interpretation.class)));
+		        .property("status", new EnumProperty(Obs.Status.class))
+		        .property("interpretation", new EnumProperty(Obs.Interpretation.class));
 	}
 
 	@Override

diff --git a/...rc/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java b/...rc/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java
@@ -1233,15 +1233,5 @@ public static boolean isCached() {
 	public static void clearCache() {
 		swagger = null;
 	}
-
-	//FIXME: move to separate util calls
-	// see: https://stackoverflow.com/q/13783295/3647002
-	public static String[] getEnums(Class<? extends Enum<?>> e) {
-		return Arrays.toString(e.getEnumConstants())
-		        .replaceAll("^.|.$", "").split(", ");
-	}
-
-	public static List<String> getEnumsAsList(Class<? extends Enum<?>> e) {
-		return Arrays.asList(getEnums(e));
-	}
+
 }
diff --git a/...src/main/java/org/openmrs/module/webservices/docs/swagger/core/property/EnumProperty.java b/...src/main/java/org/openmrs/module/webservices/docs/swagger/core/property/EnumProperty.java
@@ -10,11 +10,22 @@
 package org.openmrs.module.webservices.docs.swagger.core.property;
 
 import io.swagger.models.properties.StringProperty;
-import org.openmrs.module.webservices.docs.swagger.SwaggerSpecificationCreator;
+
+import java.util.Arrays;
+import java.util.List;
 
 public class EnumProperty extends StringProperty {
 
 	public EnumProperty(Class<? extends Enum<?>> e) {
-		_enum(SwaggerSpecificationCreator.getEnumsAsList(e));
+		_enum(getEnumsAsList(e));
+	}
+
+	private List<String> getEnumsAsList(Class<? extends Enum<?>> e) {
+		return Arrays.asList(getEnums(e));
+	}
+
+	private String[] getEnums(Class<? extends Enum<?>> e) {
+		return Arrays.toString(e.getEnumConstants())
+		        .replaceAll("^.|.$", "").split(", ");
 	}
 }