Issue #2424 - fixed issue with Builder.validate method

Signed-off-by: John T.E. Timm <[email protected]>
LinuxForHealth · Jun 1, 2021 · f9c4c05 · f9c4c05
1 parent db7abbd
commit f9c4c05
Show file tree

Hide file tree

Showing 147 changed files with 708 additions and 708 deletions.
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Account.java
@@ -850,9 +850,9 @@ protected void validate(Account account) {
             ValidationSupport.checkList(account.subject, "subject", Reference.class);
             ValidationSupport.checkList(account.coverage, "coverage", Coverage.class);
             ValidationSupport.checkList(account.guarantor, "guarantor", Guarantor.class);
-            ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Device", "Practitioner", "PractitionerRole", "Location", "HealthcareService", "Organization");
-            ValidationSupport.checkReferenceType(owner, "owner", "Organization");
-            ValidationSupport.checkReferenceType(partOf, "partOf", "Account");
+            ValidationSupport.checkReferenceType(account.subject, "subject", "Patient", "Device", "Practitioner", "PractitionerRole", "Location", "HealthcareService", "Organization");
+            ValidationSupport.checkReferenceType(account.owner, "owner", "Organization");
+            ValidationSupport.checkReferenceType(account.partOf, "partOf", "Account");
         }
 
         protected Builder from(Account account) {
@@ -1151,7 +1151,7 @@ public Coverage build() {
             protected void validate(Coverage coverage) {
                 super.validate(coverage);
                 ValidationSupport.requireNonNull(coverage.coverage, "coverage");
-                ValidationSupport.checkReferenceType(coverage, "coverage", "Coverage");
+                ValidationSupport.checkReferenceType(coverage.coverage, "coverage", "Coverage");
                 ValidationSupport.requireValueOrChildren(coverage);
             }
 
@@ -1467,7 +1467,7 @@ public Guarantor build() {
             protected void validate(Guarantor guarantor) {
                 super.validate(guarantor);
                 ValidationSupport.requireNonNull(guarantor.party, "party");
-                ValidationSupport.checkReferenceType(party, "party", "Patient", "RelatedPerson", "Organization");
+                ValidationSupport.checkReferenceType(guarantor.party, "party", "Patient", "RelatedPerson", "Organization");
                 ValidationSupport.requireValueOrChildren(guarantor);
             }
 

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/ActivityDefinition.java
@@ -2424,12 +2424,12 @@ protected void validate(ActivityDefinition activityDefinition) {
             ValidationSupport.checkList(activityDefinition.observationRequirement, "observationRequirement", Reference.class);
             ValidationSupport.checkList(activityDefinition.observationResultRequirement, "observationResultRequirement", Reference.class);
             ValidationSupport.checkList(activityDefinition.dynamicValue, "dynamicValue", DynamicValue.class);
-            ValidationSupport.checkReferenceType(subject, "subject", "Group");
-            ValidationSupport.checkReferenceType(location, "location", "Location");
-            ValidationSupport.checkReferenceType(product, "product", "Medication", "Substance");
-            ValidationSupport.checkReferenceType(specimenRequirement, "specimenRequirement", "SpecimenDefinition");
-            ValidationSupport.checkReferenceType(observationRequirement, "observationRequirement", "ObservationDefinition");
-            ValidationSupport.checkReferenceType(observationResultRequirement, "observationResultRequirement", "ObservationDefinition");
+            ValidationSupport.checkReferenceType(activityDefinition.subject, "subject", "Group");
+            ValidationSupport.checkReferenceType(activityDefinition.location, "location", "Location");
+            ValidationSupport.checkReferenceType(activityDefinition.product, "product", "Medication", "Substance");
+            ValidationSupport.checkReferenceType(activityDefinition.specimenRequirement, "specimenRequirement", "SpecimenDefinition");
+            ValidationSupport.checkReferenceType(activityDefinition.observationRequirement, "observationRequirement", "ObservationDefinition");
+            ValidationSupport.checkReferenceType(activityDefinition.observationResultRequirement, "observationResultRequirement", "ObservationDefinition");
         }
 
         protected Builder from(ActivityDefinition activityDefinition) {

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AdverseEvent.java
@@ -1319,17 +1319,17 @@ protected void validate(AdverseEvent adverseEvent) {
             ValidationSupport.checkList(adverseEvent.subjectMedicalHistory, "subjectMedicalHistory", Reference.class);
             ValidationSupport.checkList(adverseEvent.referenceDocument, "referenceDocument", Reference.class);
             ValidationSupport.checkList(adverseEvent.study, "study", Reference.class);
-            ValidationSupport.checkValueSetBinding(severity, "severity", "http://hl7.org/fhir/ValueSet/adverse-event-severity", "http://terminology.hl7.org/CodeSystem/adverse-event-severity", "mild", "moderate", "severe");
-            ValidationSupport.checkValueSetBinding(outcome, "outcome", "http://hl7.org/fhir/ValueSet/adverse-event-outcome", "http://terminology.hl7.org/CodeSystem/adverse-event-outcome", "resolved", "recovering", "ongoing", "resolvedWithSequelae", "fatal", "unknown");
-            ValidationSupport.checkReferenceType(subject, "subject", "Patient", "Group", "Practitioner", "RelatedPerson");
-            ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
-            ValidationSupport.checkReferenceType(resultingCondition, "resultingCondition", "Condition");
-            ValidationSupport.checkReferenceType(location, "location", "Location");
-            ValidationSupport.checkReferenceType(recorder, "recorder", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson");
-            ValidationSupport.checkReferenceType(contributor, "contributor", "Practitioner", "PractitionerRole", "Device");
-            ValidationSupport.checkReferenceType(subjectMedicalHistory, "subjectMedicalHistory", "Condition", "Observation", "AllergyIntolerance", "FamilyMemberHistory", "Immunization", "Procedure", "Media", "DocumentReference");
-            ValidationSupport.checkReferenceType(referenceDocument, "referenceDocument", "DocumentReference");
-            ValidationSupport.checkReferenceType(study, "study", "ResearchStudy");
+            ValidationSupport.checkValueSetBinding(adverseEvent.severity, "severity", "http://hl7.org/fhir/ValueSet/adverse-event-severity", "http://terminology.hl7.org/CodeSystem/adverse-event-severity", "mild", "moderate", "severe");
+            ValidationSupport.checkValueSetBinding(adverseEvent.outcome, "outcome", "http://hl7.org/fhir/ValueSet/adverse-event-outcome", "http://terminology.hl7.org/CodeSystem/adverse-event-outcome", "resolved", "recovering", "ongoing", "resolvedWithSequelae", "fatal", "unknown");
+            ValidationSupport.checkReferenceType(adverseEvent.subject, "subject", "Patient", "Group", "Practitioner", "RelatedPerson");
+            ValidationSupport.checkReferenceType(adverseEvent.encounter, "encounter", "Encounter");
+            ValidationSupport.checkReferenceType(adverseEvent.resultingCondition, "resultingCondition", "Condition");
+            ValidationSupport.checkReferenceType(adverseEvent.location, "location", "Location");
+            ValidationSupport.checkReferenceType(adverseEvent.recorder, "recorder", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson");
+            ValidationSupport.checkReferenceType(adverseEvent.contributor, "contributor", "Practitioner", "PractitionerRole", "Device");
+            ValidationSupport.checkReferenceType(adverseEvent.subjectMedicalHistory, "subjectMedicalHistory", "Condition", "Observation", "AllergyIntolerance", "FamilyMemberHistory", "Immunization", "Procedure", "Media", "DocumentReference");
+            ValidationSupport.checkReferenceType(adverseEvent.referenceDocument, "referenceDocument", "DocumentReference");
+            ValidationSupport.checkReferenceType(adverseEvent.study, "study", "ResearchStudy");
         }
 
         protected Builder from(AdverseEvent adverseEvent) {
@@ -1659,7 +1659,7 @@ protected void validate(SuspectEntity suspectEntity) {
                 super.validate(suspectEntity);
                 ValidationSupport.requireNonNull(suspectEntity.instance, "instance");
                 ValidationSupport.checkList(suspectEntity.causality, "causality", Causality.class);
-                ValidationSupport.checkReferenceType(instance, "instance", "Immunization", "Procedure", "Substance", "Medication", "MedicationAdministration", "MedicationStatement", "Device");
+                ValidationSupport.checkReferenceType(suspectEntity.instance, "instance", "Immunization", "Procedure", "Substance", "Medication", "MedicationAdministration", "MedicationStatement", "Device");
                 ValidationSupport.requireValueOrChildren(suspectEntity);
             }
 
@@ -2011,7 +2011,7 @@ public Causality build() {
 
                 protected void validate(Causality causality) {
                     super.validate(causality);
-                    ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole");
+                    ValidationSupport.checkReferenceType(causality.author, "author", "Practitioner", "PractitionerRole");
                     ValidationSupport.requireValueOrChildren(causality);
                 }
 

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AllergyIntolerance.java
@@ -1071,12 +1071,12 @@ protected void validate(AllergyIntolerance allergyIntolerance) {
             ValidationSupport.choiceElement(allergyIntolerance.onset, "onset", DateTime.class, Age.class, Period.class, Range.class, String.class);
             ValidationSupport.checkList(allergyIntolerance.note, "note", Annotation.class);
             ValidationSupport.checkList(allergyIntolerance.reaction, "reaction", Reaction.class);
-            ValidationSupport.checkValueSetBinding(clinicalStatus, "clinicalStatus", "http://hl7.org/fhir/ValueSet/allergyintolerance-clinical", "http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical", "active", "inactive", "resolved");
-            ValidationSupport.checkValueSetBinding(verificationStatus, "verificationStatus", "http://hl7.org/fhir/ValueSet/allergyintolerance-verification", "http://terminology.hl7.org/CodeSystem/allergyintolerance-verification", "unconfirmed", "confirmed", "refuted", "entered-in-error");
-            ValidationSupport.checkReferenceType(patient, "patient", "Patient");
-            ValidationSupport.checkReferenceType(encounter, "encounter", "Encounter");
-            ValidationSupport.checkReferenceType(recorder, "recorder", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson");
-            ValidationSupport.checkReferenceType(asserter, "asserter", "Patient", "RelatedPerson", "Practitioner", "PractitionerRole");
+            ValidationSupport.checkValueSetBinding(allergyIntolerance.clinicalStatus, "clinicalStatus", "http://hl7.org/fhir/ValueSet/allergyintolerance-clinical", "http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical", "active", "inactive", "resolved");
+            ValidationSupport.checkValueSetBinding(allergyIntolerance.verificationStatus, "verificationStatus", "http://hl7.org/fhir/ValueSet/allergyintolerance-verification", "http://terminology.hl7.org/CodeSystem/allergyintolerance-verification", "unconfirmed", "confirmed", "refuted", "entered-in-error");
+            ValidationSupport.checkReferenceType(allergyIntolerance.patient, "patient", "Patient");
+            ValidationSupport.checkReferenceType(allergyIntolerance.encounter, "encounter", "Encounter");
+            ValidationSupport.checkReferenceType(allergyIntolerance.recorder, "recorder", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson");
+            ValidationSupport.checkReferenceType(allergyIntolerance.asserter, "asserter", "Patient", "RelatedPerson", "Practitioner", "PractitionerRole");
         }
 
         protected Builder from(AllergyIntolerance allergyIntolerance) {

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Appointment.java
@@ -1472,9 +1472,9 @@ protected void validate(Appointment appointment) {
             ValidationSupport.checkList(appointment.basedOn, "basedOn", Reference.class);
             ValidationSupport.checkNonEmptyList(appointment.participant, "participant", Participant.class);
             ValidationSupport.checkList(appointment.requestedPeriod, "requestedPeriod", Period.class);
-            ValidationSupport.checkReferenceType(reasonReference, "reasonReference", "Condition", "Procedure", "Observation", "ImmunizationRecommendation");
-            ValidationSupport.checkReferenceType(slot, "slot", "Slot");
-            ValidationSupport.checkReferenceType(basedOn, "basedOn", "ServiceRequest");
+            ValidationSupport.checkReferenceType(appointment.reasonReference, "reasonReference", "Condition", "Procedure", "Observation", "ImmunizationRecommendation");
+            ValidationSupport.checkReferenceType(appointment.slot, "slot", "Slot");
+            ValidationSupport.checkReferenceType(appointment.basedOn, "basedOn", "ServiceRequest");
         }
 
         protected Builder from(Appointment appointment) {
@@ -1919,7 +1919,7 @@ protected void validate(Participant participant) {
                 super.validate(participant);
                 ValidationSupport.checkList(participant.type, "type", CodeableConcept.class);
                 ValidationSupport.requireNonNull(participant.status, "status");
-                ValidationSupport.checkReferenceType(actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
+                ValidationSupport.checkReferenceType(participant.actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
                 ValidationSupport.requireValueOrChildren(participant);
             }
 

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AppointmentResponse.java
@@ -709,8 +709,8 @@ protected void validate(AppointmentResponse appointmentResponse) {
             ValidationSupport.requireNonNull(appointmentResponse.appointment, "appointment");
             ValidationSupport.checkList(appointmentResponse.participantType, "participantType", CodeableConcept.class);
             ValidationSupport.requireNonNull(appointmentResponse.participantStatus, "participantStatus");
-            ValidationSupport.checkReferenceType(appointment, "appointment", "Appointment");
-            ValidationSupport.checkReferenceType(actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
+            ValidationSupport.checkReferenceType(appointmentResponse.appointment, "appointment", "Appointment");
+            ValidationSupport.checkReferenceType(appointmentResponse.actor, "actor", "Patient", "Practitioner", "PractitionerRole", "RelatedPerson", "Device", "HealthcareService", "Location");
         }
 
         protected Builder from(AppointmentResponse appointmentResponse) {

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/AuditEvent.java
@@ -1618,8 +1618,8 @@ protected void validate(Agent agent) {
                 ValidationSupport.requireNonNull(agent.requestor, "requestor");
                 ValidationSupport.checkList(agent.policy, "policy", Uri.class);
                 ValidationSupport.checkList(agent.purposeOfUse, "purposeOfUse", CodeableConcept.class);
-                ValidationSupport.checkReferenceType(who, "who", "PractitionerRole", "Practitioner", "Organization", "Device", "Patient", "RelatedPerson");
-                ValidationSupport.checkReferenceType(location, "location", "Location");
+                ValidationSupport.checkReferenceType(agent.who, "who", "PractitionerRole", "Practitioner", "Organization", "Device", "Patient", "RelatedPerson");
+                ValidationSupport.checkReferenceType(agent.location, "location", "Location");
                 ValidationSupport.requireValueOrChildren(agent);
             }
 
@@ -2250,7 +2250,7 @@ protected void validate(Source source) {
                 super.validate(source);
                 ValidationSupport.requireNonNull(source.observer, "observer");
                 ValidationSupport.checkList(source.type, "type", Coding.class);
-                ValidationSupport.checkReferenceType(observer, "observer", "PractitionerRole", "Practitioner", "Organization", "Device", "Patient", "RelatedPerson");
+                ValidationSupport.checkReferenceType(source.observer, "observer", "PractitionerRole", "Practitioner", "Organization", "Device", "Patient", "RelatedPerson");
                 ValidationSupport.requireValueOrChildren(source);
             }
 

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/Basic.java
@@ -550,7 +550,7 @@ protected void validate(Basic basic) {
             super.validate(basic);
             ValidationSupport.checkList(basic.identifier, "identifier", Identifier.class);
             ValidationSupport.requireNonNull(basic.code, "code");
-            ValidationSupport.checkReferenceType(author, "author", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson", "Organization");
+            ValidationSupport.checkReferenceType(basic.author, "author", "Practitioner", "PractitionerRole", "Patient", "RelatedPerson", "Organization");
         }
 
         protected Builder from(Basic basic) {

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BiologicallyDerivedProduct.java
@@ -849,8 +849,8 @@ protected void validate(BiologicallyDerivedProduct biologicallyDerivedProduct) {
             ValidationSupport.checkList(biologicallyDerivedProduct.parent, "parent", Reference.class);
             ValidationSupport.checkList(biologicallyDerivedProduct.processing, "processing", Processing.class);
             ValidationSupport.checkList(biologicallyDerivedProduct.storage, "storage", Storage.class);
-            ValidationSupport.checkReferenceType(request, "request", "ServiceRequest");
-            ValidationSupport.checkReferenceType(parent, "parent", "BiologicallyDerivedProduct");
+            ValidationSupport.checkReferenceType(biologicallyDerivedProduct.request, "request", "ServiceRequest");
+            ValidationSupport.checkReferenceType(biologicallyDerivedProduct.parent, "parent", "BiologicallyDerivedProduct");
         }
 
         protected Builder from(BiologicallyDerivedProduct biologicallyDerivedProduct) {
@@ -1180,8 +1180,8 @@ public Collection build() {
             protected void validate(Collection collection) {
                 super.validate(collection);
                 ValidationSupport.choiceElement(collection.collected, "collected", DateTime.class, Period.class);
-                ValidationSupport.checkReferenceType(collector, "collector", "Practitioner", "PractitionerRole");
-                ValidationSupport.checkReferenceType(source, "source", "Patient", "Organization");
+                ValidationSupport.checkReferenceType(collection.collector, "collector", "Practitioner", "PractitionerRole");
+                ValidationSupport.checkReferenceType(collection.source, "source", "Patient", "Organization");
                 ValidationSupport.requireValueOrChildren(collection);
             }
 
@@ -1533,7 +1533,7 @@ public Processing build() {
             protected void validate(Processing processing) {
                 super.validate(processing);
                 ValidationSupport.choiceElement(processing.time, "time", DateTime.class, Period.class);
-                ValidationSupport.checkReferenceType(additive, "additive", "Substance");
+                ValidationSupport.checkReferenceType(processing.additive, "additive", "Substance");
                 ValidationSupport.requireValueOrChildren(processing);
             }
 

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/BodyStructure.java
@@ -701,7 +701,7 @@ protected void validate(BodyStructure bodyStructure) {
             ValidationSupport.checkList(bodyStructure.locationQualifier, "locationQualifier", CodeableConcept.class);
             ValidationSupport.checkList(bodyStructure.image, "image", Attachment.class);
             ValidationSupport.requireNonNull(bodyStructure.patient, "patient");
-            ValidationSupport.checkReferenceType(patient, "patient", "Patient");
+            ValidationSupport.checkReferenceType(bodyStructure.patient, "patient", "Patient");
         }
 
         protected Builder from(BodyStructure bodyStructure) {

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java b/fhir-model/src/main/java/com/ibm/fhir/model/resource/CapabilityStatement.java
@@ -2298,7 +2298,7 @@ public Implementation build() {
             protected void validate(Implementation implementation) {
                 super.validate(implementation);
                 ValidationSupport.requireNonNull(implementation.description, "description");
-                ValidationSupport.checkReferenceType(custodian, "custodian", "Organization");
+                ValidationSupport.checkReferenceType(implementation.custodian, "custodian", "Organization");
                 ValidationSupport.requireValueOrChildren(implementation);
             }