diff --git a/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java b/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java index 988e6a5e..2099ba00 100644 --- a/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java +++ b/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java @@ -15,10 +15,6 @@ import javax.activation.MimetypesFileTypeMap; import javax.imageio.ImageIO; -import io.swagger.models.Model; -import io.swagger.models.ModelImpl; -import io.swagger.models.properties.DateProperty; -import io.swagger.models.properties.StringProperty; import org.apache.commons.codec.binary.Base64; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -41,7 +37,6 @@ import org.openmrs.module.attachments.ComplexObsSaver; import org.openmrs.module.attachments.obs.Attachment; import org.openmrs.module.attachments.obs.ValueComplex; -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; @@ -247,20 +242,6 @@ public DelegatingResourceDescription getCreatableProperties() { return description; } - @Override - public Model getCREATEModel(Representation rep) { - return new ModelImpl().property("comment", new StringProperty()).property("dateTime", new DateProperty()) - .property("filename", new StringProperty()).property("bytesMimeType", new StringProperty()) - - .property("bytesContentFamily", new EnumProperty(AttachmentsConstants.ContentFamily.class)) - .property("complexData", new StringProperty(StringProperty.Format.URI)); - } - - @Override - public Model getUPDATEModel(Representation rep) { - return getCREATEModel(rep); - } - @Override public DelegatingResourceDescription getRepresentationDescription(Representation rep) { DelegatingResourceDescription description = new DelegatingResourceDescription(); @@ -274,15 +255,6 @@ public DelegatingResourceDescription getRepresentationDescription(Representation return description; } - @Override - public Model getGETModel(Representation rep) { - ModelImpl model = (ModelImpl) super.getGETModel(rep); - return model.property("uuid", new StringProperty()).property("dateTime", new DateProperty()) - .property("filename", new StringProperty()).property("comment", new StringProperty()) - .property("bytesMimeType", new StringProperty()) - .property("bytesContentFamily", new EnumProperty(AttachmentsConstants.ContentFamily.class)); - } - /** * Voids the encounter if it contains no non-voided obs. * diff --git a/pom.xml b/pom.xml index 77588d08..f59ec4f3 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.2.0 - 2.33.0 + 2.47.0-SNAPSHOT 0.2.8 3.0.1 UTF-8