uuid should be a uuidschema

openmrs · Oct 30, 2024 · 9b0b984 · 9b0b984
1 parent 70dbaf0
commit 9b0b984
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 31 deletions.
diff --git a/...mrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java b/...mrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java
@@ -17,6 +17,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Concept;
 import org.openmrs.Drug;
 import org.openmrs.DrugIngredient;
@@ -91,7 +92,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("strength", new NumberSchema().format("double"));
 		}

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
@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Patient;
 import org.openmrs.activelist.Allergy;
 import org.openmrs.activelist.AllergySeverity;
@@ -88,7 +89,7 @@ public Schema<?> getCREATESchema(Representation rep) {
 		return new ObjectSchema()
 				.addProperty("allergyType", new Schema<AllergyType>().type("string")._enum(Arrays.asList(AllergyType.values())))
 				.addProperty("reaction", new ObjectSchema())
-						.addProperty("uuid", new StringSchema())
+				.addProperty("uuid", new UUIDSchema())
 				.addProperty("severity", new Schema<AllergySeverity>().type("string")._enum(Arrays.asList(AllergySeverity.values())))
 				.addProperty("allergen", new StringSchema());
 	}

diff --git a/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/BaseActiveListItemResource1_8.java b/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/BaseActiveListItemResource1_8.java
@@ -15,6 +15,7 @@
 import io.swagger.v3.oas.models.media.DateTimeSchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Obs;
 import org.openmrs.Person;
 import org.openmrs.activelist.ActiveListItem;
@@ -39,7 +40,7 @@ public abstract class BaseActiveListItemResource1_8<T extends ActiveListItem> ex
 	@Override
 	public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = new ObjectSchema()
-				.addProperty("uuid", new StringSchema())
+				.addProperty("uuid", new UUIDSchema())
 				.addProperty("display", new StringSchema())
 				.addProperty("startDate", new DateTimeSchema())
 				.addProperty("endDate", new DateTimeSchema())

diff --git a/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortResource1_8.java b/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortResource1_8.java
@@ -19,6 +19,7 @@
 import io.swagger.v3.oas.models.media.IntegerSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Cohort;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -99,7 +100,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("description", new StringSchema())

diff --git a/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDatatypeResource1_8.java b/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDatatypeResource1_8.java
@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.ConceptDatatype;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.SimpleObject;
@@ -71,7 +72,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("description", new StringSchema())

diff --git a/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDescriptionResource1_8.java b/...s/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDescriptionResource1_8.java
@@ -16,6 +16,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Concept;
 import org.openmrs.ConceptDescription;
 import org.openmrs.api.context.Context;
@@ -73,17 +74,17 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = new ObjectSchema();
 		if (rep instanceof RefRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema());
 		} else if (rep instanceof DefaultRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("description", new StringSchema())
 			        .addProperty("locale", new StringSchema());
 		} else if (rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("description", new StringSchema())
 			        .addProperty("locale", new StringSchema());

diff --git a/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptMapResource1_8.java b/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptMapResource1_8.java
@@ -16,6 +16,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Concept;
 import org.openmrs.ConceptMap;
 import org.openmrs.api.context.Context;
@@ -72,13 +73,13 @@ public Schema<?> getGETSchema(Representation rep) {
 		if (rep instanceof DefaultRepresentation) {
 			schema
 			        .addProperty("display", new StringSchema())
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("source", new Schema<Object>().$ref("#/components/schemas/ConceptSourceGetRef"))
 			        .addProperty("sourceCode", new StringSchema());
 		} else if (rep instanceof FullRepresentation) {
 			schema
 			        .addProperty("display", new StringSchema())
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("source", new Schema<Object>().$ref("#/components/schemas/ConceptSourceGet"))
 			        .addProperty("sourceCode", new StringSchema())
 			        .addProperty("comment", new StringSchema());

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
@@ -19,6 +19,7 @@
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.DateTimeSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Concept;
 import org.openmrs.ConceptName;
 import org.openmrs.api.ConceptNameType;
@@ -83,11 +84,11 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = new ObjectSchema();
 		if (rep instanceof RefRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema());
 		} else if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("locale", new StringSchema().example("en"))

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java
@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.apache.commons.lang.StringUtils;
 import org.openmrs.Concept;
 import org.openmrs.ConceptAnswer;
@@ -219,7 +220,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = new ObjectSchema();
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new Schema<Object>().$ref("#/components/schemas/ConceptNameGet"))
 			        .addProperty("datatype", new Schema<Object>().$ref("#/components/schemas/ConceptdatatypeGetRef"))

diff --git a/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptSourceResource1_8.java b/...penmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptSourceResource1_8.java
@@ -13,6 +13,7 @@
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.ConceptSource;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -76,7 +77,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> schema = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("description", new StringSchema())

diff --git a/...ava/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugResource1_8.java b/...ava/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugResource1_8.java
@@ -13,6 +13,7 @@
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.NumberSchema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Drug;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -123,7 +124,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			schema
 			        .addProperty("display", new StringSchema())
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("description", new StringSchema())
 			        .addProperty("retired", new BooleanSchema())

diff --git a/...rg/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java b/...rg/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FormFieldResource1_8.java
@@ -19,6 +19,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Field;
 import org.openmrs.Form;
 import org.openmrs.FormField;
@@ -47,7 +48,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> modelImpl = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			modelImpl
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("fieldNumber", new IntegerSchema())
 			        .addProperty("fieldPart", new StringSchema())

diff --git a/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java b/...g/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java
@@ -13,6 +13,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.api.context.Context;
 import org.openmrs.hl7.HL7Source;
 import org.openmrs.module.webservices.rest.web.RequestContext;
@@ -103,12 +104,12 @@ public Schema<?> getGETSchema(Representation rep) {
 			ObjectSchema objectSchema = (ObjectSchema) schema;
 			if (rep instanceof DefaultRepresentation) {
 				objectSchema
-						.addProperty("uuid", new StringSchema())
+						.addProperty("uuid", new UUIDSchema())
 						.addProperty("display", new StringSchema())
 						.addProperty("messageState", new IntegerSchema());
 			} else if (rep instanceof FullRepresentation) {
 				objectSchema
-						.addProperty("uuid", new StringSchema())
+						.addProperty("uuid", new UUIDSchema())
 						.addProperty("display", new StringSchema())
 						.addProperty("source", new Schema<HL7Source>().$ref("#/components/schemas/Hl7sourceGet"))
 						.addProperty("sourceKey", new StringSchema())

diff --git a/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java b/...a/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java
@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.apache.commons.io.FileUtils;
 import org.openmrs.module.Module;
 import org.openmrs.module.ModuleException;
@@ -112,7 +113,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> model = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			model
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("name", new StringSchema())
 			        .addProperty("description", new StringSchema())
@@ -129,7 +130,7 @@ public Schema<?> getGETSchema(Representation rep) {
 			        .addProperty("requiredModules", new ArraySchema().items(new StringSchema()));
 		} else if (rep instanceof RefRepresentation) {
 			model
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema());
 		}
 		return model;

diff --git a/...va/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/OrderResource1_8.java b/...va/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/OrderResource1_8.java
@@ -17,6 +17,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Concept;
 import org.openmrs.Encounter;
 import org.openmrs.Order;
@@ -218,7 +219,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> model = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			model
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("instructions", new StringSchema())
 			        .addProperty("startDate", new DateSchema())
@@ -236,7 +237,7 @@ public Schema<?> getGETSchema(Representation rep) {
 					.addProperty("encounter", new Schema<Encounter>().$ref("#/components/schemas/EncounterGet"))
 					.addProperty("orderer", new Schema<User>().$ref("#/components/schemas/UserGet"))
 					.addProperty("discontinuedBy", new Schema<User>().$ref("#/components/schemas/UserGet"))
-					.addProperty("discontinuedReason", new Schema<Concept>().$ref("#/components/schemas.ConceptGet"));
+					.addProperty("discontinuedReason", new Schema<Concept>().$ref("#/components/schemas/ConceptGet"));
 		} else if (rep instanceof FullRepresentation) {
 			model
 					.addProperty("orderType", new Schema<OrderType>().$ref("#/components/schemas/OrdertypeGetFull"))
@@ -245,7 +246,7 @@ public Schema<?> getGETSchema(Representation rep) {
 					.addProperty("encounter", new Schema<Encounter>().$ref("#/components/schemas/EncounterGetFull"))
 					.addProperty("orderer", new Schema<User>().$ref("#/components/schemas/UserGetFull"))
 					.addProperty("discontinuedBy", new Schema<User>().$ref("#/components/schemas/UserGetFull"))
-					.addProperty("discontinuedReason", new Schema<Concept>().$ref("#/components/schemas.ConceptGetFull"));
+					.addProperty("discontinuedReason", new Schema<Concept>().$ref("#/components/schemas/ConceptGetFull"));
 		}
 		return model;
 	}

diff --git a/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java b/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientIdentifierResource1_8.java
@@ -17,6 +17,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.Location;
 import org.openmrs.Patient;
@@ -139,7 +140,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> model = super.getGETSchema(rep);
 		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			model
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("display", new StringSchema())
 			        .addProperty("identifier", new StringSchema())
 			        .addProperty("preferred", new BooleanSchema()._default(false))

diff --git a/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientResource1_8.java b/.../org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientResource1_8.java
@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.media.BooleanSchema;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Patient;
 import org.openmrs.PatientIdentifier;
 import org.openmrs.Person;
@@ -149,7 +150,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		if (schema instanceof ObjectSchema && (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation)) {
 			ObjectSchema objectSchema = (ObjectSchema) schema;
 			objectSchema
-					.addProperty("uuid", new StringSchema())
+					.addProperty("uuid", new UUIDSchema())
 					.addProperty("display", new StringSchema())
 					.addProperty("identifiers", new ArraySchema().items(new Schema<Object>().$ref("#/components/schemas/PatientIdentifierGetRef")))
 					.addProperty("preferred", new BooleanSchema()._default(false))

diff --git a/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java b/...openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PatientStateResource1_8.java
@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.PatientProgram;
 import org.openmrs.PatientState;
 import org.openmrs.ProgramWorkflow;
@@ -177,7 +178,7 @@ public Schema<?> getGETSchema(Representation rep) {
 		Schema<?> model = super.getGETSchema(rep);
 		if (rep instanceof RefRepresentation || rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
 			model
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("startDate", new DateSchema())
 			        .addProperty("endDate", new DateSchema())
 			        .addProperty("voided", new BooleanSchema());

diff --git a/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java b/...nmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8.java
@@ -13,6 +13,7 @@
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.UUIDSchema;
 import org.openmrs.Attributable;
 import org.openmrs.Location;
 import org.openmrs.Person;
@@ -159,14 +160,14 @@ public Schema<?> getGETSchema(Representation rep) {
 		if (rep instanceof DefaultRepresentation) {
 			model
 			        .addProperty("display", new StringSchema())
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("value", new StringSchema())
 					.addProperty("attributeType", new Schema<PersonAttributeType>().$ref("#/components/schemas/PersonattributetypeGet"))
 			        .addProperty("voided", new BooleanSchema());
 		} else if (rep instanceof FullRepresentation) {
 			model
 			        .addProperty("display", new StringSchema())
-			        .addProperty("uuid", new StringSchema())
+			        .addProperty("uuid", new UUIDSchema())
 			        .addProperty("value", new StringSchema())
 					.addProperty("attributeType", new Schema<PersonAttributeType>().$ref("#/components/schemas/PersonattributetypeGetFull"))
 			        .addProperty("voided", new BooleanSchema())