From 8fd62a3614842d183b93748fe7dc75dd7c10b8f6 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Mon, 10 Feb 2020 10:31:56 -0500 Subject: [PATCH] conv30_50 updated --- .../conv30_50/ActivityDefinition30_50.java | 140 ++++----- .../conv30_50/AllergyIntolerance30_50.java | 25 +- .../conv30_50/Appointment30_50.java | 57 ++-- .../conv30_50/AppointmentResponse30_50.java | 25 +- .../convertors/conv30_50/AuditEvent30_50.java | 83 +++--- .../fhir/convertors/conv30_50/Basic30_50.java | 9 +- .../convertors/conv30_50/Binary30_50.java | 19 +- .../convertors/conv30_50/BodySite30_50.java | 20 +- .../convertors/conv30_50/Bundle30_50.java | 113 ++++---- .../conv30_50/CapabilityStatement30_50.java | 265 ++++++++--------- .../convertors/conv30_50/CarePlan30_50.java | 114 +++----- .../convertors/conv30_50/CareTeam30_50.java | 9 +- .../conv30_50/ClinicalImpression30_50.java | 33 ++- .../convertors/conv30_50/CodeSystem30_50.java | 229 +++++++-------- .../conv30_50/Communication30_50.java | 17 +- .../conv30_50/CompartmentDefinition30_50.java | 89 +++--- .../conv30_50/Composition30_50.java | 33 ++- .../convertors/conv30_50/ConceptMap30_50.java | 195 +++++++------ .../convertors/conv30_50/Condition30_50.java | 1 + .../convertors/conv30_50/Consent30_50.java | 1 + .../conv30_50/DataElement30_50.java | 47 +-- .../conv30_50/DetectedIssue30_50.java | 25 +- .../conv30_50/DeviceUseStatement30_50.java | 9 +- .../conv30_50/DiagnosticReport30_50.java | 25 +- .../conv30_50/DocumentReference30_50.java | 20 +- .../convertors/conv30_50/Encounter30_50.java | 1 + .../convertors/conv30_50/Endpoint30_50.java | 17 +- .../conv30_50/EpisodeOfCare30_50.java | 1 + .../conv30_50/ExpansionProfile30_50.java | 1 + .../conv30_50/FamilyMemberHistory30_50.java | 25 +- .../fhir/convertors/conv30_50/Flag30_50.java | 1 + .../fhir/convertors/conv30_50/Goal30_50.java | 17 +- .../conv30_50/GraphDefinition30_50.java | 153 +++++----- .../fhir/convertors/conv30_50/Group30_50.java | 49 ++-- .../conv30_50/HealthcareService30_50.java | 81 +++--- .../conv30_50/ImagingStudy30_50.java | 164 ++++------- .../conv30_50/Immunization30_50.java | 25 +- .../conv30_50/ImplementationGuide30_50.java | 123 ++++---- .../convertors/conv30_50/Library30_50.java | 105 +++---- .../convertors/conv30_50/Linkage30_50.java | 9 +- .../fhir/convertors/conv30_50/List30_50.java | 37 ++- .../convertors/conv30_50/Location30_50.java | 41 +-- .../convertors/conv30_50/Measure30_50.java | 185 ++++++------ .../fhir/convertors/conv30_50/Media30_50.java | 1 + .../convertors/conv30_50/Medication30_50.java | 25 +- .../MedicationAdministration30_50.java | 9 +- .../conv30_50/MedicationDispense30_50.java | 25 +- .../conv30_50/MedicationRequest30_50.java | 17 +- .../conv30_50/MedicationStatement30_50.java | 11 +- .../conv30_50/MessageDefinition30_50.java | 113 ++++---- .../conv30_50/MessageHeader30_50.java | 57 ++-- .../conv30_50/NamingSystem30_50.java | 73 ++--- .../conv30_50/Observation30_50.java | 17 +- .../conv30_50/OperationDefinition30_50.java | 150 +++++----- .../conv30_50/OperationOutcome30_50.java | 9 +- .../conv30_50/Organization30_50.java | 17 +- .../convertors/conv30_50/Parameters30_50.java | 9 +- .../convertors/conv30_50/Patient30_50.java | 25 +- .../conv30_50/PaymentNotice30_50.java | 9 +- .../convertors/conv30_50/Person30_50.java | 17 +- .../conv30_50/PlanDefinition30_50.java | 196 +++++++------ .../conv30_50/Practitioner30_50.java | 17 +- .../conv30_50/PractitionerRole30_50.java | 49 ++-- .../conv30_50/Questionnaire30_50.java | 169 +++++------ .../conv30_50/QuestionnaireResponse30_50.java | 33 ++- .../conv30_50/RelatedPerson30_50.java | 39 +-- .../conv30_50/RiskAssessment30_50.java | 25 +- .../convertors/conv30_50/Schedule30_50.java | 17 +- .../conv30_50/SearchParameter30_50.java | 105 +++---- .../convertors/conv30_50/Sequence30_50.java | 210 +++++++------- .../fhir/convertors/conv30_50/Slot30_50.java | 33 ++- .../convertors/conv30_50/Specimen30_50.java | 25 +- .../conv30_50/StructureDefinition30_50.java | 135 ++++----- .../conv30_50/StructureMap30_50.java | 273 +++++++++--------- .../convertors/conv30_50/Substance30_50.java | 17 +- .../conv30_50/SupplyDelivery30_50.java | 1 + .../convertors/conv30_50/TestReport30_50.java | 65 +++-- .../convertors/conv30_50/TestScript30_50.java | 241 ++++++++-------- .../convertors/conv30_50/ValueSet30_50.java | 257 +++++++++-------- .../hl7/fhir/convertors/parser/Parser.java | 2 +- 80 files changed, 2562 insertions(+), 2569 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java index 133852b8f..c057caec6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java @@ -4,6 +4,10 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.dstu3.model.ContactDetail; import org.hl7.fhir.dstu3.model.Contributor.ContributorType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.CodeType; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class ActivityDefinition30_50 { @@ -12,35 +16,35 @@ public class ActivityDefinition30_50 { return null; org.hl7.fhir.r5.model.ActivityDefinition tgt = new org.hl7.fhir.r5.model.ActivityDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -65,8 +69,8 @@ public class ActivityDefinition30_50 { if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasRelatedArtifact()) { for (org.hl7.fhir.dstu3.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(VersionConvertor_30_50.convertRelatedArtifact(t)); } @@ -107,35 +111,35 @@ public class ActivityDefinition30_50 { return null; org.hl7.fhir.dstu3.model.ActivityDefinition tgt = new org.hl7.fhir.dstu3.model.ActivityDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -174,8 +178,8 @@ public class ActivityDefinition30_50 { if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasRelatedArtifact()) { for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(VersionConvertor_30_50.convertRelatedArtifact(t)); } @@ -216,14 +220,14 @@ public class ActivityDefinition30_50 { return null; org.hl7.fhir.r5.model.ActivityDefinition.ActivityDefinitionDynamicValueComponent tgt = new org.hl7.fhir.r5.model.ActivityDefinition.ActivityDefinitionDynamicValueComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.getExpression().setDescription(src.getDescription()); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasLanguage()) - tgt.getExpression().setLanguage(src.getLanguage()); - if (src.hasExpression()) - tgt.getExpression().setExpression(src.getExpression()); + if (src.hasDescriptionElement()) + tgt.getExpression().setDescriptionElement((StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasLanguageElement()) + tgt.getExpression().setLanguageElement((CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); + if (src.hasExpressionElement()) + tgt.getExpression().setExpressionElement((StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); return tgt; } @@ -232,14 +236,14 @@ public class ActivityDefinition30_50 { return null; org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionDynamicValueComponent tgt = new org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionDynamicValueComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.getExpression().hasDescription()) - tgt.setDescription(src.getExpression().getDescription()); - if (src.getExpression().hasLanguage()) - tgt.setLanguage(src.getExpression().getLanguage()); - if (src.getExpression().hasExpression()) - tgt.setExpression(src.getExpression().getExpression()); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.getExpression().hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getDescriptionElement())); + if (src.getExpression().hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getLanguageElement())); + if (src.getExpression().hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getExpressionElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java index df3f25f0d..8973de9a1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class AllergyIntolerance30_50 { @@ -36,8 +37,8 @@ public class AllergyIntolerance30_50 { tgt.setRecorder(VersionConvertor_30_50.convertReference(src.getRecorder())); if (src.hasAsserter()) tgt.setAsserter(VersionConvertor_30_50.convertReference(src.getAsserter())); - if (src.hasLastOccurrence()) - tgt.setLastOccurrence(src.getLastOccurrence()); + if (src.hasLastOccurrenceElement()) + tgt.setLastOccurrenceElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getLastOccurrenceElement())); if (src.hasNote()) { for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(VersionConvertor_30_50.convertAnnotation(t)); } @@ -78,8 +79,8 @@ public class AllergyIntolerance30_50 { tgt.setRecorder(VersionConvertor_30_50.convertReference(src.getRecorder())); if (src.hasAsserter()) tgt.setAsserter(VersionConvertor_30_50.convertReference(src.getAsserter())); - if (src.hasLastOccurrence()) - tgt.setLastOccurrence(src.getLastOccurrence()); + if (src.hasLastOccurrenceElement()) + tgt.setLastOccurrenceElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getLastOccurrenceElement())); if (src.hasNote()) { for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(VersionConvertor_30_50.convertAnnotation(t)); } @@ -190,10 +191,10 @@ public class AllergyIntolerance30_50 { if (src.hasManifestation()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasOnset()) - tgt.setOnset(src.getOnset()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasOnsetElement()) + tgt.setOnsetElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getOnsetElement())); if (src.hasSeverity()) tgt.setSeverity(convertAllergyIntoleranceSeverity(src.getSeverity())); if (src.hasExposureRoute()) @@ -214,10 +215,10 @@ public class AllergyIntolerance30_50 { if (src.hasManifestation()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasOnset()) - tgt.setOnset(src.getOnset()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasOnsetElement()) + tgt.setOnsetElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getOnsetElement())); if (src.hasSeverity()) tgt.setSeverity(convertAllergyIntoleranceSeverity(src.getSeverity())); if (src.hasExposureRoute()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java index 5776877f8..eb775cb64 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class Appointment30_50 { @@ -30,26 +31,26 @@ public class Appointment30_50 { tgt.addReason(VersionConvertor_30_50.convertCodeableConcept(t.getConcept())); for (CodeableReference t : src.getReason()) if (t.hasReference()) tgt.addIndication(VersionConvertor_30_50.convertReference(t.getReference())); - if (src.hasPriority()) - tgt.setPriority(src.getPriority()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasPriorityElement()) + tgt.setPriorityElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getPriorityElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSupportingInformation()) { for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasMinutesDuration()) - tgt.setMinutesDuration(src.getMinutesDuration()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasMinutesDurationElement()) + tgt.setMinutesDurationElement((org.hl7.fhir.dstu3.model.PositiveIntType) VersionConvertor_30_50.convertType(src.getMinutesDurationElement())); if (src.hasSlot()) { for (org.hl7.fhir.r5.model.Reference t : src.getSlot()) tgt.addSlot(VersionConvertor_30_50.convertReference(t)); } - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getCreatedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasBasedOn()) { for (org.hl7.fhir.r5.model.Reference t : src.getBasedOn()) tgt.addIncomingReferral(VersionConvertor_30_50.convertReference(t)); } @@ -88,26 +89,26 @@ public class Appointment30_50 { if (src.hasIndication()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getIndication()) tgt.addReason(VersionConvertor_30_50.convertReferenceToCodableReference(t)); } - if (src.hasPriority()) - tgt.setPriority(src.getPriority()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasPriorityElement()) + tgt.setPriorityElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getPriorityElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSupportingInformation()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasMinutesDuration()) - tgt.setMinutesDuration(src.getMinutesDuration()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasMinutesDurationElement()) + tgt.setMinutesDurationElement((org.hl7.fhir.r5.model.PositiveIntType) VersionConvertor_30_50.convertType(src.getMinutesDurationElement())); if (src.hasSlot()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getSlot()) tgt.addSlot(VersionConvertor_30_50.convertReference(t)); } - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getCreatedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasIncomingReferral()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getIncomingReferral()) tgt.addBasedOn(VersionConvertor_30_50.convertReference(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AppointmentResponse30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AppointmentResponse30_50.java index 0e2c0baff..5d3a01ea9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AppointmentResponse30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AppointmentResponse30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class AppointmentResponse30_50 { @@ -15,10 +16,10 @@ public class AppointmentResponse30_50 { } if (src.hasAppointment()) tgt.setAppointment(VersionConvertor_30_50.convertReference(src.getAppointment())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); if (src.hasParticipantType()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getParticipantType()) tgt.addParticipantType(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -26,8 +27,8 @@ public class AppointmentResponse30_50 { tgt.setActor(VersionConvertor_30_50.convertReference(src.getActor())); if (src.hasParticipantStatus()) tgt.setParticipantStatus(convertParticipantStatus(src.getParticipantStatus())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -41,10 +42,10 @@ public class AppointmentResponse30_50 { } if (src.hasAppointment()) tgt.setAppointment(VersionConvertor_30_50.convertReference(src.getAppointment())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); if (src.hasParticipantType()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getParticipantType()) tgt.addParticipantType(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -52,8 +53,8 @@ public class AppointmentResponse30_50 { tgt.setActor(VersionConvertor_30_50.convertReference(src.getActor())); if (src.hasParticipantStatus()) tgt.setParticipantStatus(convertParticipantStatus(src.getParticipantStatus())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AuditEvent30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AuditEvent30_50.java index c5f454c86..1d27f2978 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AuditEvent30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AuditEvent30_50.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.Base64BinaryType; + +import java.util.Collections; public class AuditEvent30_50 { @@ -17,12 +20,12 @@ public class AuditEvent30_50 { } if (src.hasAction()) tgt.setAction(convertAuditEventAction(src.getAction())); - if (src.hasRecorded()) - tgt.setRecorded(src.getRecorded()); + if (src.hasRecordedElement()) + tgt.setRecordedElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getRecordedElement())); if (src.hasOutcome()) tgt.setOutcome(convertAuditEventOutcome(src.getOutcome())); - if (src.hasOutcomeDesc()) - tgt.setOutcomeDesc(src.getOutcomeDesc()); + if (src.hasOutcomeDescElement()) + tgt.setOutcomeDescElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getOutcomeDescElement())); if (src.hasPurposeOfEvent()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getPurposeOfEvent()) tgt.addPurposeOfEvent(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -49,12 +52,12 @@ public class AuditEvent30_50 { } if (src.hasAction()) tgt.setAction(convertAuditEventAction(src.getAction())); - if (src.hasRecorded()) - tgt.setRecorded(src.getRecorded()); + if (src.hasRecordedElement()) + tgt.setRecordedElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getRecordedElement())); if (src.hasOutcome()) tgt.setOutcome(convertAuditEventOutcome(src.getOutcome())); - if (src.hasOutcomeDesc()) - tgt.setOutcomeDesc(src.getOutcomeDesc()); + if (src.hasOutcomeDescElement()) + tgt.setOutcomeDescElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getOutcomeDescElement())); if (src.hasPurposeOfEvent()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getPurposeOfEvent()) tgt.addPurposeOfEvent(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -119,12 +122,12 @@ public class AuditEvent30_50 { tgt.setWho(VersionConvertor_30_50.convertReference(src.getReference())); if (src.hasUserId()) tgt.getWho().setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getUserId())); - if (src.hasAltId()) - tgt.setAltId(src.getAltId()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasRequestor()) - tgt.setRequestor(src.getRequestor()); + if (src.hasAltIdElement()) + tgt.setAltIdElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getAltIdElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasRequestorElement()) + tgt.setRequestorElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequestorElement())); if (src.hasLocation()) tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); if (src.hasPolicy()) { @@ -154,12 +157,12 @@ public class AuditEvent30_50 { if (src.getWho().hasReference() || src.getWho().hasDisplay() || src.getWho().hasExtension() || src.getWho().hasId()) tgt.setReference(VersionConvertor_30_50.convertReference(src.getWho())); } - if (src.hasAltId()) - tgt.setAltId(src.getAltId()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasRequestor()) - tgt.setRequestor(src.getRequestor()); + if (src.hasAltIdElement()) + tgt.setAltIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getAltIdElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasRequestorElement()) + tgt.setRequestorElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequestorElement())); if (src.hasLocation()) tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); if (src.hasPolicy()) { @@ -180,8 +183,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.dstu3.model.AuditEvent.AuditEventAgentNetworkComponent tgt = new org.hl7.fhir.dstu3.model.AuditEvent.AuditEventAgentNetworkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getAddressElement())); if (src.hasType()) tgt.setType(convertAuditEventAgentNetworkType(src.getType())); return tgt; @@ -192,8 +195,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.r5.model.AuditEvent.AuditEventAgentNetworkComponent tgt = new org.hl7.fhir.r5.model.AuditEvent.AuditEventAgentNetworkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getAddressElement())); if (src.hasType()) tgt.setType(convertAuditEventAgentNetworkType(src.getType())); return tgt; @@ -255,10 +258,10 @@ public class AuditEvent30_50 { if (src.hasSecurityLabel()) { for (org.hl7.fhir.dstu3.model.Coding t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCoding(t)); } - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasQuery()) - tgt.setQuery(src.getQuery()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasQueryElement()) + tgt.setQueryElement((Base64BinaryType) VersionConvertor_30_50.convertType(src.getQueryElement())); if (src.hasDetail()) { for (org.hl7.fhir.dstu3.model.AuditEvent.AuditEventEntityDetailComponent t : src.getDetail()) tgt.addDetail(convertAuditEventEntityDetailComponent(t)); } @@ -285,10 +288,10 @@ public class AuditEvent30_50 { if (src.hasSecurityLabel()) { for (org.hl7.fhir.r5.model.Coding t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCoding(t)); } - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasQuery()) - tgt.setQuery(src.getQuery()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasQueryElement()) + tgt.setQueryElement((org.hl7.fhir.dstu3.model.Base64BinaryType) VersionConvertor_30_50.convertType(src.getQueryElement())); if (src.hasDetail()) { for (org.hl7.fhir.r5.model.AuditEvent.AuditEventEntityDetailComponent t : src.getDetail()) tgt.addDetail(convertAuditEventEntityDetailComponent(t)); } @@ -300,8 +303,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.dstu3.model.AuditEvent.AuditEventEntityDetailComponent tgt = new org.hl7.fhir.dstu3.model.AuditEvent.AuditEventEntityDetailComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasValueStringType()) tgt.setValue(src.getValueStringType().getValue().getBytes()); else if (src.hasValueBase64BinaryType()) @@ -314,8 +317,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.r5.model.AuditEvent.AuditEventEntityDetailComponent tgt = new org.hl7.fhir.r5.model.AuditEvent.AuditEventEntityDetailComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasValue()) tgt.setValue(new org.hl7.fhir.r5.model.Base64BinaryType(src.getValue())); return tgt; @@ -360,8 +363,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.dstu3.model.AuditEvent.AuditEventSourceComponent tgt = new org.hl7.fhir.dstu3.model.AuditEvent.AuditEventSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSite()) - tgt.setSite(src.getSite()); + if (src.hasSiteElement()) + tgt.setSiteElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getSiteElement())); if (src.hasObserver()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getObserver().getIdentifier())); if (src.hasType()) { @@ -375,8 +378,8 @@ public class AuditEvent30_50 { return null; org.hl7.fhir.r5.model.AuditEvent.AuditEventSourceComponent tgt = new org.hl7.fhir.r5.model.AuditEvent.AuditEventSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSite()) - tgt.setSite(src.getSite()); + if (src.hasSiteElement()) + tgt.setSiteElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getSiteElement())); if (src.hasIdentifier()) tgt.getObserver().setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); if (src.hasType()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Basic30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Basic30_50.java index 3f2b8d56a..e42e25792 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Basic30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Basic30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Basic30_50 { @@ -17,8 +18,8 @@ public class Basic30_50 { tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getCreatedElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); return tgt; @@ -36,8 +37,8 @@ public class Basic30_50 { tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getCreatedElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Binary30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Binary30_50.java index 61d45446f..80fdc4c0e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Binary30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Binary30_50.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.Base64BinaryType; + +import java.util.Collections; public class Binary30_50 { @@ -10,12 +13,12 @@ public class Binary30_50 { return null; org.hl7.fhir.r5.model.Binary tgt = new org.hl7.fhir.r5.model.Binary(); VersionConvertor_30_50.copyResource(src, tgt); - if (src.hasContentType()) - tgt.setContentType(src.getContentType()); + if (src.hasContentTypeElement()) + tgt.setContentTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getContentTypeElement())); if (src.hasSecurityContext()) tgt.setSecurityContext(VersionConvertor_30_50.convertReference(src.getSecurityContext())); - if (src.hasContent()) - tgt.setData(src.getContent()); + if (src.hasContentElement()) + tgt.setDataElement((Base64BinaryType) VersionConvertor_30_50.convertType(src.getContentElement())); return tgt; } @@ -24,12 +27,12 @@ public class Binary30_50 { return null; org.hl7.fhir.dstu3.model.Binary tgt = new org.hl7.fhir.dstu3.model.Binary(); VersionConvertor_30_50.copyResource(src, tgt); - if (src.hasContentType()) - tgt.setContentType(src.getContentType()); + if (src.hasContentTypeElement()) + tgt.setContentTypeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getContentTypeElement())); if (src.hasSecurityContext()) tgt.setSecurityContext(VersionConvertor_30_50.convertReference(src.getSecurityContext())); - if (src.hasData()) - tgt.setContent(src.getData()); + if (src.hasDataElement()) + tgt.setContentElement((org.hl7.fhir.dstu3.model.Base64BinaryType) VersionConvertor_30_50.convertType(src.getDataElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/BodySite30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/BodySite30_50.java index 1ad48d84b..e89d570d0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/BodySite30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/BodySite30_50.java @@ -2,6 +2,10 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.BooleanType; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class BodySite30_50 { @@ -13,10 +17,10 @@ public class BodySite30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasActiveElement()) + tgt.setActiveElement((BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasImage()) { for (org.hl7.fhir.dstu3.model.Attachment t : src.getImage()) tgt.addImage(VersionConvertor_30_50.convertAttachment(t)); } @@ -33,10 +37,10 @@ public class BodySite30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasImage()) { for (org.hl7.fhir.r5.model.Attachment t : src.getImage()) tgt.addImage(VersionConvertor_30_50.convertAttachment(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Bundle30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Bundle30_50.java index a38d1bfbc..4398bd787 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Bundle30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Bundle30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Bundle30_50 { @@ -14,8 +15,8 @@ public class Bundle30_50 { tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); if (src.hasType()) tgt.setType(convertBundleType(src.getType())); - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -36,8 +37,8 @@ public class Bundle30_50 { tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); if (src.hasType()) tgt.setType(convertBundleType(src.getType())); - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.r5.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -57,8 +58,8 @@ public class Bundle30_50 { if (src.hasLink()) { for (org.hl7.fhir.r5.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } - if (src.hasFullUrl()) - tgt.setFullUrl(src.getFullUrl()); + if (src.hasFullUrlElement()) + tgt.setFullUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getFullUrlElement())); if (src.hasResource()) tgt.setResource(VersionConvertor_30_50.convertResource(src.getResource(), false)); if (src.hasSearch()) @@ -78,8 +79,8 @@ public class Bundle30_50 { if (src.hasLink()) { for (org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } - if (src.hasFullUrl()) - tgt.setFullUrl(src.getFullUrl()); + if (src.hasFullUrlElement()) + tgt.setFullUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getFullUrlElement())); if (src.hasResource()) tgt.setResource(VersionConvertor_30_50.convertResource(src.getResource(), false)); if (src.hasSearch()) @@ -98,16 +99,16 @@ public class Bundle30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMethod()) tgt.setMethod(convertHTTPVerb(src.getMethod())); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasIfNoneMatch()) - tgt.setIfNoneMatch(src.getIfNoneMatch()); - if (src.hasIfModifiedSince()) - tgt.setIfModifiedSince(src.getIfModifiedSince()); - if (src.hasIfMatch()) - tgt.setIfMatch(src.getIfMatch()); - if (src.hasIfNoneExist()) - tgt.setIfNoneExist(src.getIfNoneExist()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getIfNoneExistElement())); return tgt; } @@ -118,16 +119,16 @@ public class Bundle30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMethod()) tgt.setMethod(convertHTTPVerb(src.getMethod())); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasIfNoneMatch()) - tgt.setIfNoneMatch(src.getIfNoneMatch()); - if (src.hasIfModifiedSince()) - tgt.setIfModifiedSince(src.getIfModifiedSince()); - if (src.hasIfMatch()) - tgt.setIfMatch(src.getIfMatch()); - if (src.hasIfNoneExist()) - tgt.setIfNoneExist(src.getIfNoneExist()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getIfNoneExistElement())); return tgt; } @@ -136,14 +137,14 @@ public class Bundle30_50 { return null; org.hl7.fhir.r5.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.r5.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasStatus()) - tgt.setStatus(src.getStatus()); - if (src.hasLocation()) - tgt.setLocation(src.getLocation()); - if (src.hasEtag()) - tgt.setEtag(src.getEtag()); - if (src.hasLastModified()) - tgt.setLastModified(src.getLastModified()); + if (src.hasStatusElement()) + tgt.setStatusElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getLastModifiedElement())); if (src.hasOutcome()) tgt.setOutcome(VersionConvertor_30_50.convertResource(src.getOutcome(), false)); return tgt; @@ -154,14 +155,14 @@ public class Bundle30_50 { return null; org.hl7.fhir.dstu3.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.dstu3.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasStatus()) - tgt.setStatus(src.getStatus()); - if (src.hasLocation()) - tgt.setLocation(src.getLocation()); - if (src.hasEtag()) - tgt.setEtag(src.getEtag()); - if (src.hasLastModified()) - tgt.setLastModified(src.getLastModified()); + if (src.hasStatusElement()) + tgt.setStatusElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getLastModifiedElement())); if (src.hasOutcome()) tgt.setOutcome(VersionConvertor_30_50.convertResource(src.getOutcome(), false)); return tgt; @@ -174,8 +175,8 @@ public class Bundle30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertSearchEntryMode(src.getMode())); - if (src.hasScore()) - tgt.setScore(src.getScore()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getScoreElement())); return tgt; } @@ -186,8 +187,8 @@ public class Bundle30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertSearchEntryMode(src.getMode())); - if (src.hasScore()) - tgt.setScore(src.getScore()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getScoreElement())); return tgt; } @@ -196,10 +197,10 @@ public class Bundle30_50 { return null; org.hl7.fhir.r5.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.r5.model.Bundle.BundleLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasRelation()) - tgt.setRelation(src.getRelation()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasRelationElement()) + tgt.setRelationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } @@ -208,10 +209,10 @@ public class Bundle30_50 { return null; org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasRelation()) - tgt.setRelation(src.getRelation()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasRelationElement()) + tgt.setRelationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CapabilityStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CapabilityStatement30_50.java index 48b9d21f3..9761bf1f1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CapabilityStatement30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CapabilityStatement30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class CapabilityStatement30_50 { @@ -11,37 +12,37 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement tgt = new org.hl7.fhir.r5.model.CapabilityStatement(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasKind()) tgt.setKind(convertCapabilityStatementKind(src.getKind())); if (src.hasInstantiates()) { @@ -84,37 +85,37 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement(); VersionConvertor_30_50.copyDomainResource(src, tgt, "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown", "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.profile"); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasKind()) tgt.setKind(convertCapabilityStatementKind(src.getKind())); if (src.hasInstantiates()) { @@ -190,10 +191,10 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementImplementationComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementImplementationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } @@ -202,10 +203,10 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementImplementationComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementImplementationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } @@ -247,10 +248,10 @@ public class CapabilityStatement30_50 { if (src.hasEndpoint()) { for (org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertCapabilityStatementMessagingEndpointComponent(t)); } - if (src.hasReliableCache()) - tgt.setReliableCache(src.getReliableCache()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasReliableCacheElement()) + tgt.setReliableCacheElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getReliableCacheElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasSupportedMessage()) { for (org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementMessagingSupportedMessageComponent t : src.getSupportedMessage()) tgt.addSupportedMessage(convertCapabilityStatementMessagingSupportedMessageComponent(t)); } @@ -284,10 +285,10 @@ public class CapabilityStatement30_50 { if (src.hasEndpoint()) { for (org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertCapabilityStatementMessagingEndpointComponent(t)); } - if (src.hasReliableCache()) - tgt.setReliableCache(src.getReliableCache()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasReliableCacheElement()) + tgt.setReliableCacheElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getReliableCacheElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasSupportedMessage()) { for (org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementMessagingSupportedMessageComponent t : src.getSupportedMessage()) tgt.addSupportedMessage(convertCapabilityStatementMessagingSupportedMessageComponent(t)); } @@ -321,8 +322,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasProtocol()) tgt.setProtocol(VersionConvertor_30_50.convertCoding(src.getProtocol())); - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getAddressElement())); return tgt; } @@ -333,8 +334,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasProtocol()) tgt.setProtocol(VersionConvertor_30_50.convertCoding(src.getProtocol())); - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getAddressElement())); return tgt; } @@ -369,8 +370,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertRestfulCapabilityMode(src.getMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasSecurity()) tgt.setSecurity(convertCapabilityStatementRestSecurityComponent(src.getSecurity())); if (src.hasResource()) { @@ -398,8 +399,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertRestfulCapabilityMode(src.getMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasSecurity()) tgt.setSecurity(convertCapabilityStatementRestSecurityComponent(src.getSecurity())); if (src.hasResource()) { @@ -425,8 +426,8 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestOperationComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestOperationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasDefinition()) tgt.setDefinition(VersionConvertor_30_50.convertCanonicalToReference(src.getDefinitionElement())); return tgt; @@ -437,8 +438,8 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasDefinition()) tgt.setDefinitionElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getDefinition())); return tgt; @@ -449,27 +450,27 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestResourceComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestResourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCanonicalToReference(src.getProfileElement())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasInteraction()) { for (org.hl7.fhir.r5.model.CapabilityStatement.ResourceInteractionComponent t : src.getInteraction()) tgt.addInteraction(convertResourceInteractionComponent(t)); } if (src.hasVersioning()) tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); - if (src.hasReadHistory()) - tgt.setReadHistory(src.getReadHistory()); - if (src.hasUpdateCreate()) - tgt.setUpdateCreate(src.getUpdateCreate()); - if (src.hasConditionalCreate()) - tgt.setConditionalCreate(src.getConditionalCreate()); + if (src.hasReadHistoryElement()) + tgt.setReadHistoryElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getReadHistoryElement())); + if (src.hasUpdateCreateElement()) + tgt.setUpdateCreateElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getUpdateCreateElement())); + if (src.hasConditionalCreateElement()) + tgt.setConditionalCreateElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getConditionalCreateElement())); if (src.hasConditionalRead()) tgt.setConditionalRead(convertConditionalReadStatus(src.getConditionalRead())); - if (src.hasConditionalUpdate()) - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasConditionalUpdateElement()) + tgt.setConditionalUpdateElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getConditionalUpdateElement())); if (src.hasConditionalDelete()) tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); if (src.hasReferencePolicy()) { @@ -492,27 +493,27 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasProfile()) tgt.setProfileElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getProfile())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasInteraction()) { for (org.hl7.fhir.dstu3.model.CapabilityStatement.ResourceInteractionComponent t : src.getInteraction()) tgt.addInteraction(convertResourceInteractionComponent(t)); } if (src.hasVersioning()) tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); - if (src.hasReadHistory()) - tgt.setReadHistory(src.getReadHistory()); - if (src.hasUpdateCreate()) - tgt.setUpdateCreate(src.getUpdateCreate()); - if (src.hasConditionalCreate()) - tgt.setConditionalCreate(src.getConditionalCreate()); + if (src.hasReadHistoryElement()) + tgt.setReadHistoryElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getReadHistoryElement())); + if (src.hasUpdateCreateElement()) + tgt.setUpdateCreateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getUpdateCreateElement())); + if (src.hasConditionalCreateElement()) + tgt.setConditionalCreateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getConditionalCreateElement())); if (src.hasConditionalRead()) tgt.setConditionalRead(convertConditionalReadStatus(src.getConditionalRead())); - if (src.hasConditionalUpdate()) - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasConditionalUpdateElement()) + tgt.setConditionalUpdateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getConditionalUpdateElement())); if (src.hasConditionalDelete()) tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); if (src.hasReferencePolicy()) { @@ -535,14 +536,14 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertSearchParamType(src.getType())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -551,14 +552,14 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertSearchParamType(src.getType())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -567,13 +568,13 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestSecurityComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementRestSecurityComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCors()) - tgt.setCors(src.getCors()); + if (src.hasCorsElement()) + tgt.setCorsElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getCorsElement())); if (src.hasService()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getService()) tgt.addService(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -582,13 +583,13 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestSecurityComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestSecurityComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCors()) - tgt.setCors(src.getCors()); + if (src.hasCorsElement()) + tgt.setCorsElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getCorsElement())); if (src.hasService()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getService()) tgt.addService(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -597,12 +598,12 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementSoftwareComponent tgt = new org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementSoftwareComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasReleaseDate()) - tgt.setReleaseDate(src.getReleaseDate()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) + tgt.setReleaseDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReleaseDateElement())); return tgt; } @@ -611,12 +612,12 @@ public class CapabilityStatement30_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementSoftwareComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementSoftwareComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasReleaseDate()) - tgt.setReleaseDate(src.getReleaseDate()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) + tgt.setReleaseDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReleaseDateElement())); return tgt; } @@ -781,8 +782,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasCode()) tgt.setCode(convertTypeRestfulInteraction(src.getCode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -793,8 +794,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasCode()) tgt.setCode(convertTypeRestfulInteraction(src.getCode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -861,8 +862,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasCode()) tgt.setCode(convertSystemRestfulInteraction(src.getCode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -873,8 +874,8 @@ public class CapabilityStatement30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasCode()) tgt.setCode(convertSystemRestfulInteraction(src.getCode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java index c163a4130..ecb3561ca 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java @@ -2,8 +2,10 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.CodeableReference; import java.util.List; +import java.util.Collections; public class CarePlan30_50 { @@ -33,12 +35,10 @@ public class CarePlan30_50 { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCategory()) { tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSubject()) { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); } @@ -93,47 +93,29 @@ public class CarePlan30_50 { tgt.addPartOf(VersionConvertor_30_50.convertReference(t)); } if (src.hasStatus()) { - if (src.hasStatus()) { - tgt.setStatus(convertCarePlanStatus(src.getStatus())); - } + tgt.setStatus(convertCarePlanStatus(src.getStatus())); } if (src.hasIntent()) { - if (src.hasIntent()) { - tgt.setIntent(convertCarePlanIntent(src.getIntent())); - } + tgt.setIntent(convertCarePlanIntent(src.getIntent())); } for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) { tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasTitle()) { - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } - } - if (src.hasDescription()) { - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSubject()) { - if (src.hasSubject()) { - tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - } + tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); } if (src.hasEncounter()) { - if (src.hasEncounter()) { - tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); - } + tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); } if (src.hasPeriod()) { - if (src.hasPeriod()) { - tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); - } + tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); } if (src.hasAuthor()) { - if (src.hasAuthor()) { - tgt.addAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); - } + tgt.addAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); } for (org.hl7.fhir.r5.model.Reference t : src.getCareTeam()) { tgt.addCareTeam(VersionConvertor_30_50.convertReference(t)); @@ -174,14 +156,10 @@ public class CarePlan30_50 { tgt.addProgress(VersionConvertor_30_50.convertAnnotation(t)); } if (src.hasReference()) { - if (src.hasReference()) { - tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference())); - } + tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference())); } if (src.hasDetail()) { - if (src.hasDetail()) { - tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail())); - } + tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail())); } return tgt; } @@ -201,14 +179,10 @@ public class CarePlan30_50 { tgt.addProgress(VersionConvertor_30_50.convertAnnotation(t)); } if (src.hasReference()) { - if (src.hasReference()) { - tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference())); - } + tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference())); } if (src.hasDetail()) { - if (src.hasDetail()) { - tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail())); - } + tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail())); } return tgt; } @@ -271,9 +245,8 @@ public class CarePlan30_50 { if (src.hasQuantity()) { tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -291,9 +264,7 @@ public class CarePlan30_50 { tgt.addExtension(t); } if (src.hasCode()) { - if (src.hasCode()) { - tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - } + tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); } for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReasonCode()) { tgt.addReason(VersionConvertor_30_50.convertCodeableConceptToCodableReference(t)); @@ -305,56 +276,39 @@ public class CarePlan30_50 { tgt.addGoal(VersionConvertor_30_50.convertReference(t)); } if (src.hasStatus()) { - if (src.hasStatus()) { - tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); - } + tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); } if (src.hasStatusReason()) { org.hl7.fhir.r5.model.Coding code = new org.hl7.fhir.r5.model.Coding(); - if (src.hasStatusReason()) { - code.setCode(src.getStatusReason()); + if (src.hasStatusReasonElement()) { + code.setCodeElement((CodeType) VersionConvertor_30_50.convertType(src.getStatusReasonElement())); } org.hl7.fhir.r5.model.CodeableConcept t = new org.hl7.fhir.r5.model.CodeableConcept(code); tgt.setStatusReason(t); } if (src.hasProhibited()) { - if (src.hasProhibited()) { - tgt.setDoNotPerform(src.getProhibited()); - } + tgt.setDoNotPerform(src.getProhibited()); } if (src.hasScheduled()) { - if (src.hasScheduled()) { - tgt.setScheduled(VersionConvertor_30_50.convertType(src.getScheduled())); - } + tgt.setScheduled(VersionConvertor_30_50.convertType(src.getScheduled())); } if (src.hasLocation()) { - if (src.hasLocation()) { - tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); - } + tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); } for (org.hl7.fhir.dstu3.model.Reference t : src.getPerformer()) { tgt.addPerformer(VersionConvertor_30_50.convertReference(t)); } if (src.hasProduct()) { - if (src.hasProduct()) { - tgt.setProduct(VersionConvertor_30_50.convertType(src.getProduct())); - } + tgt.setProduct(VersionConvertor_30_50.convertType(src.getProduct())); } if (src.hasDailyAmount()) { - if (src.hasDailyAmount()) { - tgt.setDailyAmount(VersionConvertor_30_50.convertSimpleQuantity(src.getDailyAmount())); - } + tgt.setDailyAmount(VersionConvertor_30_50.convertSimpleQuantity(src.getDailyAmount())); } if (src.hasQuantity()) { - if (src.hasQuantity()) { - tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); - } - } - if (src.hasDescription()) { - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CareTeam30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CareTeam30_50.java index 501d6c5b2..d7a9587d6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CareTeam30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CareTeam30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class CareTeam30_50 { @@ -19,8 +20,8 @@ public class CareTeam30_50 { if (src.hasCategory()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasPeriod()) @@ -56,8 +57,8 @@ public class CareTeam30_50 { if (src.hasCategory()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasPeriod()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ClinicalImpression30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ClinicalImpression30_50.java index e0cfff415..eab1f0ba9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ClinicalImpression30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ClinicalImpression30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class ClinicalImpression30_50 { @@ -15,16 +16,16 @@ public class ClinicalImpression30_50 { } if (src.hasStatus()) tgt.setStatus(convertClinicalImpressionStatus(src.getStatus())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasPerformer()) tgt.setAssessor(VersionConvertor_30_50.convertReference(src.getPerformer())); if (src.hasPrevious()) @@ -35,8 +36,8 @@ public class ClinicalImpression30_50 { if (src.hasProtocol()) { for (org.hl7.fhir.r5.model.UriType t : src.getProtocol()) tgt.addProtocol(t.getValue()); } - if (src.hasSummary()) - tgt.setSummary(src.getSummary()); + if (src.hasSummaryElement()) + tgt.setSummaryElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getSummaryElement())); if (src.hasFinding()) { for (org.hl7.fhir.r5.model.ClinicalImpression.ClinicalImpressionFindingComponent t : src.getFinding()) tgt.addFinding(convertClinicalImpressionFindingComponent(t)); } @@ -62,16 +63,16 @@ public class ClinicalImpression30_50 { } if (src.hasStatus()) tgt.setStatus(convertClinicalImpressionStatus(src.getStatus())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasContext()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getContext())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAssessor()) tgt.setPerformer(VersionConvertor_30_50.convertReference(src.getAssessor())); if (src.hasPrevious()) @@ -82,8 +83,8 @@ public class ClinicalImpression30_50 { if (src.hasProtocol()) { for (org.hl7.fhir.dstu3.model.UriType t : src.getProtocol()) tgt.addProtocol(t.getValue()); } - if (src.hasSummary()) - tgt.setSummary(src.getSummary()); + if (src.hasSummaryElement()) + tgt.setSummaryElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getSummaryElement())); if (src.hasFinding()) { for (org.hl7.fhir.dstu3.model.ClinicalImpression.ClinicalImpressionFindingComponent t : src.getFinding()) tgt.addFinding(convertClinicalImpressionFindingComponent(t)); } @@ -108,8 +109,8 @@ public class ClinicalImpression30_50 { tgt.setItem(VersionConvertor_30_50.convertType(src.getItem().getConcept())); else if (src.hasItem() && src.getItem().hasReference()) tgt.setItem(VersionConvertor_30_50.convertType(src.getItem().getReference())); - if (src.hasBasis()) - tgt.setBasis(src.getBasis()); + if (src.hasBasisElement()) + tgt.setBasisElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getBasisElement())); return tgt; } @@ -122,8 +123,8 @@ public class ClinicalImpression30_50 { tgt.setItem(VersionConvertor_30_50.convertCodeableConceptToCodableReference(src.getItemCodeableConcept())); if (src.hasItemReference()) tgt.setItem(VersionConvertor_30_50.convertReferenceToCodableReference(src.getItemReference())); - if (src.hasBasis()) - tgt.setBasis(src.getBasis()); + if (src.hasBasisElement()) + tgt.setBasisElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getBasisElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CodeSystem30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CodeSystem30_50.java index 6b77acc33..b45479e6d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CodeSystem30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CodeSystem30_50.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class CodeSystem30_50 { @@ -10,53 +13,53 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem tgt = new org.hl7.fhir.dstu3.model.CodeSystem(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifierFirstRep())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasCaseSensitive()) - tgt.setCaseSensitive(src.getCaseSensitive()); - if (src.hasValueSet()) - tgt.setValueSet(src.getValueSet()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasCaseSensitiveElement()) + tgt.setCaseSensitiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getCaseSensitiveElement())); + if (src.hasValueSetElement()) + tgt.setValueSetElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getValueSetElement())); if (src.hasHierarchyMeaning()) tgt.setHierarchyMeaning(convertCodeSystemHierarchyMeaning(src.getHierarchyMeaning())); - if (src.hasCompositional()) - tgt.setCompositional(src.getCompositional()); - if (src.hasVersionNeeded()) - tgt.setVersionNeeded(src.getVersionNeeded()); + if (src.hasCompositionalElement()) + tgt.setCompositionalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getCompositionalElement())); + if (src.hasVersionNeededElement()) + tgt.setVersionNeededElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getVersionNeededElement())); if (src.hasContent()) tgt.setContent(convertCodeSystemContentMode(src.getContent())); - if (src.hasCount()) - tgt.setCount(src.getCount()); + if (src.hasCountElement()) + tgt.setCountElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getCountElement())); if (src.hasFilter()) { for (org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent t : src.getFilter()) tgt.addFilter(convertCodeSystemFilterComponent(t)); } @@ -74,53 +77,53 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem tgt = new org.hl7.fhir.r5.model.CodeSystem(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasCaseSensitive()) - tgt.setCaseSensitive(src.getCaseSensitive()); - if (src.hasValueSet()) - tgt.setValueSet(src.getValueSet()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasCaseSensitiveElement()) + tgt.setCaseSensitiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getCaseSensitiveElement())); + if (src.hasValueSetElement()) + tgt.setValueSetElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getValueSetElement())); if (src.hasHierarchyMeaning()) tgt.setHierarchyMeaning(convertCodeSystemHierarchyMeaning(src.getHierarchyMeaning())); - if (src.hasCompositional()) - tgt.setCompositional(src.getCompositional()); - if (src.hasVersionNeeded()) - tgt.setVersionNeeded(src.getVersionNeeded()); + if (src.hasCompositionalElement()) + tgt.setCompositionalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getCompositionalElement())); + if (src.hasVersionNeededElement()) + tgt.setVersionNeededElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getVersionNeededElement())); if (src.hasContent()) tgt.setContent(convertCodeSystemContentMode(src.getContent())); - if (src.hasCount()) - tgt.setCount(src.getCount()); + if (src.hasCountElement()) + tgt.setCountElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getCountElement())); if (src.hasFilter()) { for (org.hl7.fhir.dstu3.model.CodeSystem.CodeSystemFilterComponent t : src.getFilter()) tgt.addFilter(convertCodeSystemFilterComponent(t)); } @@ -172,15 +175,14 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasOperator()) { - for (org.hl7.fhir.dstu3.model.Enumeration t : src.getOperator()) VersionConvertor_30_50.copyElement(t, tgt.addOperatorElement().setValue(VersionConvertor_30_50.convertFilterOperator(t.getValue()))); - } - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); + if (src.hasValueElement()) + tgt.setValueElement((StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -189,15 +191,14 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem.CodeSystemFilterComponent tgt = new org.hl7.fhir.dstu3.model.CodeSystem.CodeSystemFilterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasOperator()) { - for (org.hl7.fhir.r5.model.Enumeration t : src.getOperator()) VersionConvertor_30_50.copyElement(t, tgt.addOperatorElement().setValue(VersionConvertor_30_50.convertFilterOperator(t.getValue()))); - } - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -240,12 +241,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionComponent tgt = new org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptDefinitionDesignationComponent(t)); } @@ -263,12 +264,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptDefinitionDesignationComponent(t)); } @@ -286,12 +287,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionDesignationComponent tgt = new org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionDesignationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); if (src.hasUse()) tgt.setUse(VersionConvertor_30_50.convertCoding(src.getUse())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -300,12 +301,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); if (src.hasUse()) tgt.setUse(VersionConvertor_30_50.convertCoding(src.getUse())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -314,8 +315,8 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptPropertyComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptPropertyComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); return tgt; @@ -326,8 +327,8 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem.ConceptPropertyComponent tgt = new org.hl7.fhir.dstu3.model.CodeSystem.ConceptPropertyComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); return tgt; @@ -338,12 +339,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.r5.model.CodeSystem.PropertyComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.PropertyComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasType()) tgt.setType(convertPropertyType(src.getType())); return tgt; @@ -354,12 +355,12 @@ public class CodeSystem30_50 { return null; org.hl7.fhir.dstu3.model.CodeSystem.PropertyComponent tgt = new org.hl7.fhir.dstu3.model.CodeSystem.PropertyComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasType()) tgt.setType(convertPropertyType(src.getType())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Communication30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Communication30_50.java index 5020b2556..0d2b81652 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Communication30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Communication30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class Communication30_50 { @@ -43,10 +44,10 @@ public class Communication30_50 { } if (src.hasEncounter()) tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasSent()) - tgt.setSent(src.getSent()); - if (src.hasReceived()) - tgt.setReceived(src.getReceived()); + if (src.hasSentElement()) + tgt.setSentElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getSentElement())); + if (src.hasReceivedElement()) + tgt.setReceivedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReceivedElement())); if (src.hasSender()) tgt.setSender(VersionConvertor_30_50.convertReference(src.getSender())); for (CodeableReference t : src.getReason()) if (t.hasConcept()) @@ -98,10 +99,10 @@ public class Communication30_50 { } if (src.hasContext()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getContext())); - if (src.hasSent()) - tgt.setSent(src.getSent()); - if (src.hasReceived()) - tgt.setReceived(src.getReceived()); + if (src.hasSentElement()) + tgt.setSentElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getSentElement())); + if (src.hasReceivedElement()) + tgt.setReceivedElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReceivedElement())); if (src.hasSender()) tgt.setSender(VersionConvertor_30_50.convertReference(src.getSender())); if (src.hasReasonCode()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CompartmentDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CompartmentDefinition30_50.java index c6b9d9d7b..21816e694 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CompartmentDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CompartmentDefinition30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class CompartmentDefinition30_50 { @@ -10,27 +11,27 @@ public class CompartmentDefinition30_50 { return null; org.hl7.fhir.r5.model.CompartmentDefinition tgt = new org.hl7.fhir.r5.model.CompartmentDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } @@ -39,8 +40,8 @@ public class CompartmentDefinition30_50 { } if (src.hasCode()) tgt.setCode(convertCompartmentType(src.getCode())); - if (src.hasSearch()) - tgt.setSearch(src.getSearch()); + if (src.hasSearchElement()) + tgt.setSearchElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getSearchElement())); if (src.hasResource()) { for (org.hl7.fhir.dstu3.model.CompartmentDefinition.CompartmentDefinitionResourceComponent t : src.getResource()) tgt.addResource(convertCompartmentDefinitionResourceComponent(t)); } @@ -52,27 +53,27 @@ public class CompartmentDefinition30_50 { return null; org.hl7.fhir.dstu3.model.CompartmentDefinition tgt = new org.hl7.fhir.dstu3.model.CompartmentDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } @@ -81,8 +82,8 @@ public class CompartmentDefinition30_50 { } if (src.hasCode()) tgt.setCode(convertCompartmentType(src.getCode())); - if (src.hasSearch()) - tgt.setSearch(src.getSearch()); + if (src.hasSearchElement()) + tgt.setSearchElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getSearchElement())); if (src.hasResource()) { for (org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent t : src.getResource()) tgt.addResource(convertCompartmentDefinitionResourceComponent(t)); } @@ -94,13 +95,13 @@ public class CompartmentDefinition30_50 { return null; org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent tgt = new org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasParam()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getParam()) tgt.addParam(t.getValue()); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -109,13 +110,13 @@ public class CompartmentDefinition30_50 { return null; org.hl7.fhir.dstu3.model.CompartmentDefinition.CompartmentDefinitionResourceComponent tgt = new org.hl7.fhir.dstu3.model.CompartmentDefinition.CompartmentDefinitionResourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasParam()) { for (org.hl7.fhir.r5.model.StringType t : src.getParam()) tgt.addParam(t.getValue()); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java index 2f9549d8d..792eae7b8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Composition30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Composition30_50 { @@ -22,13 +23,13 @@ public class Composition30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAuthor()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getAuthor()) tgt.addAuthor(VersionConvertor_30_50.convertReference(t)); } - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasConfidentiality()) tgt.setConfidentiality(convertDocumentConfidentiality(src.getConfidentiality())); if (src.hasAttester()) { @@ -65,13 +66,13 @@ public class Composition30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAuthor()) { for (org.hl7.fhir.r5.model.Reference t : src.getAuthor()) tgt.addAuthor(VersionConvertor_30_50.convertReference(t)); } - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasConfidentiality()) tgt.setConfidentiality(convertDocumentConfidentiality(src.getConfidentiality())); if (src.hasAttester()) { @@ -132,8 +133,8 @@ public class Composition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertCompositionAttestationMode(src.getMode().get(0).getValue())); - if (src.hasTime()) - tgt.setTime(src.getTime()); + if (src.hasTimeElement()) + tgt.setTimeElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getTimeElement())); if (src.hasParty()) tgt.setParty(VersionConvertor_30_50.convertReference(src.getParty())); return tgt; @@ -146,8 +147,8 @@ public class Composition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.addMode(convertCompositionAttestationMode(src.getMode())); - if (src.hasTime()) - tgt.setTime(src.getTime()); + if (src.hasTimeElement()) + tgt.setTimeElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getTimeElement())); if (src.hasParty()) tgt.setParty(VersionConvertor_30_50.convertReference(src.getParty())); return tgt; @@ -290,8 +291,8 @@ public class Composition30_50 { return null; org.hl7.fhir.dstu3.model.Composition.SectionComponent tgt = new org.hl7.fhir.dstu3.model.Composition.SectionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasText()) @@ -316,8 +317,8 @@ public class Composition30_50 { return null; org.hl7.fhir.r5.model.Composition.SectionComponent tgt = new org.hl7.fhir.r5.model.Composition.SectionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasText()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java index a1d2b2b62..0ab9161fe 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class ConceptMap30_50 { @@ -10,39 +13,39 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.dstu3.model.ConceptMap tgt = new org.hl7.fhir.dstu3.model.ConceptMap(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifierFirstRep())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasSource()) tgt.setSource(VersionConvertor_30_50.convertType(src.getSource())); if (src.hasTarget()) @@ -58,33 +61,33 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.r5.model.ConceptMap tgt = new org.hl7.fhir.r5.model.ConceptMap(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasSource()) { org.hl7.fhir.r5.model.DataType t = VersionConvertor_30_50.convertType(src.getSource()); tgt.setSource(t instanceof org.hl7.fhir.r5.model.Reference ? new org.hl7.fhir.r5.model.CanonicalType(((org.hl7.fhir.r5.model.Reference) t).getReference()) : t); @@ -121,10 +124,10 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSource()) - tgt.setSource(src.getSource()); - if (src.hasSourceVersion()) - tgt.setSourceVersion(src.getSourceVersion()); + if (src.hasSourceElement()) + tgt.setSourceElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getSourceElement())); + if (src.hasSourceVersionElement()) + tgt.setSourceVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getSourceVersionElement())); if (src.hasTarget()) tgt.setTarget(src.getTarget()); if (src.hasTargetVersion()) @@ -142,10 +145,10 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.dstu3.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.dstu3.model.ConceptMap.ConceptMapGroupComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSource()) - tgt.setSource(src.getSource()); - if (src.hasSourceVersion()) - tgt.setSourceVersion(src.getSourceVersion()); + if (src.hasSourceElement()) + tgt.setSourceElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getSourceElement())); + if (src.hasSourceVersionElement()) + tgt.setSourceVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getSourceVersionElement())); if (src.hasTarget()) tgt.setTarget(src.getTarget()); if (src.hasTargetVersion()) @@ -165,12 +168,12 @@ public class ConceptMap30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertConceptMapGroupUnmappedMode(src.getMode())); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } @@ -181,12 +184,12 @@ public class ConceptMap30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMode()) tgt.setMode(convertConceptMapGroupUnmappedMode(src.getMode())); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); return tgt; } @@ -254,14 +257,14 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasProperty()) - tgt.setProperty(src.getProperty()); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasCode()) - tgt.setValue(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getPropertyElement())); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasCodeElement()) + tgt.setValueElement((StringType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); return tgt; } @@ -270,14 +273,14 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.dstu3.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.dstu3.model.ConceptMap.OtherElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasProperty()) - tgt.setProperty(src.getProperty()); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasValue()) - tgt.setCode(src.getValue()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getPropertyElement())); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasValueElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); return tgt; } @@ -286,10 +289,10 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.dstu3.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.dstu3.model.ConceptMap.SourceElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasNoMap() && src.getNoMap() == true) { tgt.addTarget(new org.hl7.fhir.dstu3.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.UNMATCHED)); } else { @@ -305,10 +308,10 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); for (org.hl7.fhir.dstu3.model.ConceptMap.TargetElementComponent t : src.getTarget()) if (t.getEquivalence() == org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.UNMATCHED) { tgt.setNoMap(true); } else { @@ -322,14 +325,14 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.r5.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.TargetElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasEquivalence()) tgt.setRelationship(convertConceptMapRelationship(src.getEquivalence())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasDependsOn()) { for (org.hl7.fhir.dstu3.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); } @@ -344,14 +347,14 @@ public class ConceptMap30_50 { return null; org.hl7.fhir.dstu3.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.dstu3.model.ConceptMap.TargetElementComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasRelationship()) tgt.setEquivalence(convertConceptMapEquivalence(src.getRelationship())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasDependsOn()) { for (org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Condition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Condition30_50.java index e79ac4d1c..f77e7029c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Condition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Condition30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Condition30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Consent30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Consent30_50.java index 8d4bc4a89..f9ec24120 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Consent30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Consent30_50.java @@ -1,6 +1,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Consent30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DataElement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DataElement30_50.java index f6907ddd2..c5c8f08b5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DataElement30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DataElement30_50.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.*; + +import java.util.Collections; public class DataElement30_50 { @@ -15,20 +18,20 @@ public class DataElement30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasVersionElement()) + tgt.setVersionElement((StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } @@ -38,8 +41,8 @@ public class DataElement30_50 { if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasMapping()) { for (org.hl7.fhir.dstu3.model.DataElement.DataElementMappingComponent t : src.getMapping()) tgt.addMapping(convertDataElementMappingComponent(t)); } @@ -59,14 +62,14 @@ public class DataElement30_50 { return null; org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentity()) - tgt.setIdentity(src.getIdentity()); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((IdType) VersionConvertor_30_50.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DetectedIssue30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DetectedIssue30_50.java index 5175753ec..900f1827c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DetectedIssue30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DetectedIssue30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class DetectedIssue30_50 { @@ -27,10 +28,10 @@ public class DetectedIssue30_50 { if (src.hasImplicated()) { for (org.hl7.fhir.r5.model.Reference t : src.getImplicated()) tgt.addImplicated(VersionConvertor_30_50.convertReference(t)); } - if (src.hasDetail()) - tgt.setDetail(src.getDetail()); - if (src.hasReference()) - tgt.setReference(src.getReference()); + if (src.hasDetailElement()) + tgt.setDetailElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDetailElement())); + if (src.hasReferenceElement()) + tgt.setReferenceElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getReferenceElement())); if (src.hasMitigation()) { for (org.hl7.fhir.r5.model.DetectedIssue.DetectedIssueMitigationComponent t : src.getMitigation()) tgt.addMitigation(convertDetectedIssueMitigationComponent(t)); } @@ -59,10 +60,10 @@ public class DetectedIssue30_50 { if (src.hasImplicated()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getImplicated()) tgt.addImplicated(VersionConvertor_30_50.convertReference(t)); } - if (src.hasDetail()) - tgt.setDetail(src.getDetail()); - if (src.hasReference()) - tgt.setReference(src.getReference()); + if (src.hasDetailElement()) + tgt.setDetailElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDetailElement())); + if (src.hasReferenceElement()) + tgt.setReferenceElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getReferenceElement())); if (src.hasMitigation()) { for (org.hl7.fhir.dstu3.model.DetectedIssue.DetectedIssueMitigationComponent t : src.getMitigation()) tgt.addMitigation(convertDetectedIssueMitigationComponent(t)); } @@ -76,8 +77,8 @@ public class DetectedIssue30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasAction()) tgt.setAction(VersionConvertor_30_50.convertCodeableConcept(src.getAction())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); return tgt; @@ -90,8 +91,8 @@ public class DetectedIssue30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasAction()) tgt.setAction(VersionConvertor_30_50.convertCodeableConcept(src.getAction())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java index 5a47e08ac..b7588172d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class DeviceUseStatement30_50 { @@ -20,8 +21,8 @@ public class DeviceUseStatement30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasTiming()) tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming())); - if (src.hasRecordedOn()) - tgt.setRecordedOn(src.getRecordedOn()); + if (src.hasRecordedOnElement()) + tgt.setRecordedOnElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getRecordedOnElement())); if (src.hasSource()) tgt.setSource(VersionConvertor_30_50.convertReference(src.getSource())); if (src.hasDevice()) @@ -50,8 +51,8 @@ public class DeviceUseStatement30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasTiming()) tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming())); - if (src.hasRecordedOn()) - tgt.setRecordedOn(src.getRecordedOn()); + if (src.hasRecordedOnElement()) + tgt.setRecordedOnElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getRecordedOnElement())); if (src.hasSource()) tgt.setSource(VersionConvertor_30_50.convertReference(src.getSource())); if (src.hasDevice()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DiagnosticReport30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DiagnosticReport30_50.java index d5c7fee8d..691d7c27c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DiagnosticReport30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DiagnosticReport30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class DiagnosticReport30_50 { @@ -28,8 +29,8 @@ public class DiagnosticReport30_50 { tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getContext())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasSpecimen()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getSpecimen()) tgt.addSpecimen(VersionConvertor_30_50.convertReference(t)); } @@ -42,8 +43,8 @@ public class DiagnosticReport30_50 { if (src.hasImage()) { for (org.hl7.fhir.dstu3.model.DiagnosticReport.DiagnosticReportImageComponent t : src.getImage()) tgt.addMedia(convertDiagnosticReportImageComponent(t)); } - if (src.hasConclusion()) - tgt.setConclusion(src.getConclusion()); + if (src.hasConclusionElement()) + tgt.setConclusionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getConclusionElement())); if (src.hasCodedDiagnosis()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCodedDiagnosis()) tgt.addConclusionCode(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -76,8 +77,8 @@ public class DiagnosticReport30_50 { tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasSpecimen()) { for (org.hl7.fhir.r5.model.Reference t : src.getSpecimen()) tgt.addSpecimen(VersionConvertor_30_50.convertReference(t)); } @@ -90,8 +91,8 @@ public class DiagnosticReport30_50 { if (src.hasMedia()) { for (org.hl7.fhir.r5.model.DiagnosticReport.DiagnosticReportMediaComponent t : src.getMedia()) tgt.addImage(convertDiagnosticReportImageComponent(t)); } - if (src.hasConclusion()) - tgt.setConclusion(src.getConclusion()); + if (src.hasConclusionElement()) + tgt.setConclusionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getConclusionElement())); if (src.hasConclusionCode()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getConclusionCode()) tgt.addCodedDiagnosis(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -106,8 +107,8 @@ public class DiagnosticReport30_50 { return null; org.hl7.fhir.dstu3.model.DiagnosticReport.DiagnosticReportImageComponent tgt = new org.hl7.fhir.dstu3.model.DiagnosticReport.DiagnosticReportImageComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasLink()) tgt.setLink(VersionConvertor_30_50.convertReference(src.getLink())); return tgt; @@ -118,8 +119,8 @@ public class DiagnosticReport30_50 { return null; org.hl7.fhir.r5.model.DiagnosticReport.DiagnosticReportMediaComponent tgt = new org.hl7.fhir.r5.model.DiagnosticReport.DiagnosticReportMediaComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasLink()) tgt.setLink(VersionConvertor_30_50.convertReference(src.getLink())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java index b34f94e56..a2e64be2d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DocumentReference30_50.java @@ -1,7 +1,11 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; +import org.hl7.fhir.dstu3.model.DateTimeType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.InstantType; + +import java.util.Collections; public class DocumentReference30_50 { @@ -25,8 +29,8 @@ public class DocumentReference30_50 { tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(src.getClass_())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasCreated()) - tgt.setDate(src.getCreated()); + if (src.hasCreatedElement()) + tgt.setDateElement((InstantType) VersionConvertor_30_50.convertType(src.getCreatedElement())); if (src.hasAuthenticator()) tgt.setAuthenticator(VersionConvertor_30_50.convertReference(src.getAuthenticator())); if (src.hasCustodian()) @@ -34,8 +38,8 @@ public class DocumentReference30_50 { if (src.hasRelatesTo()) { for (org.hl7.fhir.dstu3.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSecurityLabel()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -67,8 +71,8 @@ public class DocumentReference30_50 { tgt.setClass_(VersionConvertor_30_50.convertCodeableConcept(src.getCategoryFirstRep())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasDate()) - tgt.setCreated(src.getDate()); + if (src.hasDateElement()) + tgt.setCreatedElement((DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasAuthenticator()) tgt.setAuthenticator(VersionConvertor_30_50.convertReference(src.getAuthenticator())); if (src.hasCustodian()) @@ -76,8 +80,8 @@ public class DocumentReference30_50 { if (src.hasRelatesTo()) { for (org.hl7.fhir.r5.model.DocumentReference.DocumentReferenceRelatesToComponent t : src.getRelatesTo()) tgt.addRelatesTo(convertDocumentReferenceRelatesToComponent(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSecurityLabel()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_30_50.convertCodeableConcept(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Encounter30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Encounter30_50.java index 850ef3133..59d8c64b0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Encounter30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Encounter30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class Encounter30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Endpoint30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Endpoint30_50.java index fa4568891..f2c888024 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Endpoint30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Endpoint30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Endpoint30_50 { @@ -17,8 +18,8 @@ public class Endpoint30_50 { tgt.setStatus(convertEndpointStatus(src.getStatus())); if (src.hasConnectionType()) tgt.setConnectionType(VersionConvertor_30_50.convertCoding(src.getConnectionType())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasManagingOrganization()) tgt.setManagingOrganization(VersionConvertor_30_50.convertReference(src.getManagingOrganization())); if (src.hasContact()) { @@ -32,8 +33,8 @@ public class Endpoint30_50 { if (src.hasPayloadMimeType()) { for (org.hl7.fhir.r5.model.CodeType t : src.getPayloadMimeType()) tgt.addPayloadMimeType(t.getValue()); } - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getAddressElement())); if (src.hasHeader()) { for (org.hl7.fhir.r5.model.StringType t : src.getHeader()) tgt.addHeader(t.getValue()); } @@ -52,8 +53,8 @@ public class Endpoint30_50 { tgt.setStatus(convertEndpointStatus(src.getStatus())); if (src.hasConnectionType()) tgt.setConnectionType(VersionConvertor_30_50.convertCoding(src.getConnectionType())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasManagingOrganization()) tgt.setManagingOrganization(VersionConvertor_30_50.convertReference(src.getManagingOrganization())); if (src.hasContact()) { @@ -67,8 +68,8 @@ public class Endpoint30_50 { if (src.hasPayloadMimeType()) { for (org.hl7.fhir.dstu3.model.CodeType t : src.getPayloadMimeType()) tgt.addPayloadMimeType(t.getValue()); } - if (src.hasAddress()) - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getAddressElement())); if (src.hasHeader()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getHeader()) tgt.addHeader(t.getValue()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/EpisodeOfCare30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/EpisodeOfCare30_50.java index 2d1f88806..6d9f588b5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/EpisodeOfCare30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/EpisodeOfCare30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class EpisodeOfCare30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ExpansionProfile30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ExpansionProfile30_50.java index 580e76673..485e0466f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ExpansionProfile30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ExpansionProfile30_50.java @@ -5,6 +5,7 @@ import org.hl7.fhir.dstu3.model.ExpansionProfile.DesignationIncludeDesignationCo import org.hl7.fhir.dstu3.model.ExpansionProfile.SystemVersionProcessingMode; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.DataType; +import java.util.Collections; public class ExpansionProfile30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/FamilyMemberHistory30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/FamilyMemberHistory30_50.java index eb1c1b2fa..866d0e0a7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/FamilyMemberHistory30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/FamilyMemberHistory30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class FamilyMemberHistory30_50 { @@ -57,18 +58,18 @@ public class FamilyMemberHistory30_50 { tgt.setNotDoneReason(VersionConvertor_30_50.convertCodeableConcept(src.getDataAbsentReason())); if (src.hasPatient()) tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasRelationship()) tgt.setRelationship(VersionConvertor_30_50.convertCodeableConcept(src.getRelationship())); if (src.hasBorn()) tgt.setBorn(VersionConvertor_30_50.convertType(src.getBorn())); if (src.hasAge()) tgt.setAge(VersionConvertor_30_50.convertType(src.getAge())); - if (src.hasEstimatedAge()) - tgt.setEstimatedAge(src.getEstimatedAge()); + if (src.hasEstimatedAgeElement()) + tgt.setEstimatedAgeElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getEstimatedAgeElement())); if (src.hasDeceased()) tgt.setDeceased(VersionConvertor_30_50.convertType(src.getDeceased())); for (CodeableReference t : src.getReason()) if (t.hasConcept()) @@ -101,18 +102,18 @@ public class FamilyMemberHistory30_50 { tgt.setDataAbsentReason(VersionConvertor_30_50.convertCodeableConcept(src.getNotDoneReason())); if (src.hasPatient()) tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasRelationship()) tgt.setRelationship(VersionConvertor_30_50.convertCodeableConcept(src.getRelationship())); if (src.hasBorn()) tgt.setBorn(VersionConvertor_30_50.convertType(src.getBorn())); if (src.hasAge()) tgt.setAge(VersionConvertor_30_50.convertType(src.getAge())); - if (src.hasEstimatedAge()) - tgt.setEstimatedAge(src.getEstimatedAge()); + if (src.hasEstimatedAgeElement()) + tgt.setEstimatedAgeElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getEstimatedAgeElement())); if (src.hasDeceased()) tgt.setDeceased(VersionConvertor_30_50.convertType(src.getDeceased())); if (src.hasReasonCode()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Flag30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Flag30_50.java index 88f0e4e9b..9c589eb96 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Flag30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Flag30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Flag30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java index c42b79d52..db2373ac1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class Goal30_50 { @@ -29,10 +30,10 @@ public class Goal30_50 { tgt.setStart(VersionConvertor_30_50.convertType(src.getStart())); if (src.hasTarget()) tgt.setTarget(convertGoalTargetComponent(src.getTargetFirstRep())); - if (src.hasStatusDate()) - tgt.setStatusDate(src.getStatusDate()); - if (src.hasStatusReason()) - tgt.setStatusReason(src.getStatusReason()); + if (src.hasStatusDateElement()) + tgt.setStatusDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getStatusDateElement())); + if (src.hasStatusReasonElement()) + tgt.setStatusReasonElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getStatusReasonElement())); if (src.hasExpressedBy()) tgt.setExpressedBy(VersionConvertor_30_50.convertReference(src.getExpressedBy())); if (src.hasAddresses()) { @@ -71,10 +72,10 @@ public class Goal30_50 { tgt.setStart(VersionConvertor_30_50.convertType(src.getStart())); if (src.hasTarget()) tgt.addTarget(convertGoalTargetComponent(src.getTarget())); - if (src.hasStatusDate()) - tgt.setStatusDate(src.getStatusDate()); - if (src.hasStatusReason()) - tgt.setStatusReason(src.getStatusReason()); + if (src.hasStatusDateElement()) + tgt.setStatusDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getStatusDateElement())); + if (src.hasStatusReasonElement()) + tgt.setStatusReasonElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getStatusReasonElement())); if (src.hasExpressedBy()) tgt.setExpressedBy(VersionConvertor_30_50.convertReference(src.getExpressedBy())); if (src.hasAddresses()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/GraphDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/GraphDefinition30_50.java index 156b3b886..bca0fad9b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/GraphDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/GraphDefinition30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class GraphDefinition30_50 { @@ -82,37 +83,37 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.r5.model.GraphDefinition tgt = new org.hl7.fhir.r5.model.GraphDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasProfile()) - tgt.setProfile(src.getProfile()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasProfileElement()) + tgt.setProfileElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getProfileElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkComponent t : src.getLink()) tgt.addLink(convertGraphDefinitionLinkComponent(t)); } @@ -124,37 +125,37 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.dstu3.model.GraphDefinition tgt = new org.hl7.fhir.dstu3.model.GraphDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasProfile()) - tgt.setProfile(src.getProfile()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasProfileElement()) + tgt.setProfileElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getProfileElement())); if (src.hasLink()) { for (org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkComponent t : src.getLink()) tgt.addLink(convertGraphDefinitionLinkComponent(t)); } @@ -166,16 +167,16 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkComponent tgt = new org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasSliceName()) - tgt.setSliceName(src.getSliceName()); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasSliceNameElement()) + tgt.setSliceNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getSliceNameElement())); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasTarget()) { for (org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkTargetComponent t : src.getTarget()) tgt.addTarget(convertGraphDefinitionLinkTargetComponent(t)); } @@ -187,16 +188,16 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkComponent tgt = new org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasSliceName()) - tgt.setSliceName(src.getSliceName()); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasSliceNameElement()) + tgt.setSliceNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getSliceNameElement())); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasTarget()) { for (org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkTargetComponent t : src.getTarget()) tgt.addTarget(convertGraphDefinitionLinkTargetComponent(t)); } @@ -212,10 +213,10 @@ public class GraphDefinition30_50 { tgt.setCode(convertCompartmentCode(src.getCode())); if (src.hasRule()) tgt.setRule(convertGraphCompartmentRule(src.getRule())); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -228,10 +229,10 @@ public class GraphDefinition30_50 { tgt.setCode(convertCompartmentCode(src.getCode())); if (src.hasRule()) tgt.setRule(convertGraphCompartmentRule(src.getRule())); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -240,10 +241,10 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkTargetComponent tgt = new org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkTargetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasProfile()) - tgt.setProfile(src.getProfile()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); + if (src.hasProfileElement()) + tgt.setProfileElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getProfileElement())); if (src.hasCompartment()) { for (org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkTargetCompartmentComponent t : src.getCompartment()) tgt.addCompartment(convertGraphDefinitionLinkTargetCompartmentComponent(t)); } @@ -258,10 +259,10 @@ public class GraphDefinition30_50 { return null; org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkTargetComponent tgt = new org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkTargetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasProfile()) - tgt.setProfile(src.getProfile()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); + if (src.hasProfileElement()) + tgt.setProfileElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getProfileElement())); if (src.hasCompartment()) { for (org.hl7.fhir.dstu3.model.GraphDefinition.GraphDefinitionLinkTargetCompartmentComponent t : src.getCompartment()) tgt.addCompartment(convertGraphDefinitionLinkTargetCompartmentComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Group30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Group30_50.java index 2cbc96fbf..74c190efc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Group30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Group30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Group30_50 { @@ -13,18 +14,18 @@ public class Group30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasType()) tgt.setType(convertGroupType(src.getType())); - if (src.hasActual()) - tgt.setActual(src.getActual()); + if (src.hasActualElement()) + tgt.setActualElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActualElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasQuantity()) - tgt.setQuantity(src.getQuantity()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasQuantityElement()) + tgt.setQuantityElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getQuantityElement())); if (src.hasCharacteristic()) { for (org.hl7.fhir.dstu3.model.Group.GroupCharacteristicComponent t : src.getCharacteristic()) tgt.addCharacteristic(convertGroupCharacteristicComponent(t)); } @@ -42,18 +43,18 @@ public class Group30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasType()) tgt.setType(convertGroupType(src.getType())); - if (src.hasActual()) - tgt.setActual(src.getActual()); + if (src.hasActualElement()) + tgt.setActualElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActualElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasQuantity()) - tgt.setQuantity(src.getQuantity()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasQuantityElement()) + tgt.setQuantityElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getQuantityElement())); if (src.hasCharacteristic()) { for (org.hl7.fhir.r5.model.Group.GroupCharacteristicComponent t : src.getCharacteristic()) tgt.addCharacteristic(convertGroupCharacteristicComponent(t)); } @@ -72,8 +73,8 @@ public class Group30_50 { tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); - if (src.hasExclude()) - tgt.setExclude(src.getExclude()); + if (src.hasExcludeElement()) + tgt.setExcludeElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExcludeElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); return tgt; @@ -88,8 +89,8 @@ public class Group30_50 { tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); - if (src.hasExclude()) - tgt.setExclude(src.getExclude()); + if (src.hasExcludeElement()) + tgt.setExcludeElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExcludeElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); return tgt; @@ -104,8 +105,8 @@ public class Group30_50 { tgt.setEntity(VersionConvertor_30_50.convertReference(src.getEntity())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); return tgt; } @@ -118,8 +119,8 @@ public class Group30_50 { tgt.setEntity(VersionConvertor_30_50.convertReference(src.getEntity())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/HealthcareService30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/HealthcareService30_50.java index 9f80cfde3..4f0d46dfb 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/HealthcareService30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/HealthcareService30_50.java @@ -4,6 +4,7 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableConcept; import org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceEligibilityComponent; +import java.util.Collections; public class HealthcareService30_50 { @@ -15,8 +16,8 @@ public class HealthcareService30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasProvidedBy()) tgt.setProvidedBy(VersionConvertor_30_50.convertReference(src.getProvidedBy())); if (src.hasCategory()) @@ -30,12 +31,12 @@ public class HealthcareService30_50 { if (src.hasLocation()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getLocation()) tgt.addLocation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); - if (src.hasExtraDetails()) - tgt.setExtraDetails(src.getExtraDetails()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); + if (src.hasExtraDetailsElement()) + tgt.setExtraDetailsElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getExtraDetailsElement())); if (src.hasPhoto()) tgt.setPhoto(VersionConvertor_30_50.convertAttachment(src.getPhoto())); if (src.hasTelecom()) { @@ -64,16 +65,16 @@ public class HealthcareService30_50 { if (src.hasReferralMethod()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReferralMethod()) tgt.addReferralMethod(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasAppointmentRequired()) - tgt.setAppointmentRequired(src.getAppointmentRequired()); + if (src.hasAppointmentRequiredElement()) + tgt.setAppointmentRequiredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAppointmentRequiredElement())); if (src.hasAvailableTime()) { for (org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent t : src.getAvailableTime()) tgt.addAvailableTime(convertHealthcareServiceAvailableTimeComponent(t)); } if (src.hasNotAvailable()) { for (org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceNotAvailableComponent t : src.getNotAvailable()) tgt.addNotAvailable(convertHealthcareServiceNotAvailableComponent(t)); } - if (src.hasAvailabilityExceptions()) - tgt.setAvailabilityExceptions(src.getAvailabilityExceptions()); + if (src.hasAvailabilityExceptionsElement()) + tgt.setAvailabilityExceptionsElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getAvailabilityExceptionsElement())); if (src.hasEndpoint()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getEndpoint()) tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } @@ -88,8 +89,8 @@ public class HealthcareService30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasProvidedBy()) tgt.setProvidedBy(VersionConvertor_30_50.convertReference(src.getProvidedBy())); if (src.hasCategory()) @@ -103,12 +104,12 @@ public class HealthcareService30_50 { if (src.hasLocation()) { for (org.hl7.fhir.r5.model.Reference t : src.getLocation()) tgt.addLocation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); - if (src.hasExtraDetails()) - tgt.setExtraDetails(src.getExtraDetails()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); + if (src.hasExtraDetailsElement()) + tgt.setExtraDetailsElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExtraDetailsElement())); if (src.hasPhoto()) tgt.setPhoto(VersionConvertor_30_50.convertAttachment(src.getPhoto())); if (src.hasTelecom()) { @@ -136,16 +137,16 @@ public class HealthcareService30_50 { if (src.hasReferralMethod()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReferralMethod()) tgt.addReferralMethod(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasAppointmentRequired()) - tgt.setAppointmentRequired(src.getAppointmentRequired()); + if (src.hasAppointmentRequiredElement()) + tgt.setAppointmentRequiredElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAppointmentRequiredElement())); if (src.hasAvailableTime()) { for (org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent t : src.getAvailableTime()) tgt.addAvailableTime(convertHealthcareServiceAvailableTimeComponent(t)); } if (src.hasNotAvailable()) { for (org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceNotAvailableComponent t : src.getNotAvailable()) tgt.addNotAvailable(convertHealthcareServiceNotAvailableComponent(t)); } - if (src.hasAvailabilityExceptions()) - tgt.setAvailabilityExceptions(src.getAvailabilityExceptions()); + if (src.hasAvailabilityExceptionsElement()) + tgt.setAvailabilityExceptionsElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getAvailabilityExceptionsElement())); if (src.hasEndpoint()) { for (org.hl7.fhir.r5.model.Reference t : src.getEndpoint()) tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } @@ -160,12 +161,12 @@ public class HealthcareService30_50 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.dstu3.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_30_50.copyElement(t, tgt.addDaysOfWeekElement().setValue(VersionConvertor_30_50.convertDaysOfWeek(t.getValue()))); } - if (src.hasAllDay()) - tgt.setAllDay(src.getAllDay()); - if (src.hasAvailableStartTime()) - tgt.setAvailableStartTime(src.getAvailableStartTime()); - if (src.hasAvailableEndTime()) - tgt.setAvailableEndTime(src.getAvailableEndTime()); + if (src.hasAllDayElement()) + tgt.setAllDayElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.r5.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.r5.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -177,12 +178,12 @@ public class HealthcareService30_50 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.r5.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_30_50.copyElement(t, tgt.addDaysOfWeekElement().setValue(VersionConvertor_30_50.convertDaysOfWeek(t.getValue()))); } - if (src.hasAllDay()) - tgt.setAllDay(src.getAllDay()); - if (src.hasAvailableStartTime()) - tgt.setAvailableStartTime(src.getAvailableStartTime()); - if (src.hasAvailableEndTime()) - tgt.setAvailableEndTime(src.getAvailableEndTime()); + if (src.hasAllDayElement()) + tgt.setAllDayElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.dstu3.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.dstu3.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -191,8 +192,8 @@ public class HealthcareService30_50 { return null; org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceNotAvailableComponent tgt = new org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceNotAvailableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasDuring()) tgt.setDuring(VersionConvertor_30_50.convertPeriod(src.getDuring())); return tgt; @@ -203,8 +204,8 @@ public class HealthcareService30_50 { return null; org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceNotAvailableComponent tgt = new org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceNotAvailableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasDuring()) tgt.setDuring(VersionConvertor_30_50.convertPeriod(src.getDuring())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImagingStudy30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImagingStudy30_50.java index 488aff312..d97e3bc3b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImagingStudy30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImagingStudy30_50.java @@ -2,8 +2,10 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.ImagingStudy.ImagingStudyProcedureComponent; import java.util.List; +import java.util.Collections; public class ImagingStudy30_50 { @@ -63,12 +65,10 @@ public class ImagingStudy30_50 { for (org.hl7.fhir.r5.model.Reference t : src.getEndpoint()) { tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } - if (src.hasNumberOfSeries()) { - tgt.setNumberOfSeries(src.getNumberOfSeries()); - } - if (src.hasNumberOfInstances()) { - tgt.setNumberOfInstances(src.getNumberOfInstances()); - } + if (src.hasNumberOfSeriesElement()) + tgt.setNumberOfSeriesElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfSeriesElement())); + if (src.hasNumberOfInstancesElement()) + tgt.setNumberOfInstancesElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfInstancesElement())); for (ImagingStudyProcedureComponent t : src.getProcedure()) { if (t.hasValueReference()) { tgt.addProcedureReference(VersionConvertor_30_50.convertReference(t.getValueReference())); @@ -82,9 +82,8 @@ public class ImagingStudy30_50 { if (reasonCodes.size() > 1) { } } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesComponent t : src.getSeries()) { tgt.addSeries(convertImagingStudySeriesComponent(t)); } @@ -149,12 +148,10 @@ public class ImagingStudy30_50 { for (org.hl7.fhir.dstu3.model.Reference t : src.getEndpoint()) { tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } - if (src.hasNumberOfSeries()) { - tgt.setNumberOfSeries(src.getNumberOfSeries()); - } - if (src.hasNumberOfInstances()) { - tgt.setNumberOfInstances(src.getNumberOfInstances()); - } + if (src.hasNumberOfSeriesElement()) + tgt.setNumberOfSeriesElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfSeriesElement())); + if (src.hasNumberOfInstancesElement()) + tgt.setNumberOfInstancesElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfInstancesElement())); List procedureReferences = src.getProcedureReference(); if (procedureReferences.size() > 0) { tgt.addProcedure().setValue(VersionConvertor_30_50.convertReference(procedureReferences.get(0))); @@ -165,9 +162,8 @@ public class ImagingStudy30_50 { if (src.hasReason()) { tgt.addReason(VersionConvertor_30_50.convertCodeableConceptToCodableReference(src.getReason())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesComponent t : src.getSeries()) { tgt.addSeries(convertImagingStudySeriesComponent(t)); } @@ -179,48 +175,28 @@ public class ImagingStudy30_50 { return null; org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesComponent tgt = new org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUid()) { - if (src.hasUid()) { - tgt.setUid(src.getUid()); - } - } - if (src.hasNumber()) { - if (src.hasNumber()) { - tgt.setNumber(src.getNumber()); - } - } + if (src.hasUidElement()) + tgt.setUidElement((org.hl7.fhir.dstu3.model.OidType) VersionConvertor_30_50.convertType(src.getUidElement())); + if (src.hasNumberElement()) + tgt.setNumberElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberElement())); if (src.hasModality()) { - if (src.hasModality()) { - tgt.setModality(VersionConvertor_30_50.convertCoding(src.getModality())); - } - } - if (src.hasDescription()) { - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - } - if (src.hasNumberOfInstances()) { - if (src.hasNumberOfInstances()) { - tgt.setNumberOfInstances(src.getNumberOfInstances()); - } + tgt.setModality(VersionConvertor_30_50.convertCoding(src.getModality())); } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasNumberOfInstancesElement()) + tgt.setNumberOfInstancesElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfInstancesElement())); for (org.hl7.fhir.r5.model.Reference t : src.getEndpoint()) { tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } if (src.hasBodySite()) { - if (src.hasBodySite()) { - tgt.setBodySite(VersionConvertor_30_50.convertCoding(src.getBodySite())); - } + tgt.setBodySite(VersionConvertor_30_50.convertCoding(src.getBodySite())); } if (src.hasLaterality()) { - if (src.hasLaterality()) { - tgt.setLaterality(VersionConvertor_30_50.convertCoding(src.getLaterality())); - } + tgt.setLaterality(VersionConvertor_30_50.convertCoding(src.getLaterality())); } - if (src.hasStarted()) { - if (src.hasStartedElement()) { - tgt.setStartedElement(VersionConvertor_30_50.convertDateTime(src.getStartedElement())); - } + if (src.hasStartedElement()) { + tgt.setStartedElement(VersionConvertor_30_50.convertDateTime(src.getStartedElement())); } for (org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesInstanceComponent t : src.getInstance()) { tgt.addInstance(convertImagingStudySeriesInstanceComponent(t)); @@ -233,48 +209,28 @@ public class ImagingStudy30_50 { return null; org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesComponent tgt = new org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUid()) { - if (src.hasUid()) { - tgt.setUid(src.getUid()); - } - } - if (src.hasNumber()) { - if (src.hasNumber()) { - tgt.setNumber(src.getNumber()); - } - } + if (src.hasUidElement()) + tgt.setUidElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getUidElement())); + if (src.hasNumberElement()) + tgt.setNumberElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberElement())); if (src.hasModality()) { - if (src.hasModality()) { - tgt.setModality(VersionConvertor_30_50.convertCoding(src.getModality())); - } - } - if (src.hasDescription()) { - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - } - if (src.hasNumberOfInstances()) { - if (src.hasNumberOfInstances()) { - tgt.setNumberOfInstances(src.getNumberOfInstances()); - } + tgt.setModality(VersionConvertor_30_50.convertCoding(src.getModality())); } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasNumberOfInstancesElement()) + tgt.setNumberOfInstancesElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfInstancesElement())); for (org.hl7.fhir.dstu3.model.Reference t : src.getEndpoint()) { tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } if (src.hasBodySite()) { - if (src.hasBodySite()) { - tgt.setBodySite(VersionConvertor_30_50.convertCoding(src.getBodySite())); - } + tgt.setBodySite(VersionConvertor_30_50.convertCoding(src.getBodySite())); } if (src.hasLaterality()) { - if (src.hasLaterality()) { - tgt.setLaterality(VersionConvertor_30_50.convertCoding(src.getLaterality())); - } + tgt.setLaterality(VersionConvertor_30_50.convertCoding(src.getLaterality())); } - if (src.hasStarted()) { - if (src.hasStartedElement()) { - tgt.setStartedElement(VersionConvertor_30_50.convertDateTime(src.getStartedElement())); - } + if (src.hasStartedElement()) { + tgt.setStartedElement(VersionConvertor_30_50.convertDateTime(src.getStartedElement())); } for (org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesInstanceComponent t : src.getInstance()) { tgt.addInstance(convertImagingStudySeriesInstanceComponent(t)); @@ -287,19 +243,16 @@ public class ImagingStudy30_50 { return null; org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesInstanceComponent tgt = new org.hl7.fhir.dstu3.model.ImagingStudy.ImagingStudySeriesInstanceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUid()) { - tgt.setUid(src.getUid()); - } + if (src.hasUidElement()) + tgt.setUidElement((org.hl7.fhir.dstu3.model.OidType) VersionConvertor_30_50.convertType(src.getUidElement())); org.hl7.fhir.r5.model.Coding sop = src.getSopClass(); if (URN_IETF_RFC_3986.equals(sop.getSystem())) { tgt.setSopClass(sop.getCode()); } - if (src.hasNumber()) { - tgt.setNumber(src.getNumber()); - } - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } + if (src.hasNumberElement()) + tgt.setNumberElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); return tgt; } @@ -308,29 +261,20 @@ public class ImagingStudy30_50 { return null; org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesInstanceComponent tgt = new org.hl7.fhir.r5.model.ImagingStudy.ImagingStudySeriesInstanceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUid()) { - if (src.hasUid()) { - tgt.setUid(src.getUid()); - } - } + if (src.hasUidElement()) + tgt.setUidElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getUidElement())); if (src.hasSopClass()) { org.hl7.fhir.r5.model.Coding c = new org.hl7.fhir.r5.model.Coding(); c.setSystem(URN_IETF_RFC_3986); - if (src.hasSopClass()) { - c.setCode(src.getSopClass()); + if (src.hasSopClassElement()) { + c.setCodeElement((CodeType) VersionConvertor_30_50.convertType(src.getSopClassElement())); } tgt.setSopClass(c); } - if (src.hasNumber()) { - if (src.hasNumber()) { - tgt.setNumber(src.getNumber()); - } - } - if (src.hasTitle()) { - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } - } + if (src.hasNumberElement()) + tgt.setNumberElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Immunization30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Immunization30_50.java index 410248d17..2a068090f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Immunization30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Immunization30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class Immunization30_50 { @@ -24,18 +25,18 @@ public class Immunization30_50 { tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); if (src.hasDate()) tgt.setOccurrence(VersionConvertor_30_50.convertDateTime(src.getDateElement())); - if (src.hasPrimarySource()) - tgt.setPrimarySource(src.getPrimarySource()); + if (src.hasPrimarySourceElement()) + tgt.setPrimarySourceElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getPrimarySourceElement())); if (src.hasReportOrigin()) tgt.setInformationSource(VersionConvertor_30_50.convertCodeableConcept(src.getReportOrigin())); if (src.hasLocation()) tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); if (src.hasManufacturer()) tgt.setManufacturer(VersionConvertor_30_50.convertReference(src.getManufacturer())); - if (src.hasLotNumber()) - tgt.setLotNumber(src.getLotNumber()); - if (src.hasExpirationDate()) - tgt.setExpirationDate(src.getExpirationDate()); + if (src.hasLotNumberElement()) + tgt.setLotNumberElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getLotNumberElement())); + if (src.hasExpirationDateElement()) + tgt.setExpirationDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getExpirationDateElement())); if (src.hasSite()) tgt.setSite(VersionConvertor_30_50.convertCodeableConcept(src.getSite())); if (src.hasRoute()) @@ -72,18 +73,18 @@ public class Immunization30_50 { tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); if (src.hasOccurrenceDateTimeType()) tgt.setDateElement(VersionConvertor_30_50.convertDateTime(src.getOccurrenceDateTimeType())); - if (src.hasPrimarySource()) - tgt.setPrimarySource(src.getPrimarySource()); + if (src.hasPrimarySourceElement()) + tgt.setPrimarySourceElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getPrimarySourceElement())); if (src.hasInformationSourceCodeableConcept()) tgt.setReportOrigin(VersionConvertor_30_50.convertCodeableConcept(src.getInformationSourceCodeableConcept())); if (src.hasLocation()) tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation())); if (src.hasManufacturer()) tgt.setManufacturer(VersionConvertor_30_50.convertReference(src.getManufacturer())); - if (src.hasLotNumber()) - tgt.setLotNumber(src.getLotNumber()); - if (src.hasExpirationDate()) - tgt.setExpirationDate(src.getExpirationDate()); + if (src.hasLotNumberElement()) + tgt.setLotNumberElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getLotNumberElement())); + if (src.hasExpirationDateElement()) + tgt.setExpirationDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getExpirationDateElement())); if (src.hasSite()) tgt.setSite(VersionConvertor_30_50.convertCodeableConcept(src.getSite())); if (src.hasRoute()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImplementationGuide30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImplementationGuide30_50.java index 175edaa8d..60c93a9bf 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImplementationGuide30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ImplementationGuide30_50.java @@ -4,7 +4,10 @@ import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Enumeration; +import org.hl7.fhir.r5.model.StringType; + import java.util.List; +import java.util.Collections; public class ImplementationGuide30_50 { @@ -13,33 +16,33 @@ public class ImplementationGuide30_50 { return null; org.hl7.fhir.dstu3.model.ImplementationGuide tgt = new org.hl7.fhir.dstu3.model.ImplementationGuide(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasFhirVersion()) for (Enumeration v : src.getFhirVersion()) { tgt.setFhirVersion(v.asStringValue()); @@ -67,33 +70,33 @@ public class ImplementationGuide30_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide tgt = new org.hl7.fhir.r5.model.ImplementationGuide(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasFhirVersion()) tgt.addFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); if (src.hasDependency()) { @@ -116,8 +119,8 @@ public class ImplementationGuide30_50 { org.hl7.fhir.dstu3.model.ImplementationGuide.ImplementationGuideDependencyComponent tgt = new org.hl7.fhir.dstu3.model.ImplementationGuide.ImplementationGuideDependencyComponent(); VersionConvertor_30_50.copyElement(src, tgt); tgt.setType(org.hl7.fhir.dstu3.model.ImplementationGuide.GuideDependencyType.REFERENCE); - if (src.hasUri()) - tgt.setUri(src.getUri()); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); if (src.hasPackageId()) tgt.addExtension(new org.hl7.fhir.dstu3.model.Extension(VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION, new org.hl7.fhir.dstu3.model.IdType(src.getPackageId()))); if (src.hasVersion()) @@ -130,8 +133,8 @@ public class ImplementationGuide30_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUri()) - tgt.setUri(src.getUri()); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getUriElement())); if (org.hl7.fhir.dstu3.utils.ToolingExtensions.hasExtension(src, VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION)) { tgt.setPackageId(org.hl7.fhir.dstu3.utils.ToolingExtensions.readStringExtension(src, VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION)); } @@ -146,8 +149,8 @@ public class ImplementationGuide30_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasProfile()) tgt.setProfileElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getProfile())); return tgt; @@ -158,8 +161,8 @@ public class ImplementationGuide30_50 { return null; org.hl7.fhir.dstu3.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.dstu3.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCanonicalToReference(src.getProfileElement())); return tgt; @@ -173,10 +176,10 @@ public class ImplementationGuide30_50 { if (src.hasId()) { tgt.setId(src.getId()); } - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -186,10 +189,10 @@ public class ImplementationGuide30_50 { org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent(); tgt.setId("p" + (context.getGrouping().size() + 1)); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu3.model.ImplementationGuide.ImplementationGuidePackageResourceComponent t : src.getResource()) { org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionResourceComponent tn = convertImplementationGuidePackageResourceComponent(t); tn.setGroupingId(tgt.getId()); @@ -212,10 +215,10 @@ public class ImplementationGuide30_50 { tgt.setExample(src.getExampleBooleanType().getValue()); else tgt.setExample(false); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasReference()) tgt.setSource(VersionConvertor_30_50.convertReference(src.getReference())); return tgt; @@ -231,10 +234,10 @@ public class ImplementationGuide30_50 { tgt.setExample(t instanceof org.hl7.fhir.r5.model.Reference ? new org.hl7.fhir.r5.model.CanonicalType(((org.hl7.fhir.r5.model.Reference) t).getReference()) : t); } else if (src.hasExample()) tgt.setExample(new org.hl7.fhir.r5.model.BooleanType(src.getExample())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasSourceReference()) tgt.setReference(VersionConvertor_30_50.convertReference(src.getSourceReference())); else if (src.hasSourceUriType()) @@ -249,8 +252,8 @@ public class ImplementationGuide30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasNameUrlType()) tgt.setSource(src.getNameUrlType().getValue()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasGeneration()) tgt.setKind(convertPageGeneration(src.getGeneration())); if (src.hasPage()) { @@ -266,8 +269,8 @@ public class ImplementationGuide30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasSource()) tgt.setName(convertUriToUrl(src.getSourceElement())); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasKind()) tgt.setGeneration(convertPageGeneration(src.getKind())); if (src.hasPage()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Library30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Library30_50.java index 24bd8c272..72d76c90a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Library30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Library30_50.java @@ -4,6 +4,7 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.dstu3.model.ContactDetail; import org.hl7.fhir.dstu3.model.Contributor.ContributorType; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Library30_50 { @@ -12,48 +13,48 @@ public class Library30_50 { return null; org.hl7.fhir.dstu3.model.Library tgt = new org.hl7.fhir.dstu3.model.Library(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasTopic()) { @@ -103,48 +104,48 @@ public class Library30_50 { return null; org.hl7.fhir.r5.model.Library tgt = new org.hl7.fhir.r5.model.Library(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); for (org.hl7.fhir.dstu3.model.Contributor t : src.getContributor()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Linkage30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Linkage30_50.java index dfc6fb9f6..ad54cb2e0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Linkage30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Linkage30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Linkage30_50 { @@ -10,8 +11,8 @@ public class Linkage30_50 { return null; org.hl7.fhir.r5.model.Linkage tgt = new org.hl7.fhir.r5.model.Linkage(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); if (src.hasItem()) { @@ -25,8 +26,8 @@ public class Linkage30_50 { return null; org.hl7.fhir.dstu3.model.Linkage tgt = new org.hl7.fhir.dstu3.model.Linkage(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); if (src.hasItem()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/List30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/List30_50.java index f3eb43754..d42857b5e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/List30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/List30_50.java @@ -2,6 +2,11 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.BooleanType; +import org.hl7.fhir.r5.model.DateTimeType; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class List30_50 { @@ -17,16 +22,16 @@ public class List30_50 { tgt.setStatus(convertListStatus(src.getStatus())); if (src.hasMode()) tgt.setMode(convertListMode(src.getMode())); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasSource()) tgt.setSource(VersionConvertor_30_50.convertReference(src.getSource())); if (src.hasOrderedBy()) @@ -54,16 +59,16 @@ public class List30_50 { tgt.setStatus(convertListStatus(src.getStatus())); if (src.hasMode()) tgt.setMode(convertListMode(src.getMode())); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasSource()) tgt.setSource(VersionConvertor_30_50.convertReference(src.getSource())); if (src.hasOrderedBy()) @@ -86,10 +91,10 @@ public class List30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasFlag()) tgt.setFlag(VersionConvertor_30_50.convertCodeableConcept(src.getFlag())); - if (src.hasDeleted()) - tgt.setDeleted(src.getDeleted()); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDeletedElement()) + tgt.setDeletedElement((BooleanType) VersionConvertor_30_50.convertType(src.getDeletedElement())); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasItem()) tgt.setItem(VersionConvertor_30_50.convertReference(src.getItem())); return tgt; @@ -102,10 +107,10 @@ public class List30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasFlag()) tgt.setFlag(VersionConvertor_30_50.convertCodeableConcept(src.getFlag())); - if (src.hasDeleted()) - tgt.setDeleted(src.getDeleted()); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDeletedElement()) + tgt.setDeletedElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getDeletedElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); if (src.hasItem()) tgt.setItem(VersionConvertor_30_50.convertReference(src.getItem())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Location30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Location30_50.java index f92e526e9..e4491e245 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Location30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Location30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Location30_50 { @@ -17,13 +18,13 @@ public class Location30_50 { tgt.setStatus(convertLocationStatus(src.getStatus())); if (src.hasOperationalStatus()) tgt.setOperationalStatus(VersionConvertor_30_50.convertCoding(src.getOperationalStatus())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasAlias()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getAlias()) tgt.addAlias(t.getValue()); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasMode()) tgt.setMode(convertLocationMode(src.getMode())); if (src.hasType()) @@ -59,13 +60,13 @@ public class Location30_50 { tgt.setStatus(convertLocationStatus(src.getStatus())); if (src.hasOperationalStatus()) tgt.setOperationalStatus(VersionConvertor_30_50.convertCoding(src.getOperationalStatus())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasAlias()) { for (org.hl7.fhir.r5.model.StringType t : src.getAlias()) tgt.addAlias(t.getValue()); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasMode()) tgt.setMode(convertLocationMode(src.getMode())); if (src.hasType()) @@ -120,12 +121,12 @@ public class Location30_50 { return null; org.hl7.fhir.dstu3.model.Location.LocationPositionComponent tgt = new org.hl7.fhir.dstu3.model.Location.LocationPositionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLongitude()) - tgt.setLongitude(src.getLongitude()); - if (src.hasLatitude()) - tgt.setLatitude(src.getLatitude()); - if (src.hasAltitude()) - tgt.setAltitude(src.getAltitude()); + if (src.hasLongitudeElement()) + tgt.setLongitudeElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getLongitudeElement())); + if (src.hasLatitudeElement()) + tgt.setLatitudeElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getLatitudeElement())); + if (src.hasAltitudeElement()) + tgt.setAltitudeElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getAltitudeElement())); return tgt; } @@ -134,12 +135,12 @@ public class Location30_50 { return null; org.hl7.fhir.r5.model.Location.LocationPositionComponent tgt = new org.hl7.fhir.r5.model.Location.LocationPositionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLongitude()) - tgt.setLongitude(src.getLongitude()); - if (src.hasLatitude()) - tgt.setLatitude(src.getLatitude()); - if (src.hasAltitude()) - tgt.setAltitude(src.getAltitude()); + if (src.hasLongitudeElement()) + tgt.setLongitudeElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getLongitudeElement())); + if (src.hasLatitudeElement()) + tgt.setLatitudeElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getLatitudeElement())); + if (src.hasAltitudeElement()) + tgt.setAltitudeElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getAltitudeElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Measure30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Measure30_50.java index b698d9620..913d13740 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Measure30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Measure30_50.java @@ -5,6 +5,7 @@ import org.hl7.fhir.dstu3.model.ContactDetail; import org.hl7.fhir.dstu3.model.Contributor; import org.hl7.fhir.dstu3.model.Contributor.ContributorType; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Measure30_50 { @@ -13,50 +14,49 @@ public class Measure30_50 { return null; org.hl7.fhir.r5.model.Measure tgt = new org.hl7.fhir.r5.model.Measure(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasType()) - if (src.hasType()) { - for (org.hl7.fhir.dstu3.model.CodeableConcept concept : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(concept)); - } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasType()) { + for (org.hl7.fhir.dstu3.model.CodeableConcept concept : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(concept)); + } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); for (org.hl7.fhir.dstu3.model.Contributor t : src.getContributor()) { @@ -87,20 +87,20 @@ public class Measure30_50 { if (src.hasLibrary()) { for (org.hl7.fhir.dstu3.model.Reference r : src.getLibrary()) tgt.addLibrary(r.getReference()); } - if (src.hasDisclaimer()) - tgt.setDisclaimer(src.getDisclaimer()); + if (src.hasDisclaimerElement()) + tgt.setDisclaimerElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDisclaimerElement())); if (src.hasScoring()) tgt.setScoring(VersionConvertor_30_50.convertCodeableConcept(src.getScoring())); if (src.hasCompositeScoring()) tgt.setCompositeScoring(VersionConvertor_30_50.convertCodeableConcept(src.getCompositeScoring())); - if (src.hasRiskAdjustment()) - tgt.setRiskAdjustment(src.getRiskAdjustment()); - if (src.hasRateAggregation()) - tgt.setRateAggregation(src.getRateAggregation()); - if (src.hasRationale()) - tgt.setRationale(src.getRationale()); - if (src.hasClinicalRecommendationStatement()) - tgt.setClinicalRecommendationStatement(src.getClinicalRecommendationStatement()); + if (src.hasRiskAdjustmentElement()) + tgt.setRiskAdjustmentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getRiskAdjustmentElement())); + if (src.hasRateAggregationElement()) + tgt.setRateAggregationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getRateAggregationElement())); + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getRationaleElement())); + if (src.hasClinicalRecommendationStatementElement()) + tgt.setClinicalRecommendationStatementElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getClinicalRecommendationStatementElement())); if (src.hasImprovementNotation()) { if (src.getImprovementNotation().toLowerCase().contains("increase") || src.getImprovementNotation().toLowerCase().contains("higher")) tgt.setImprovementNotation(new org.hl7.fhir.r5.model.CodeableConcept().addCoding(new org.hl7.fhir.r5.model.Coding().setCode("increase").setSystem("http://terminology.hl7.org/CodeSystem/measure-improvement-notation")).setText(src.getImprovementNotation())); @@ -112,8 +112,8 @@ public class Measure30_50 { if (src.hasDefinition()) { for (org.hl7.fhir.dstu3.model.MarkdownType m : src.getDefinition()) tgt.addDefinition(m.getValue()); } - if (src.hasGuidance()) - tgt.setGuidance(src.getGuidance()); + if (src.hasGuidanceElement()) + tgt.setGuidanceElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getGuidanceElement())); if (src.hasGroup()) { for (org.hl7.fhir.dstu3.model.Measure.MeasureGroupComponent g : src.getGroup()) tgt.addGroup(convertMeasureGroup(g)); } @@ -125,50 +125,49 @@ public class Measure30_50 { return null; org.hl7.fhir.dstu3.model.Measure tgt = new org.hl7.fhir.dstu3.model.Measure(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasType()) - if (src.hasType()) { - for (org.hl7.fhir.r5.model.CodeableConcept concept : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(concept)); - } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasType()) { + for (org.hl7.fhir.r5.model.CodeableConcept concept : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(concept)); + } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasAuthor()) @@ -209,20 +208,20 @@ public class Measure30_50 { if (src.hasLibrary()) { for (org.hl7.fhir.r5.model.CanonicalType r : src.getLibrary()) tgt.addLibrary(VersionConvertor_30_50.convertCanonicalToReference(r)); } - if (src.hasDisclaimer()) - tgt.setDisclaimer(src.getDisclaimer()); + if (src.hasDisclaimerElement()) + tgt.setDisclaimerElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDisclaimerElement())); if (src.hasScoring()) tgt.setScoring(VersionConvertor_30_50.convertCodeableConcept(src.getScoring())); if (src.hasCompositeScoring()) tgt.setCompositeScoring(VersionConvertor_30_50.convertCodeableConcept(src.getCompositeScoring())); - if (src.hasRiskAdjustment()) - tgt.setRiskAdjustment(src.getRiskAdjustment()); - if (src.hasRateAggregation()) - tgt.setRateAggregation(src.getRateAggregation()); - if (src.hasRationale()) - tgt.setRationale(src.getRationale()); - if (src.hasClinicalRecommendationStatement()) - tgt.setClinicalRecommendationStatement(src.getClinicalRecommendationStatement()); + if (src.hasRiskAdjustmentElement()) + tgt.setRiskAdjustmentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getRiskAdjustmentElement())); + if (src.hasRateAggregationElement()) + tgt.setRateAggregationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getRateAggregationElement())); + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getRationaleElement())); + if (src.hasClinicalRecommendationStatementElement()) + tgt.setClinicalRecommendationStatementElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getClinicalRecommendationStatementElement())); if (src.hasImprovementNotation()) for (org.hl7.fhir.r5.model.Coding cc : src.getImprovementNotation().getCoding()) { if (cc.hasCode() && cc.getCode().equals("increase")) @@ -233,8 +232,8 @@ public class Measure30_50 { if (src.hasDefinition()) { for (org.hl7.fhir.r5.model.MarkdownType m : src.getDefinition()) tgt.addDefinition(m.getValue()); } - if (src.hasGuidance()) - tgt.setGuidance(src.getGuidance()); + if (src.hasGuidanceElement()) + tgt.setGuidanceElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getGuidanceElement())); if (src.hasGroup()) { for (org.hl7.fhir.r5.model.Measure.MeasureGroupComponent g : src.getGroup()) tgt.addGroup(convertMeasureGroup(g)); } @@ -247,8 +246,8 @@ public class Measure30_50 { org.hl7.fhir.dstu3.model.Measure.MeasureGroupComponent tgt = new org.hl7.fhir.dstu3.model.Measure.MeasureGroupComponent(); if (src.hasCode() && src.getCode().hasCoding()) tgt.setIdentifier(new org.hl7.fhir.dstu3.model.Identifier().setValue(src.getCode().getCodingFirstRep().getCode())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasPopulation()) { for (org.hl7.fhir.r5.model.Measure.MeasureGroupPopulationComponent p : src.getPopulation()) tgt.addPopulation(convertMeasureGroupPopulation(p)); } @@ -264,8 +263,8 @@ public class Measure30_50 { org.hl7.fhir.r5.model.Measure.MeasureGroupComponent tgt = new org.hl7.fhir.r5.model.Measure.MeasureGroupComponent(); if (src.hasIdentifier()) tgt.setCode(new org.hl7.fhir.r5.model.CodeableConcept().addCoding(new org.hl7.fhir.r5.model.Coding().setCode(src.getIdentifier().getValue()))); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasPopulation()) { for (org.hl7.fhir.dstu3.model.Measure.MeasureGroupPopulationComponent p : src.getPopulation()) tgt.addPopulation(convertMeasureGroupPopulation(p)); } @@ -281,8 +280,8 @@ public class Measure30_50 { org.hl7.fhir.dstu3.model.Measure.MeasureGroupPopulationComponent tgt = new org.hl7.fhir.dstu3.model.Measure.MeasureGroupPopulationComponent(); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasCriteria() && src.getCriteria().hasExpression()) tgt.setCriteria(src.getCriteria().getExpression()); if (src.hasCriteria() && src.getCriteria().hasName()) { @@ -299,10 +298,10 @@ public class Measure30_50 { org.hl7.fhir.r5.model.Measure.MeasureGroupPopulationComponent tgt = new org.hl7.fhir.r5.model.Measure.MeasureGroupPopulationComponent(); if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasCriteria()) - tgt.setCriteria(new org.hl7.fhir.r5.model.Expression().setExpression(src.getCriteria())); + tgt.setCriteria(new org.hl7.fhir.r5.model.Expression().setExpression(src.getCriteria())); if (src.hasName()) { if (tgt.hasCriteria()) tgt.getCriteria().setName(src.getName()); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Media30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Media30_50.java index b167e5f70..0af4c19cc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Media30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Media30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Media30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java index a5092c6ba..080ab62c3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Medication30_50 { @@ -54,8 +55,8 @@ public class Medication30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasItem()) tgt.setItem(VersionConvertor_30_50.convertType(src.getItem())); - if (src.hasIsActive()) - tgt.setIsActive(src.getIsActive()); + if (src.hasIsActiveElement()) + tgt.setIsActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getIsActiveElement())); if (src.hasStrengthRatio()) tgt.setAmount(VersionConvertor_30_50.convertRatio(src.getStrengthRatio())); return tgt; @@ -68,8 +69,8 @@ public class Medication30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasItem()) tgt.setItem(VersionConvertor_30_50.convertType(src.getItem())); - if (src.hasIsActive()) - tgt.setIsActive(src.getIsActive()); + if (src.hasIsActiveElement()) + tgt.setIsActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getIsActiveElement())); if (src.hasAmount()) tgt.setStrength(VersionConvertor_30_50.convertRatio(src.getAmount())); return tgt; @@ -80,10 +81,10 @@ public class Medication30_50 { return null; org.hl7.fhir.dstu3.model.Medication.MedicationPackageBatchComponent tgt = new org.hl7.fhir.dstu3.model.Medication.MedicationPackageBatchComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLotNumber()) - tgt.setLotNumber(src.getLotNumber()); - if (src.hasExpirationDate()) - tgt.setExpirationDate(src.getExpirationDate()); + if (src.hasLotNumberElement()) + tgt.setLotNumberElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getLotNumberElement())); + if (src.hasExpirationDateElement()) + tgt.setExpirationDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getExpirationDateElement())); return tgt; } @@ -92,10 +93,10 @@ public class Medication30_50 { return null; org.hl7.fhir.r5.model.Medication.MedicationBatchComponent tgt = new org.hl7.fhir.r5.model.Medication.MedicationBatchComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLotNumber()) - tgt.setLotNumber(src.getLotNumber()); - if (src.hasExpirationDate()) - tgt.setExpirationDate(src.getExpirationDate()); + if (src.hasLotNumberElement()) + tgt.setLotNumberElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getLotNumberElement())); + if (src.hasExpirationDateElement()) + tgt.setExpirationDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getExpirationDateElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java index ea24eef0a..e70d9082c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class MedicationAdministration30_50 { @@ -117,8 +118,8 @@ public class MedicationAdministration30_50 { return null; org.hl7.fhir.dstu3.model.MedicationAdministration.MedicationAdministrationDosageComponent tgt = new org.hl7.fhir.dstu3.model.MedicationAdministration.MedicationAdministrationDosageComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasSite()) tgt.setSite(VersionConvertor_30_50.convertCodeableConcept(src.getSite())); if (src.hasRoute()) @@ -137,8 +138,8 @@ public class MedicationAdministration30_50 { return null; org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationDosageComponent tgt = new org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationDosageComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasSite()) tgt.setSite(VersionConvertor_30_50.convertCodeableConcept(src.getSite())); if (src.hasRoute()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationDispense30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationDispense30_50.java index cf8b65118..0b5ec2d49 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationDispense30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationDispense30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class MedicationDispense30_50 { @@ -41,10 +42,10 @@ public class MedicationDispense30_50 { tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); if (src.hasDaysSupply()) tgt.setDaysSupply(VersionConvertor_30_50.convertSimpleQuantity(src.getDaysSupply())); - if (src.hasWhenPrepared()) - tgt.setWhenPrepared(src.getWhenPrepared()); - if (src.hasWhenHandedOver()) - tgt.setWhenHandedOver(src.getWhenHandedOver()); + if (src.hasWhenPreparedElement()) + tgt.setWhenPreparedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getWhenPreparedElement())); + if (src.hasWhenHandedOverElement()) + tgt.setWhenHandedOverElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getWhenHandedOverElement())); if (src.hasDestination()) tgt.setDestination(VersionConvertor_30_50.convertReference(src.getDestination())); if (src.hasReceiver()) { @@ -103,10 +104,10 @@ public class MedicationDispense30_50 { tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); if (src.hasDaysSupply()) tgt.setDaysSupply(VersionConvertor_30_50.convertSimpleQuantity(src.getDaysSupply())); - if (src.hasWhenPrepared()) - tgt.setWhenPrepared(src.getWhenPrepared()); - if (src.hasWhenHandedOver()) - tgt.setWhenHandedOver(src.getWhenHandedOver()); + if (src.hasWhenPreparedElement()) + tgt.setWhenPreparedElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getWhenPreparedElement())); + if (src.hasWhenHandedOverElement()) + tgt.setWhenHandedOverElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getWhenHandedOverElement())); if (src.hasDestination()) tgt.setDestination(VersionConvertor_30_50.convertReference(src.getDestination())); if (src.hasReceiver()) { @@ -219,8 +220,8 @@ public class MedicationDispense30_50 { return null; org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseSubstitutionComponent tgt = new org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseSubstitutionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasWasSubstituted()) - tgt.setWasSubstituted(src.getWasSubstituted()); + if (src.hasWasSubstitutedElement()) + tgt.setWasSubstitutedElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getWasSubstitutedElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasReason()) { @@ -237,8 +238,8 @@ public class MedicationDispense30_50 { return null; org.hl7.fhir.dstu3.model.MedicationDispense.MedicationDispenseSubstitutionComponent tgt = new org.hl7.fhir.dstu3.model.MedicationDispense.MedicationDispenseSubstitutionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasWasSubstituted()) - tgt.setWasSubstituted(src.getWasSubstituted()); + if (src.hasWasSubstitutedElement()) + tgt.setWasSubstitutedElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getWasSubstitutedElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasReason()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationRequest30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationRequest30_50.java index 1152166e8..b8d31e764 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationRequest30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationRequest30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import java.util.Collections; public class MedicationRequest30_50 { @@ -34,8 +35,8 @@ public class MedicationRequest30_50 { if (src.hasSupportingInformation()) { for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasAuthoredOn()) - tgt.setAuthoredOn(src.getAuthoredOn()); + if (src.hasAuthoredOnElement()) + tgt.setAuthoredOnElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getAuthoredOnElement())); if (src.hasRecorder()) tgt.setRecorder(VersionConvertor_30_50.convertReference(src.getRecorder())); for (CodeableReference t : src.getReason()) { @@ -95,8 +96,8 @@ public class MedicationRequest30_50 { if (src.hasSupportingInformation()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t)); } - if (src.hasAuthoredOn()) - tgt.setAuthoredOn(src.getAuthoredOn()); + if (src.hasAuthoredOnElement()) + tgt.setAuthoredOnElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getAuthoredOnElement())); if (src.hasRecorder()) tgt.setRecorder(VersionConvertor_30_50.convertReference(src.getRecorder())); if (src.hasReasonCode()) { @@ -133,8 +134,8 @@ public class MedicationRequest30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasValidityPeriod()) tgt.setValidityPeriod(VersionConvertor_30_50.convertPeriod(src.getValidityPeriod())); - if (src.hasNumberOfRepeatsAllowed()) - tgt.setNumberOfRepeatsAllowed(src.getNumberOfRepeatsAllowed()); + if (src.hasNumberOfRepeatsAllowedElement()) + tgt.setNumberOfRepeatsAllowedElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getNumberOfRepeatsAllowedElement())); if (src.hasQuantity()) tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); if (src.hasExpectedSupplyDuration()) @@ -151,8 +152,8 @@ public class MedicationRequest30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasValidityPeriod()) tgt.setValidityPeriod(VersionConvertor_30_50.convertPeriod(src.getValidityPeriod())); - if (src.hasNumberOfRepeatsAllowed()) - tgt.setNumberOfRepeatsAllowed(src.getNumberOfRepeatsAllowed()); + if (src.hasNumberOfRepeatsAllowedElement()) + tgt.setNumberOfRepeatsAllowedElement((org.hl7.fhir.dstu3.model.PositiveIntType) VersionConvertor_30_50.convertType(src.getNumberOfRepeatsAllowedElement())); if (src.hasQuantity()) tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); if (src.hasExpectedSupplyDuration()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java index 941f15e0e..5b7a1050c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java @@ -3,6 +3,9 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import org.hl7.fhir.r5.model.DateTimeType; + +import java.util.Collections; public class MedicationStatement30_50 { @@ -30,8 +33,8 @@ public class MedicationStatement30_50 { tgt.setMedication(VersionConvertor_30_50.convertType(src.getMedication())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasDateAsserted()) - tgt.setDateAsserted(src.getDateAsserted()); + if (src.hasDateAssertedElement()) + tgt.setDateAssertedElement((DateTimeType) VersionConvertor_30_50.convertType(src.getDateAssertedElement())); if (src.hasInformationSource()) tgt.setInformationSource(VersionConvertor_30_50.convertReference(src.getInformationSource())); if (src.hasSubject()) @@ -78,8 +81,8 @@ public class MedicationStatement30_50 { tgt.setMedication(VersionConvertor_30_50.convertType(src.getMedication())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasDateAsserted()) - tgt.setDateAsserted(src.getDateAsserted()); + if (src.hasDateAssertedElement()) + tgt.setDateAssertedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateAssertedElement())); if (src.hasInformationSource()) tgt.setInformationSource(VersionConvertor_30_50.convertReference(src.getInformationSource())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageDefinition30_50.java index befeca5c7..77bc33b9f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageDefinition30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class MessageDefinition30_50 { @@ -10,39 +11,39 @@ public class MessageDefinition30_50 { return null; org.hl7.fhir.dstu3.model.MessageDefinition tgt = new org.hl7.fhir.dstu3.model.MessageDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifierFirstRep())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasBase()) tgt.setBase(VersionConvertor_30_50.convertCanonicalToReference(src.getBaseElement())); if (src.hasParent()) { @@ -71,39 +72,39 @@ public class MessageDefinition30_50 { return null; org.hl7.fhir.r5.model.MessageDefinition tgt = new org.hl7.fhir.r5.model.MessageDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasBase()) tgt.setBaseElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getBase())); if (src.hasParent()) { @@ -134,8 +135,8 @@ public class MessageDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMessage()) tgt.setMessage(VersionConvertor_30_50.convertCanonicalToReference(src.getMessageElement())); - if (src.hasSituation()) - tgt.setSituation(src.getSituation()); + if (src.hasSituationElement()) + tgt.setSituationElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getSituationElement())); return tgt; } @@ -146,8 +147,8 @@ public class MessageDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasMessage()) tgt.setMessageElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getMessage())); - if (src.hasSituation()) - tgt.setSituation(src.getSituation()); + if (src.hasSituationElement()) + tgt.setSituationElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getSituationElement())); return tgt; } @@ -156,14 +157,14 @@ public class MessageDefinition30_50 { return null; org.hl7.fhir.dstu3.model.MessageDefinition.MessageDefinitionFocusComponent tgt = new org.hl7.fhir.dstu3.model.MessageDefinition.MessageDefinitionFocusComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCanonicalToReference(src.getProfileElement())); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); return tgt; } @@ -172,14 +173,14 @@ public class MessageDefinition30_50 { return null; org.hl7.fhir.r5.model.MessageDefinition.MessageDefinitionFocusComponent tgt = new org.hl7.fhir.r5.model.MessageDefinition.MessageDefinitionFocusComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasProfile()) tgt.setProfileElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getProfile())); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageHeader30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageHeader30_50.java index c3dcddcef..7b5b63839 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageHeader30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MessageHeader30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class MessageHeader30_50 { @@ -10,12 +11,12 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.dstu3.model.MessageHeader.MessageDestinationComponent tgt = new org.hl7.fhir.dstu3.model.MessageHeader.MessageDestinationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasTarget()) tgt.setTarget(VersionConvertor_30_50.convertReference(src.getTarget())); - if (src.hasEndpoint()) - tgt.setEndpoint(src.getEndpoint()); + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getEndpointElement())); return tgt; } @@ -24,12 +25,12 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.r5.model.MessageHeader.MessageDestinationComponent tgt = new org.hl7.fhir.r5.model.MessageHeader.MessageDestinationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasTarget()) tgt.setTarget(VersionConvertor_30_50.convertReference(src.getTarget())); - if (src.hasEndpoint()) - tgt.setEndpoint(src.getEndpoint()); + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getEndpointElement())); return tgt; } @@ -98,8 +99,8 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.r5.model.MessageHeader.MessageHeaderResponseComponent tgt = new org.hl7.fhir.r5.model.MessageHeader.MessageHeaderResponseComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentifier()) - tgt.setIdentifier(src.getIdentifier()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getIdentifierElement())); if (src.hasCode()) tgt.setCode(convertResponseType(src.getCode())); if (src.hasDetails()) @@ -112,8 +113,8 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.dstu3.model.MessageHeader.MessageHeaderResponseComponent tgt = new org.hl7.fhir.dstu3.model.MessageHeader.MessageHeaderResponseComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentifier()) - tgt.setIdentifier(src.getIdentifier()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getIdentifierElement())); if (src.hasCode()) tgt.setCode(convertResponseType(src.getCode())); if (src.hasDetails()) @@ -126,16 +127,16 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.dstu3.model.MessageHeader.MessageSourceComponent tgt = new org.hl7.fhir.dstu3.model.MessageHeader.MessageSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasSoftware()) - tgt.setSoftware(src.getSoftware()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasSoftwareElement()) + tgt.setSoftwareElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getSoftwareElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); if (src.hasContact()) tgt.setContact(VersionConvertor_30_50.convertContactPoint(src.getContact())); - if (src.hasEndpoint()) - tgt.setEndpoint(src.getEndpoint()); + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getEndpointElement())); return tgt; } @@ -144,16 +145,16 @@ public class MessageHeader30_50 { return null; org.hl7.fhir.r5.model.MessageHeader.MessageSourceComponent tgt = new org.hl7.fhir.r5.model.MessageHeader.MessageSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasSoftware()) - tgt.setSoftware(src.getSoftware()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasSoftwareElement()) + tgt.setSoftwareElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getSoftwareElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); if (src.hasContact()) tgt.setContact(VersionConvertor_30_50.convertContactPoint(src.getContact())); - if (src.hasEndpoint()) - tgt.setEndpoint(src.getEndpoint()); + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getEndpointElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/NamingSystem30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/NamingSystem30_50.java index 0607be788..25268a1f1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/NamingSystem30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/NamingSystem30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class NamingSystem30_50 { @@ -10,33 +11,33 @@ public class NamingSystem30_50 { return null; org.hl7.fhir.dstu3.model.NamingSystem tgt = new org.hl7.fhir.dstu3.model.NamingSystem(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertNamingSystemType(src.getKind())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasResponsible()) - tgt.setResponsible(src.getResponsible()); + if (src.hasResponsibleElement()) + tgt.setResponsibleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getResponsibleElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.r5.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -48,33 +49,33 @@ public class NamingSystem30_50 { return null; org.hl7.fhir.r5.model.NamingSystem tgt = new org.hl7.fhir.r5.model.NamingSystem(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertNamingSystemType(src.getKind())); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasResponsible()) - tgt.setResponsible(src.getResponsible()); + if (src.hasResponsibleElement()) + tgt.setResponsibleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getResponsibleElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.dstu3.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -152,12 +153,12 @@ public class NamingSystem30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertNamingSystemIdentifierType(src.getType())); - if (src.hasValue()) - tgt.setValue(src.getValue()); - if (src.hasPreferred()) - tgt.setPreferred(src.getPreferred()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getPreferredElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); return tgt; @@ -170,12 +171,12 @@ public class NamingSystem30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertNamingSystemIdentifierType(src.getType())); - if (src.hasValue()) - tgt.setValue(src.getValue()); - if (src.hasPreferred()) - tgt.setPreferred(src.getPreferred()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getPreferredElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Observation30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Observation30_50.java index e8505e201..c62952dcc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Observation30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Observation30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Observation30_50 { @@ -29,8 +30,8 @@ public class Observation30_50 { tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasPerformer()) { for (org.hl7.fhir.r5.model.Reference t : src.getPerformer()) tgt.addPerformer(VersionConvertor_30_50.convertReference(t)); } @@ -89,8 +90,8 @@ public class Observation30_50 { tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getContext())); if (src.hasEffective()) tgt.setEffective(VersionConvertor_30_50.convertType(src.getEffective())); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasPerformer()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getPerformer()) tgt.addPerformer(VersionConvertor_30_50.convertReference(t)); } @@ -177,8 +178,8 @@ public class Observation30_50 { } if (src.hasAge()) tgt.setAge(VersionConvertor_30_50.convertRange(src.getAge())); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); return tgt; } @@ -198,8 +199,8 @@ public class Observation30_50 { } if (src.hasAge()) tgt.setAge(VersionConvertor_30_50.convertRange(src.getAge())); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationDefinition30_50.java index a37f5828c..e9fbe4376 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationDefinition30_50.java @@ -2,9 +2,11 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_30_50; +import org.hl7.fhir.dstu3.model.CodeType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.DataType; import org.hl7.fhir.r5.model.Enumerations; +import java.util.Collections; public class OperationDefinition30_50 { @@ -13,52 +15,52 @@ public class OperationDefinition30_50 { return null; org.hl7.fhir.r5.model.OperationDefinition tgt = new org.hl7.fhir.r5.model.OperationDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertOperationKind(src.getKind())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); if (src.hasIdempotent()) tgt.setAffectsState(!src.getIdempotent()); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasBase()) tgt.setBaseElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getBase())); if (src.hasResource()) { for (org.hl7.fhir.dstu3.model.CodeType t : src.getResource()) tgt.addResource(t.getValue()); } - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasInstance()) - tgt.setInstance(src.getInstance()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getTypeElement())); + if (src.hasInstanceElement()) + tgt.setInstanceElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu3.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -73,52 +75,52 @@ public class OperationDefinition30_50 { return null; org.hl7.fhir.dstu3.model.OperationDefinition tgt = new org.hl7.fhir.dstu3.model.OperationDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertOperationKind(src.getKind())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); if (src.hasAffectsState()) tgt.setIdempotent(!src.getAffectsState()); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); if (src.hasBase()) tgt.setBase(VersionConvertor_30_50.convertCanonicalToReference(src.getBaseElement())); if (src.hasResource()) { for (org.hl7.fhir.r5.model.CodeType t : src.getResource()) tgt.addResource(t.getValue()); } - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasInstance()) - tgt.setInstance(src.getInstance()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getTypeElement())); + if (src.hasInstanceElement()) + tgt.setInstanceElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -136,8 +138,8 @@ public class OperationDefinition30_50 { if (src.hasParameterName()) { for (org.hl7.fhir.r5.model.StringType t : src.getParameterName()) tgt.addParameterName(t.getValue()); } - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -149,8 +151,8 @@ public class OperationDefinition30_50 { if (src.hasParameterName()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getParameterName()) tgt.addParameterName(t.getValue()); } - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -194,18 +196,18 @@ public class OperationDefinition30_50 { return null; org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasUse()) tgt.setUse(convertOperationParameterUse(src.getUse())); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasType()) - tgt.setType(Enumerations.FHIRAllTypes.fromCode(src.getType())); + tgt.setType(Enumerations.FHIRAllTypes.fromCode(src.getType())); if (src.hasSearchType()) tgt.setSearchType(VersionConvertor_30_50.convertSearchParamType(src.getSearchType())); if (src.hasProfile()) @@ -223,18 +225,18 @@ public class OperationDefinition30_50 { return null; org.hl7.fhir.dstu3.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.dstu3.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasUse()) tgt.setUse(convertOperationParameterUse(src.getUse())); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasType()) - tgt.setType(src.getType().toCode()); + tgt.setType(src.getType().toCode()); if (src.hasSearchType()) tgt.setSearchType(VersionConvertor_30_50.convertSearchParamType(src.getSearchType())); if (src.hasTargetProfile()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationOutcome30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationOutcome30_50.java index 63c65bd39..c1c2b02c9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationOutcome30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/OperationOutcome30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class OperationOutcome30_50 { @@ -206,8 +207,8 @@ public class OperationOutcome30_50 { tgt.setCode(convertIssueType(src.getCode())); if (src.hasDetails()) tgt.setDetails(VersionConvertor_30_50.convertCodeableConcept(src.getDetails())); - if (src.hasDiagnostics()) - tgt.setDiagnostics(src.getDiagnostics()); + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } @@ -228,8 +229,8 @@ public class OperationOutcome30_50 { tgt.setCode(convertIssueType(src.getCode())); if (src.hasDetails()) tgt.setDetails(VersionConvertor_30_50.convertCodeableConcept(src.getDetails())); - if (src.hasDiagnostics()) - tgt.setDiagnostics(src.getDiagnostics()); + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.r5.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Organization30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Organization30_50.java index ede2cca75..4debd26d7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Organization30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Organization30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Organization30_50 { @@ -13,13 +14,13 @@ public class Organization30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasType()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasAlias()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getAlias()) tgt.addAlias(t.getValue()); } @@ -48,13 +49,13 @@ public class Organization30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasType()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getType()) tgt.addType(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasAlias()) { for (org.hl7.fhir.r5.model.StringType t : src.getAlias()) tgt.addAlias(t.getValue()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Parameters30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Parameters30_50.java index 60a16958f..662940a2e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Parameters30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Parameters30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Parameters30_50 { @@ -32,8 +33,8 @@ public class Parameters30_50 { return null; org.hl7.fhir.r5.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.r5.model.Parameters.ParametersParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); if (src.hasResource()) @@ -49,8 +50,8 @@ public class Parameters30_50 { return null; org.hl7.fhir.dstu3.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.dstu3.model.Parameters.ParametersParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); if (src.hasResource()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Patient30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Patient30_50.java index 6cfa0950d..8088bec31 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Patient30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Patient30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Patient30_50 { @@ -124,8 +125,8 @@ public class Patient30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.dstu3.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_30_50.convertHumanName(t)); } @@ -134,8 +135,8 @@ public class Patient30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasDeceased()) tgt.setDeceased(VersionConvertor_30_50.convertType(src.getDeceased())); if (src.hasAddress()) { @@ -175,8 +176,8 @@ public class Patient30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.r5.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_30_50.convertHumanName(t)); } @@ -185,8 +186,8 @@ public class Patient30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasDeceased()) tgt.setDeceased(VersionConvertor_30_50.convertType(src.getDeceased())); if (src.hasAddress()) { @@ -225,8 +226,8 @@ public class Patient30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasLanguage()) tgt.setLanguage(VersionConvertor_30_50.convertCodeableConcept(src.getLanguage())); - if (src.hasPreferred()) - tgt.setPreferred(src.getPreferred()); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getPreferredElement())); return tgt; } @@ -237,8 +238,8 @@ public class Patient30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasLanguage()) tgt.setLanguage(VersionConvertor_30_50.convertCodeableConcept(src.getLanguage())); - if (src.hasPreferred()) - tgt.setPreferred(src.getPreferred()); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getPreferredElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PaymentNotice30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PaymentNotice30_50.java index 4a3844ffb..507f9e5e8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PaymentNotice30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PaymentNotice30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class PaymentNotice30_50 { @@ -21,8 +22,8 @@ public class PaymentNotice30_50 { tgt.setResponse(VersionConvertor_30_50.convertReference(src.getResponse())); if (src.hasPaymentDate()) tgt.setStatusDate(src.getPaymentDate()); - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getCreatedElement())); if (src.hasRecipient()) tgt.setTarget(VersionConvertor_30_50.convertReference(src.getRecipient())); if (src.hasProvider()) @@ -48,8 +49,8 @@ public class PaymentNotice30_50 { tgt.setResponse(VersionConvertor_30_50.convertReference(src.getResponse())); if (src.hasStatusDate()) tgt.setPaymentDate(src.getStatusDate()); - if (src.hasCreated()) - tgt.setCreated(src.getCreated()); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getCreatedElement())); if (src.hasTarget()) tgt.setRecipient(VersionConvertor_30_50.convertReference(src.getTarget())); if (src.hasProvider()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Person30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Person30_50.java index 286aa3dd8..393e811e1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Person30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Person30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Person30_50 { @@ -55,8 +56,8 @@ public class Person30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasAddress()) { for (org.hl7.fhir.r5.model.Address t : src.getAddress()) tgt.addAddress(VersionConvertor_30_50.convertAddress(t)); } @@ -64,8 +65,8 @@ public class Person30_50 { tgt.setPhoto(VersionConvertor_30_50.convertAttachment(src.getPhoto())); if (src.hasManagingOrganization()) tgt.setManagingOrganization(VersionConvertor_30_50.convertReference(src.getManagingOrganization())); - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasLink()) { for (org.hl7.fhir.r5.model.Person.PersonLinkComponent t : src.getLink()) tgt.addLink(convertPersonLinkComponent(t)); } @@ -88,8 +89,8 @@ public class Person30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasAddress()) { for (org.hl7.fhir.dstu3.model.Address t : src.getAddress()) tgt.addAddress(VersionConvertor_30_50.convertAddress(t)); } @@ -97,8 +98,8 @@ public class Person30_50 { tgt.setPhoto(VersionConvertor_30_50.convertAttachment(src.getPhoto())); if (src.hasManagingOrganization()) tgt.setManagingOrganization(VersionConvertor_30_50.convertReference(src.getManagingOrganization())); - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu3.model.Person.PersonLinkComponent t : src.getLink()) tgt.addLink(convertPersonLinkComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java index e4a492296..28137e5fe 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java @@ -4,6 +4,10 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.dstu3.model.ContactDetail; import org.hl7.fhir.dstu3.model.Contributor.ContributorType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.CodeType; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class PlanDefinition30_50 { @@ -280,37 +284,37 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.dstu3.model.PlanDefinition tgt = new org.hl7.fhir.dstu3.model.PlanDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -349,8 +353,8 @@ public class PlanDefinition30_50 { if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasRelatedArtifact()) { for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(VersionConvertor_30_50.convertRelatedArtifact(t)); } @@ -371,37 +375,37 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.r5.model.PlanDefinition tgt = new org.hl7.fhir.r5.model.PlanDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getUsageElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -426,8 +430,8 @@ public class PlanDefinition30_50 { if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasRelatedArtifact()) { for (org.hl7.fhir.dstu3.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(VersionConvertor_30_50.convertRelatedArtifact(t)); } @@ -450,12 +454,12 @@ public class PlanDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasLabel()) tgt.setPrefix(src.getLabel()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasTextEquivalent()) - tgt.setTextEquivalent(src.getTextEquivalent()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasTextEquivalentElement()) + tgt.setTextEquivalentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTextEquivalentElement())); if (src.hasCode()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -520,12 +524,12 @@ public class PlanDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasPrefix()) tgt.setLabel(src.getPrefix()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasTextEquivalent()) - tgt.setTextEquivalent(src.getTextEquivalent()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasTextEquivalentElement()) + tgt.setTextEquivalentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTextEquivalentElement())); if (src.hasCode()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCodeableConcept(t)); } @@ -590,12 +594,12 @@ public class PlanDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasKind()) tgt.setKind(convertActionConditionKind(src.getKind())); - if (src.hasDescription()) - tgt.getExpression().setDescription(src.getDescription()); - if (src.hasLanguage()) - tgt.getExpression().setLanguage(src.getLanguage()); - if (src.hasExpression()) - tgt.getExpression().setExpression(src.getExpression()); + if (src.hasDescriptionElement()) + tgt.getExpression().setDescriptionElement((StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasLanguageElement()) + tgt.getExpression().setLanguageElement((CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); + if (src.hasExpressionElement()) + tgt.getExpression().setExpressionElement((StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); return tgt; } @@ -606,12 +610,12 @@ public class PlanDefinition30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasKind()) tgt.setKind(convertActionConditionKind(src.getKind())); - if (src.getExpression().hasDescription()) - tgt.setDescription(src.getExpression().getDescription()); - if (src.getExpression().hasLanguage()) - tgt.setLanguage(src.getExpression().getLanguage()); - if (src.getExpression().hasExpression()) - tgt.setExpression(src.getExpression().getExpression()); + if (src.getExpression().hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getDescriptionElement())); + if (src.getExpression().hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getLanguageElement())); + if (src.getExpression().hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getExpressionElement())); return tgt; } @@ -620,14 +624,14 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionDynamicValueComponent tgt = new org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionDynamicValueComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.getExpression().hasDescription()) - tgt.setDescription(src.getExpression().getDescription()); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.getExpression().hasLanguage()) - tgt.setLanguage(src.getExpression().getLanguage()); - if (src.getExpression().hasExpression()) - tgt.setExpression(src.getExpression().getExpression()); + if (src.getExpression().hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getDescriptionElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.getExpression().hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getLanguageElement())); + if (src.getExpression().hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpression().getExpressionElement())); return tgt; } @@ -636,14 +640,14 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionDynamicValueComponent tgt = new org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionDynamicValueComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.getExpression().setDescription(src.getDescription()); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasLanguage()) - tgt.getExpression().setLanguage(src.getLanguage()); - if (src.hasExpression()) - tgt.getExpression().setExpression(src.getExpression()); + if (src.hasDescriptionElement()) + tgt.getExpression().setDescriptionElement((StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPathElement()) + tgt.setPathElement((StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasLanguageElement()) + tgt.getExpression().setLanguageElement((CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); + if (src.hasExpressionElement()) + tgt.getExpression().setExpressionElement((StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); return tgt; } @@ -676,8 +680,8 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasActionId()) - tgt.setActionId(src.getActionId()); + if (src.hasActionIdElement()) + tgt.setActionIdElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getActionIdElement())); if (src.hasRelationship()) tgt.setRelationship(convertActionRelationshipType(src.getRelationship())); if (src.hasOffset()) @@ -690,8 +694,8 @@ public class PlanDefinition30_50 { return null; org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasActionId()) - tgt.setActionId(src.getActionId()); + if (src.hasActionIdElement()) + tgt.setActionIdElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getActionIdElement())); if (src.hasRelationship()) tgt.setRelationship(convertActionRelationshipType(src.getRelationship())); if (src.hasOffset()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Practitioner30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Practitioner30_50.java index f020e55eb..9c8c20398 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Practitioner30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Practitioner30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Practitioner30_50 { @@ -13,8 +14,8 @@ public class Practitioner30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.dstu3.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_30_50.convertHumanName(t)); } @@ -26,8 +27,8 @@ public class Practitioner30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasPhoto()) { for (org.hl7.fhir.dstu3.model.Attachment t : src.getPhoto()) tgt.addPhoto(VersionConvertor_30_50.convertAttachment(t)); } @@ -48,8 +49,8 @@ public class Practitioner30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.r5.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_30_50.convertHumanName(t)); } @@ -61,8 +62,8 @@ public class Practitioner30_50 { } if (src.hasGender()) tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - if (src.hasBirthDate()) - tgt.setBirthDate(src.getBirthDate()); + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); if (src.hasPhoto()) { for (org.hl7.fhir.r5.model.Attachment t : src.getPhoto()) tgt.addPhoto(VersionConvertor_30_50.convertAttachment(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PractitionerRole30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PractitionerRole30_50.java index 8e52842c5..ba3a9aea7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PractitionerRole30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PractitionerRole30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class PractitionerRole30_50 { @@ -36,8 +37,8 @@ public class PractitionerRole30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); if (src.hasPractitioner()) @@ -65,8 +66,8 @@ public class PractitionerRole30_50 { if (src.hasNotAvailable()) { for (org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleNotAvailableComponent t : src.getNotAvailable()) tgt.addNotAvailable(convertPractitionerRoleNotAvailableComponent(t)); } - if (src.hasAvailabilityExceptions()) - tgt.setAvailabilityExceptions(src.getAvailabilityExceptions()); + if (src.hasAvailabilityExceptionsElement()) + tgt.setAvailabilityExceptionsElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getAvailabilityExceptionsElement())); if (src.hasEndpoint()) { for (org.hl7.fhir.r5.model.Reference t : src.getEndpoint()) tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } @@ -81,8 +82,8 @@ public class PractitionerRole30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasPeriod()) tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); if (src.hasPractitioner()) @@ -110,8 +111,8 @@ public class PractitionerRole30_50 { if (src.hasNotAvailable()) { for (org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleNotAvailableComponent t : src.getNotAvailable()) tgt.addNotAvailable(convertPractitionerRoleNotAvailableComponent(t)); } - if (src.hasAvailabilityExceptions()) - tgt.setAvailabilityExceptions(src.getAvailabilityExceptions()); + if (src.hasAvailabilityExceptionsElement()) + tgt.setAvailabilityExceptionsElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getAvailabilityExceptionsElement())); if (src.hasEndpoint()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getEndpoint()) tgt.addEndpoint(VersionConvertor_30_50.convertReference(t)); } @@ -126,12 +127,12 @@ public class PractitionerRole30_50 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.r5.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_30_50.copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek2(t.getValue()))); } - if (src.hasAllDay()) - tgt.setAllDay(src.getAllDay()); - if (src.hasAvailableStartTime()) - tgt.setAvailableStartTime(src.getAvailableStartTime()); - if (src.hasAvailableEndTime()) - tgt.setAvailableEndTime(src.getAvailableEndTime()); + if (src.hasAllDayElement()) + tgt.setAllDayElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.dstu3.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.dstu3.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -143,12 +144,12 @@ public class PractitionerRole30_50 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.dstu3.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_30_50.copyElement(t, tgt.addDaysOfWeekElement().setValue(VersionConvertor_30_50.convertDaysOfWeek(t.getValue()))); } - if (src.hasAllDay()) - tgt.setAllDay(src.getAllDay()); - if (src.hasAvailableStartTime()) - tgt.setAvailableStartTime(src.getAvailableStartTime()); - if (src.hasAvailableEndTime()) - tgt.setAvailableEndTime(src.getAvailableEndTime()); + if (src.hasAllDayElement()) + tgt.setAllDayElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.r5.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.r5.model.TimeType) VersionConvertor_30_50.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -157,8 +158,8 @@ public class PractitionerRole30_50 { return null; org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleNotAvailableComponent tgt = new org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleNotAvailableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasDuring()) tgt.setDuring(VersionConvertor_30_50.convertPeriod(src.getDuring())); return tgt; @@ -169,8 +170,8 @@ public class PractitionerRole30_50 { return null; org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleNotAvailableComponent tgt = new org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleNotAvailableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasDuring()) tgt.setDuring(VersionConvertor_30_50.convertPeriod(src.getDuring())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java index cad6c5685..8a07aad3c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Questionnaire; +import java.util.Collections; public class Questionnaire30_50 { @@ -11,33 +12,33 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.r5.model.Questionnaire tgt = new org.hl7.fhir.r5.model.Questionnaire(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -49,8 +50,8 @@ public class Questionnaire30_50 { if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasCode()) { for (org.hl7.fhir.dstu3.model.Coding t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCoding(t)); } @@ -68,33 +69,33 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.dstu3.model.Questionnaire tgt = new org.hl7.fhir.dstu3.model.Questionnaire(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasApprovalDate()) - tgt.setApprovalDate(src.getApprovalDate()); - if (src.hasLastReviewDate()) - tgt.setLastReviewDate(src.getLastReviewDate()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasApprovalDateElement()) + tgt.setApprovalDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getApprovalDateElement())); + if (src.hasLastReviewDateElement()) + tgt.setLastReviewDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLastReviewDateElement())); if (src.hasEffectivePeriod()) tgt.setEffectivePeriod(VersionConvertor_30_50.convertPeriod(src.getEffectivePeriod())); if (src.hasUseContext()) { @@ -106,8 +107,8 @@ public class Questionnaire30_50 { if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasCode()) { for (org.hl7.fhir.r5.model.Coding t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCoding(t)); } @@ -125,30 +126,30 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getLinkIdElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasCode()) { for (org.hl7.fhir.r5.model.Coding t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCoding(t)); } - if (src.hasPrefix()) - tgt.setPrefix(src.getPrefix()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasPrefixElement()) + tgt.setPrefixElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPrefixElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasType()) tgt.setType(convertQuestionnaireItemType(src.getType())); if (src.hasEnableWhen()) { for (org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t)); } - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasRepeats()) - tgt.setRepeats(src.getRepeats()); - if (src.hasReadOnly()) - tgt.setReadOnly(src.getReadOnly()); - if (src.hasMaxLength()) - tgt.setMaxLength(src.getMaxLength()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getRepeatsElement())); + if (src.hasReadOnlyElement()) + tgt.setReadOnlyElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getReadOnlyElement())); + if (src.hasMaxLengthElement()) + tgt.setMaxLengthElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getMaxLengthElement())); if (src.hasAnswerValueSet()) tgt.setOptions(VersionConvertor_30_50.convertCanonicalToReference(src.getAnswerValueSetElement())); if (src.hasAnswerOption()) { @@ -167,31 +168,31 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getLinkIdElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); if (src.hasCode()) { for (org.hl7.fhir.dstu3.model.Coding t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCoding(t)); } - if (src.hasPrefix()) - tgt.setPrefix(src.getPrefix()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasPrefixElement()) + tgt.setPrefixElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPrefixElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasType()) tgt.setType(convertQuestionnaireItemType(src.getType())); if (src.hasEnableWhen()) { for (org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t)); } tgt.setEnableBehavior(Questionnaire.EnableWhenBehavior.ANY); - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasRepeats()) - tgt.setRepeats(src.getRepeats()); - if (src.hasReadOnly()) - tgt.setReadOnly(src.getReadOnly()); - if (src.hasMaxLength()) - tgt.setMaxLength(src.getMaxLength()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getRepeatsElement())); + if (src.hasReadOnlyElement()) + tgt.setReadOnlyElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getReadOnlyElement())); + if (src.hasMaxLengthElement()) + tgt.setMaxLengthElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getMaxLengthElement())); if (src.hasOptions()) tgt.setAnswerValueSetElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getOptions())); if (src.hasOption()) { @@ -213,8 +214,8 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemEnableWhenComponent tgt = new org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemEnableWhenComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasQuestion()) - tgt.setQuestion(src.getQuestion()); + if (src.hasQuestionElement()) + tgt.setQuestionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getQuestionElement())); if (src.hasOperator() && src.getOperator() == org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemOperator.EXISTS) tgt.setHasAnswer(src.getAnswerBooleanType().getValue()); else if (src.hasAnswer()) @@ -227,8 +228,8 @@ public class Questionnaire30_50 { return null; org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent tgt = new org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasQuestion()) - tgt.setQuestion(src.getQuestion()); + if (src.hasQuestionElement()) + tgt.setQuestionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getQuestionElement())); if (src.hasHasAnswer()) { tgt.setOperator(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemOperator.EXISTS); if (src.hasHasAnswerElement()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/QuestionnaireResponse30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/QuestionnaireResponse30_50.java index c3d56a30d..07b107e70 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/QuestionnaireResponse30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/QuestionnaireResponse30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class QuestionnaireResponse30_50 { @@ -26,8 +27,8 @@ public class QuestionnaireResponse30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasContext()) tgt.setEncounter(VersionConvertor_30_50.convertReference(src.getContext())); - if (src.hasAuthored()) - tgt.setAuthored(src.getAuthored()); + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getAuthoredElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); if (src.hasSource()) @@ -59,8 +60,8 @@ public class QuestionnaireResponse30_50 { tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); if (src.hasEncounter()) tgt.setContext(VersionConvertor_30_50.convertReference(src.getEncounter())); - if (src.hasAuthored()) - tgt.setAuthored(src.getAuthored()); + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getAuthoredElement())); if (src.hasAuthor()) tgt.setAuthor(VersionConvertor_30_50.convertReference(src.getAuthor())); if (src.hasSource()) @@ -102,12 +103,12 @@ public class QuestionnaireResponse30_50 { return null; org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getLinkIdElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } @@ -122,12 +123,12 @@ public class QuestionnaireResponse30_50 { return null; org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getLinkIdElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getDefinitionElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RelatedPerson30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RelatedPerson30_50.java index a086688d9..015325dcc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RelatedPerson30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RelatedPerson30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import java.util.List; +import java.util.Collections; public class RelatedPerson30_50 { @@ -14,9 +15,8 @@ public class RelatedPerson30_50 { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) { tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasPatient()) { tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); } @@ -35,9 +35,8 @@ public class RelatedPerson30_50 { if (src.hasGender()) { tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(tgt.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); for (org.hl7.fhir.r5.model.Address t : src.getAddress()) { tgt.addAddress(VersionConvertor_30_50.convertAddress(t)); } @@ -58,20 +57,13 @@ public class RelatedPerson30_50 { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) { tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) { - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasPatient()) { - if (src.hasPatient()) { - tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); - } + tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); } if (src.hasRelationship()) { - if (src.hasRelationship()) { - tgt.addRelationship(VersionConvertor_30_50.convertCodeableConcept(src.getRelationship())); - } + tgt.addRelationship(VersionConvertor_30_50.convertCodeableConcept(src.getRelationship())); } for (org.hl7.fhir.dstu3.model.HumanName t : src.getName()) { tgt.addName(VersionConvertor_30_50.convertHumanName(t)); @@ -80,13 +72,10 @@ public class RelatedPerson30_50 { tgt.addTelecom(VersionConvertor_30_50.convertContactPoint(t)); } if (src.hasGender()) { - if (src.hasGender()) { - tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); - } - } - if (src.hasBirthDate()) { - tgt.setBirthDate(tgt.getBirthDate()); + tgt.setGender(VersionConvertor_30_50.convertAdministrativeGender(src.getGender())); } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getBirthDateElement())); for (org.hl7.fhir.dstu3.model.Address t : src.getAddress()) { tgt.addAddress(VersionConvertor_30_50.convertAddress(t)); } @@ -94,9 +83,7 @@ public class RelatedPerson30_50 { tgt.addPhoto(VersionConvertor_30_50.convertAttachment(t)); } if (src.hasPeriod()) { - if (src.hasPeriod()) { - tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); - } + tgt.setPeriod(VersionConvertor_30_50.convertPeriod(src.getPeriod())); } return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RiskAssessment30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RiskAssessment30_50.java index 0306cd14e..29b09277b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RiskAssessment30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/RiskAssessment30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class RiskAssessment30_50 { @@ -44,8 +45,8 @@ public class RiskAssessment30_50 { if (src.hasPrediction()) { for (org.hl7.fhir.dstu3.model.RiskAssessment.RiskAssessmentPredictionComponent t : src.getPrediction()) tgt.addPrediction(convertRiskAssessmentPredictionComponent(t)); } - if (src.hasMitigation()) - tgt.setMitigation(src.getMitigation()); + if (src.hasMitigationElement()) + tgt.setMitigationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getMitigationElement())); if (src.hasComment()) tgt.addNote().setText(src.getComment()); return tgt; @@ -88,8 +89,8 @@ public class RiskAssessment30_50 { if (src.hasPrediction()) { for (org.hl7.fhir.r5.model.RiskAssessment.RiskAssessmentPredictionComponent t : src.getPrediction()) tgt.addPrediction(convertRiskAssessmentPredictionComponent(t)); } - if (src.hasMitigation()) - tgt.setMitigation(src.getMitigation()); + if (src.hasMitigationElement()) + tgt.setMitigationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getMitigationElement())); if (src.hasNote()) tgt.setComment(src.getNoteFirstRep().getText()); return tgt; @@ -106,12 +107,12 @@ public class RiskAssessment30_50 { tgt.setProbability(VersionConvertor_30_50.convertType(src.getProbability())); if (src.hasQualitativeRisk()) tgt.setQualitativeRisk(VersionConvertor_30_50.convertCodeableConcept(src.getQualitativeRisk())); - if (src.hasRelativeRisk()) - tgt.setRelativeRisk(src.getRelativeRisk()); + if (src.hasRelativeRiskElement()) + tgt.setRelativeRiskElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getRelativeRiskElement())); if (src.hasWhen()) tgt.setWhen(VersionConvertor_30_50.convertType(src.getWhen())); - if (src.hasRationale()) - tgt.setRationale(src.getRationale()); + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getRationaleElement())); return tgt; } @@ -126,12 +127,12 @@ public class RiskAssessment30_50 { tgt.setProbability(VersionConvertor_30_50.convertType(src.getProbability())); if (src.hasQualitativeRisk()) tgt.setQualitativeRisk(VersionConvertor_30_50.convertCodeableConcept(src.getQualitativeRisk())); - if (src.hasRelativeRisk()) - tgt.setRelativeRisk(src.getRelativeRisk()); + if (src.hasRelativeRiskElement()) + tgt.setRelativeRiskElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getRelativeRiskElement())); if (src.hasWhen()) tgt.setWhen(VersionConvertor_30_50.convertType(src.getWhen())); - if (src.hasRationale()) - tgt.setRationale(src.getRationale()); + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getRationaleElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Schedule30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Schedule30_50.java index c3f52e6b4..9ea04a9e1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Schedule30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Schedule30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Schedule30_50 { @@ -13,8 +14,8 @@ public class Schedule30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasServiceCategory()) tgt.setServiceCategory(VersionConvertor_30_50.convertCodeableConcept(src.getServiceCategoryFirstRep())); if (src.hasServiceType()) { @@ -28,8 +29,8 @@ public class Schedule30_50 { } if (src.hasPlanningHorizon()) tgt.setPlanningHorizon(VersionConvertor_30_50.convertPeriod(src.getPlanningHorizon())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -41,8 +42,8 @@ public class Schedule30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasActive()) - tgt.setActive(src.getActive()); + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getActiveElement())); if (src.hasServiceCategory()) tgt.addServiceCategory(VersionConvertor_30_50.convertCodeableConcept(src.getServiceCategory())); if (src.hasServiceType()) { @@ -56,8 +57,8 @@ public class Schedule30_50 { } if (src.hasPlanningHorizon()) tgt.setPlanningHorizon(VersionConvertor_30_50.convertPeriod(src.getPlanningHorizon())); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SearchParameter30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SearchParameter30_50.java index dcdee763b..27da8003f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SearchParameter30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SearchParameter30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class SearchParameter30_50 { @@ -122,20 +123,20 @@ public class SearchParameter30_50 { return null; org.hl7.fhir.r5.model.SearchParameter tgt = new org.hl7.fhir.r5.model.SearchParameter(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } @@ -145,23 +146,23 @@ public class SearchParameter30_50 { if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasBase()) { for (org.hl7.fhir.dstu3.model.CodeType t : src.getBase()) tgt.addBase(t.getValue()); } if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertSearchParamType(src.getType())); - if (src.hasDerivedFrom()) - tgt.setDerivedFrom(src.getDerivedFrom()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasXpath()) - tgt.setXpath(src.getXpath()); + if (src.hasDerivedFromElement()) + tgt.setDerivedFromElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getDerivedFromElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getXpathElement())); if (src.hasXpathUsage()) tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); if (src.hasTarget()) { @@ -187,20 +188,20 @@ public class SearchParameter30_50 { return null; org.hl7.fhir.dstu3.model.SearchParameter tgt = new org.hl7.fhir.dstu3.model.SearchParameter(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } @@ -210,23 +211,23 @@ public class SearchParameter30_50 { if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); if (src.hasBase()) { for (org.hl7.fhir.r5.model.CodeType t : src.getBase()) tgt.addBase(t.getValue()); } if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertSearchParamType(src.getType())); - if (src.hasDerivedFrom()) - tgt.setDerivedFrom(src.getDerivedFrom()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasXpath()) - tgt.setXpath(src.getXpath()); + if (src.hasDerivedFromElement()) + tgt.setDerivedFromElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getDerivedFromElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getXpathElement())); if (src.hasXpathUsage()) tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); if (src.hasTarget()) { @@ -254,8 +255,8 @@ public class SearchParameter30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasDefinition()) tgt.setDefinitionElement(VersionConvertor_30_50.convertReferenceToCanonical(src.getDefinition())); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); return tgt; } @@ -266,8 +267,8 @@ public class SearchParameter30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasDefinition()) tgt.setDefinition(VersionConvertor_30_50.convertCanonicalToReference(src.getDefinitionElement())); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Sequence30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Sequence30_50.java index 1bb80be78..32ec7331f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Sequence30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Sequence30_50.java @@ -1,7 +1,13 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class Sequence30_50 { @@ -126,8 +132,8 @@ public class Sequence30_50 { } if (src.hasType()) tgt.setType(convertSequenceType(src.getType())); - if (src.hasCoordinateSystem()) - tgt.setCoordinateSystem(src.getCoordinateSystem()); + if (src.hasCoordinateSystemElement()) + tgt.setCoordinateSystemElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getCoordinateSystemElement())); if (src.hasPatient()) tgt.setPatient(VersionConvertor_30_50.convertReference(src.getPatient())); if (src.hasSpecimen()) @@ -143,13 +149,13 @@ public class Sequence30_50 { if (src.hasVariant()) { for (org.hl7.fhir.r5.model.MolecularSequence.MolecularSequenceVariantComponent t : src.getVariant()) tgt.addVariant(convertSequenceVariantComponent(t)); } - if (src.hasObservedSeq()) - tgt.setObservedSeq(src.getObservedSeq()); + if (src.hasObservedSeqElement()) + tgt.setObservedSeqElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getObservedSeqElement())); if (src.hasQuality()) { for (org.hl7.fhir.r5.model.MolecularSequence.MolecularSequenceQualityComponent t : src.getQuality()) tgt.addQuality(convertSequenceQualityComponent(t)); } - if (src.hasReadCoverage()) - tgt.setReadCoverage(src.getReadCoverage()); + if (src.hasReadCoverageElement()) + tgt.setReadCoverageElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getReadCoverageElement())); if (src.hasRepository()) { for (org.hl7.fhir.r5.model.MolecularSequence.MolecularSequenceRepositoryComponent t : src.getRepository()) tgt.addRepository(convertSequenceRepositoryComponent(t)); } @@ -168,30 +174,30 @@ public class Sequence30_50 { tgt.setType(convertQualityType(src.getType())); if (src.hasStandardSequence()) tgt.setStandardSequence(VersionConvertor_30_50.convertCodeableConcept(src.getStandardSequence())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); + if (src.hasStartElement()) + tgt.setStartElement((IntegerType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((IntegerType) VersionConvertor_30_50.convertType(src.getEndElement())); if (src.hasScore()) tgt.setScore(VersionConvertor_30_50.convertQuantity(src.getScore())); if (src.hasMethod()) tgt.setMethod(VersionConvertor_30_50.convertCodeableConcept(src.getMethod())); - if (src.hasTruthTP()) - tgt.setTruthTP(src.getTruthTP()); - if (src.hasQueryTP()) - tgt.setQueryTP(src.getQueryTP()); - if (src.hasTruthFN()) - tgt.setTruthFN(src.getTruthFN()); - if (src.hasQueryFP()) - tgt.setQueryFP(src.getQueryFP()); - if (src.hasGtFP()) - tgt.setGtFP(src.getGtFP()); - if (src.hasPrecision()) - tgt.setPrecision(src.getPrecision()); - if (src.hasRecall()) - tgt.setRecall(src.getRecall()); - if (src.hasFScore()) - tgt.setFScore(src.getFScore()); + if (src.hasTruthTPElement()) + tgt.setTruthTPElement((DecimalType) VersionConvertor_30_50.convertType(src.getTruthTPElement())); + if (src.hasQueryTPElement()) + tgt.setQueryTPElement((DecimalType) VersionConvertor_30_50.convertType(src.getQueryTPElement())); + if (src.hasTruthFNElement()) + tgt.setTruthFNElement((DecimalType) VersionConvertor_30_50.convertType(src.getTruthFNElement())); + if (src.hasQueryFPElement()) + tgt.setQueryFPElement((DecimalType) VersionConvertor_30_50.convertType(src.getQueryFPElement())); + if (src.hasGtFPElement()) + tgt.setGtFPElement((DecimalType) VersionConvertor_30_50.convertType(src.getGtFPElement())); + if (src.hasPrecisionElement()) + tgt.setPrecisionElement((DecimalType) VersionConvertor_30_50.convertType(src.getPrecisionElement())); + if (src.hasRecallElement()) + tgt.setRecallElement((DecimalType) VersionConvertor_30_50.convertType(src.getRecallElement())); + if (src.hasFScoreElement()) + tgt.setFScoreElement((DecimalType) VersionConvertor_30_50.convertType(src.getFScoreElement())); return tgt; } @@ -204,30 +210,30 @@ public class Sequence30_50 { tgt.setType(convertQualityType(src.getType())); if (src.hasStandardSequence()) tgt.setStandardSequence(VersionConvertor_30_50.convertCodeableConcept(src.getStandardSequence())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getEndElement())); if (src.hasScore()) tgt.setScore(VersionConvertor_30_50.convertQuantity(src.getScore())); if (src.hasMethod()) tgt.setMethod(VersionConvertor_30_50.convertCodeableConcept(src.getMethod())); - if (src.hasTruthTP()) - tgt.setTruthTP(src.getTruthTP()); - if (src.hasQueryTP()) - tgt.setQueryTP(src.getQueryTP()); - if (src.hasTruthFN()) - tgt.setTruthFN(src.getTruthFN()); - if (src.hasQueryFP()) - tgt.setQueryFP(src.getQueryFP()); - if (src.hasGtFP()) - tgt.setGtFP(src.getGtFP()); - if (src.hasPrecision()) - tgt.setPrecision(src.getPrecision()); - if (src.hasRecall()) - tgt.setRecall(src.getRecall()); - if (src.hasFScore()) - tgt.setFScore(src.getFScore()); + if (src.hasTruthTPElement()) + tgt.setTruthTPElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getTruthTPElement())); + if (src.hasQueryTPElement()) + tgt.setQueryTPElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getQueryTPElement())); + if (src.hasTruthFNElement()) + tgt.setTruthFNElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getTruthFNElement())); + if (src.hasQueryFPElement()) + tgt.setQueryFPElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getQueryFPElement())); + if (src.hasGtFPElement()) + tgt.setGtFPElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getGtFPElement())); + if (src.hasPrecisionElement()) + tgt.setPrecisionElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getPrecisionElement())); + if (src.hasRecallElement()) + tgt.setRecallElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getRecallElement())); + if (src.hasFScoreElement()) + tgt.setFScoreElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getFScoreElement())); return tgt; } @@ -238,18 +244,18 @@ public class Sequence30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasChromosome()) tgt.setChromosome(VersionConvertor_30_50.convertCodeableConcept(src.getChromosome())); - if (src.hasGenomeBuild()) - tgt.setGenomeBuild(src.getGenomeBuild()); + if (src.hasGenomeBuildElement()) + tgt.setGenomeBuildElement((StringType) VersionConvertor_30_50.convertType(src.getGenomeBuildElement())); if (src.hasReferenceSeqId()) tgt.setReferenceSeqId(VersionConvertor_30_50.convertCodeableConcept(src.getReferenceSeqId())); if (src.hasReferenceSeqPointer()) tgt.setReferenceSeqPointer(VersionConvertor_30_50.convertReference(src.getReferenceSeqPointer())); - if (src.hasReferenceSeqString()) - tgt.setReferenceSeqString(src.getReferenceSeqString()); - if (src.hasWindowStart()) - tgt.setWindowStart(src.getWindowStart()); - if (src.hasWindowEnd()) - tgt.setWindowEnd(src.getWindowEnd()); + if (src.hasReferenceSeqStringElement()) + tgt.setReferenceSeqStringElement((StringType) VersionConvertor_30_50.convertType(src.getReferenceSeqStringElement())); + if (src.hasWindowStartElement()) + tgt.setWindowStartElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getWindowStartElement())); + if (src.hasWindowEndElement()) + tgt.setWindowEndElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getWindowEndElement())); return tgt; } @@ -260,18 +266,18 @@ public class Sequence30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasChromosome()) tgt.setChromosome(VersionConvertor_30_50.convertCodeableConcept(src.getChromosome())); - if (src.hasGenomeBuild()) - tgt.setGenomeBuild(src.getGenomeBuild()); + if (src.hasGenomeBuildElement()) + tgt.setGenomeBuildElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getGenomeBuildElement())); if (src.hasReferenceSeqId()) tgt.setReferenceSeqId(VersionConvertor_30_50.convertCodeableConcept(src.getReferenceSeqId())); if (src.hasReferenceSeqPointer()) tgt.setReferenceSeqPointer(VersionConvertor_30_50.convertReference(src.getReferenceSeqPointer())); - if (src.hasReferenceSeqString()) - tgt.setReferenceSeqString(src.getReferenceSeqString()); - if (src.hasWindowStart()) - tgt.setWindowStart(src.getWindowStart()); - if (src.hasWindowEnd()) - tgt.setWindowEnd(src.getWindowEnd()); + if (src.hasReferenceSeqStringElement()) + tgt.setReferenceSeqStringElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getReferenceSeqStringElement())); + if (src.hasWindowStartElement()) + tgt.setWindowStartElement((IntegerType) VersionConvertor_30_50.convertType(src.getWindowStartElement())); + if (src.hasWindowEndElement()) + tgt.setWindowEndElement((IntegerType) VersionConvertor_30_50.convertType(src.getWindowEndElement())); return tgt; } @@ -282,16 +288,16 @@ public class Sequence30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertRepositoryType(src.getType())); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDatasetId()) - tgt.setDatasetId(src.getDatasetId()); - if (src.hasVariantsetId()) - tgt.setVariantsetId(src.getVariantsetId()); - if (src.hasReadsetId()) - tgt.setReadsetId(src.getReadsetId()); + if (src.hasUrlElement()) + tgt.setUrlElement((UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDatasetIdElement()) + tgt.setDatasetIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDatasetIdElement())); + if (src.hasVariantsetIdElement()) + tgt.setVariantsetIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVariantsetIdElement())); + if (src.hasReadsetIdElement()) + tgt.setReadsetIdElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getReadsetIdElement())); return tgt; } @@ -302,16 +308,16 @@ public class Sequence30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertRepositoryType(src.getType())); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDatasetId()) - tgt.setDatasetId(src.getDatasetId()); - if (src.hasVariantsetId()) - tgt.setVariantsetId(src.getVariantsetId()); - if (src.hasReadsetId()) - tgt.setReadsetId(src.getReadsetId()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDatasetIdElement()) + tgt.setDatasetIdElement((StringType) VersionConvertor_30_50.convertType(src.getDatasetIdElement())); + if (src.hasVariantsetIdElement()) + tgt.setVariantsetIdElement((StringType) VersionConvertor_30_50.convertType(src.getVariantsetIdElement())); + if (src.hasReadsetIdElement()) + tgt.setReadsetIdElement((StringType) VersionConvertor_30_50.convertType(src.getReadsetIdElement())); return tgt; } @@ -350,16 +356,16 @@ public class Sequence30_50 { return null; org.hl7.fhir.dstu3.model.Sequence.SequenceVariantComponent tgt = new org.hl7.fhir.dstu3.model.Sequence.SequenceVariantComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasObservedAllele()) - tgt.setObservedAllele(src.getObservedAllele()); - if (src.hasReferenceAllele()) - tgt.setReferenceAllele(src.getReferenceAllele()); - if (src.hasCigar()) - tgt.setCigar(src.getCigar()); + if (src.hasStartElement()) + tgt.setStartElement((IntegerType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((IntegerType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasObservedAlleleElement()) + tgt.setObservedAlleleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getObservedAlleleElement())); + if (src.hasReferenceAlleleElement()) + tgt.setReferenceAlleleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getReferenceAlleleElement())); + if (src.hasCigarElement()) + tgt.setCigarElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCigarElement())); if (src.hasVariantPointer()) tgt.setVariantPointer(VersionConvertor_30_50.convertReference(src.getVariantPointer())); return tgt; @@ -370,16 +376,16 @@ public class Sequence30_50 { return null; org.hl7.fhir.r5.model.MolecularSequence.MolecularSequenceVariantComponent tgt = new org.hl7.fhir.r5.model.MolecularSequence.MolecularSequenceVariantComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasObservedAllele()) - tgt.setObservedAllele(src.getObservedAllele()); - if (src.hasReferenceAllele()) - tgt.setReferenceAllele(src.getReferenceAllele()); - if (src.hasCigar()) - tgt.setCigar(src.getCigar()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasObservedAlleleElement()) + tgt.setObservedAlleleElement((StringType) VersionConvertor_30_50.convertType(src.getObservedAlleleElement())); + if (src.hasReferenceAlleleElement()) + tgt.setReferenceAlleleElement((StringType) VersionConvertor_30_50.convertType(src.getReferenceAlleleElement())); + if (src.hasCigarElement()) + tgt.setCigarElement((StringType) VersionConvertor_30_50.convertType(src.getCigarElement())); if (src.hasVariantPointer()) tgt.setVariantPointer(VersionConvertor_30_50.convertReference(src.getVariantPointer())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Slot30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Slot30_50.java index c28f09651..d7e29b30f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Slot30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Slot30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Slot30_50 { @@ -27,14 +28,14 @@ public class Slot30_50 { tgt.setSchedule(VersionConvertor_30_50.convertReference(src.getSchedule())); if (src.hasStatus()) tgt.setStatus(convertSlotStatus(src.getStatus())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasOverbooked()) - tgt.setOverbooked(src.getOverbooked()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasOverbookedElement()) + tgt.setOverbookedElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getOverbookedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -60,14 +61,14 @@ public class Slot30_50 { tgt.setSchedule(VersionConvertor_30_50.convertReference(src.getSchedule())); if (src.hasStatus()) tgt.setStatus(convertSlotStatus(src.getStatus())); - if (src.hasStart()) - tgt.setStart(src.getStart()); - if (src.hasEnd()) - tgt.setEnd(src.getEnd()); - if (src.hasOverbooked()) - tgt.setOverbooked(src.getOverbooked()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu3.model.InstantType) VersionConvertor_30_50.convertType(src.getEndElement())); + if (src.hasOverbookedElement()) + tgt.setOverbookedElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getOverbookedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Specimen30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Specimen30_50.java index 87a537aef..ccbe05d20 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Specimen30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Specimen30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Specimen30_50 { @@ -21,8 +22,8 @@ public class Specimen30_50 { tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasReceivedTime()) - tgt.setReceivedTime(src.getReceivedTime()); + if (src.hasReceivedTimeElement()) + tgt.setReceivedTimeElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReceivedTimeElement())); if (src.hasParent()) { for (org.hl7.fhir.r5.model.Reference t : src.getParent()) tgt.addParent(VersionConvertor_30_50.convertReference(t)); } @@ -59,8 +60,8 @@ public class Specimen30_50 { tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasSubject()) tgt.setSubject(VersionConvertor_30_50.convertReference(src.getSubject())); - if (src.hasReceivedTime()) - tgt.setReceivedTime(src.getReceivedTime()); + if (src.hasReceivedTimeElement()) + tgt.setReceivedTimeElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getReceivedTimeElement())); if (src.hasParent()) { for (org.hl7.fhir.dstu3.model.Reference t : src.getParent()) tgt.addParent(VersionConvertor_30_50.convertReference(t)); } @@ -125,8 +126,8 @@ public class Specimen30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasCapacity()) @@ -146,8 +147,8 @@ public class Specimen30_50 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasType()) tgt.setType(VersionConvertor_30_50.convertCodeableConcept(src.getType())); if (src.hasCapacity()) @@ -164,8 +165,8 @@ public class Specimen30_50 { return null; org.hl7.fhir.r5.model.Specimen.SpecimenProcessingComponent tgt = new org.hl7.fhir.r5.model.Specimen.SpecimenProcessingComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasProcedure()) tgt.setProcedure(VersionConvertor_30_50.convertCodeableConcept(src.getProcedure())); if (src.hasAdditive()) { @@ -181,8 +182,8 @@ public class Specimen30_50 { return null; org.hl7.fhir.dstu3.model.Specimen.SpecimenProcessingComponent tgt = new org.hl7.fhir.dstu3.model.Specimen.SpecimenProcessingComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasProcedure()) tgt.setProcedure(VersionConvertor_30_50.convertCodeableConcept(src.getProcedure())); if (src.hasAdditive()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java index e247e9451..398b9ecef 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.utilities.Utilities; +import java.util.Collections; public class StructureDefinition30_50 { @@ -46,40 +47,40 @@ public class StructureDefinition30_50 { return null; org.hl7.fhir.r5.model.StructureDefinition tgt = new org.hl7.fhir.r5.model.StructureDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasKeyword()) { for (org.hl7.fhir.dstu3.model.Coding t : src.getKeyword()) tgt.addKeyword(VersionConvertor_30_50.convertCoding(t)); } @@ -90,8 +91,8 @@ public class StructureDefinition30_50 { } if (src.hasKind()) tgt.setKind(convertStructureDefinitionKind(src.getKind())); - if (src.hasAbstract()) - tgt.setAbstract(src.getAbstract()); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAbstractElement())); for (org.hl7.fhir.dstu3.model.StringType t : src.getContext()) { org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext(); if (src.hasContextType()) { @@ -103,9 +104,9 @@ public class StructureDefinition30_50 { for (org.hl7.fhir.dstu3.model.StringType t : src.getContextInvariant()) tgt.addContextInvariant(t.getValue()); } if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasBaseDefinition()) - tgt.setBaseDefinition(src.getBaseDefinition()); + tgt.setType(src.getType()); + if (src.hasBaseDefinitionElement()) + tgt.setBaseDefinitionElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getBaseDefinitionElement())); if (src.hasDerivation()) tgt.setDerivation(convertTypeDerivationRule(src.getDerivation())); if (src.hasSnapshot()) @@ -127,40 +128,40 @@ public class StructureDefinition30_50 { return null; org.hl7.fhir.dstu3.model.StructureDefinition tgt = new org.hl7.fhir.dstu3.model.StructureDefinition(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasKeyword()) { for (org.hl7.fhir.r5.model.Coding t : src.getKeyword()) tgt.addKeyword(VersionConvertor_30_50.convertCoding(t)); } @@ -171,20 +172,20 @@ public class StructureDefinition30_50 { } if (src.hasKind()) tgt.setKind(convertStructureDefinitionKind(src.getKind())); - if (src.hasAbstract()) - tgt.setAbstract(src.getAbstract()); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAbstractElement())); for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) { if (!tgt.hasContextType()) - tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression())); + tgt.setTypeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getTypeElement())); tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression()); } if (src.hasContextInvariant()) { for (org.hl7.fhir.r5.model.StringType t : src.getContextInvariant()) tgt.addContextInvariant(t.getValue()); } if (src.hasType()) - tgt.setType(src.getType()); - if (src.hasBaseDefinition()) - tgt.setBaseDefinition(src.getBaseDefinition()); + tgt.setType(src.getType()); + if (src.hasBaseDefinitionElement()) + tgt.setBaseDefinitionElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getBaseDefinitionElement())); if (src.hasDerivation()) tgt.setDerivation(convertTypeDerivationRule(src.getDerivation())); if (src.hasSnapshot()) @@ -255,14 +256,14 @@ public class StructureDefinition30_50 { return null; org.hl7.fhir.dstu3.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.dstu3.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentity()) - tgt.setIdentity(src.getIdentity()); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } @@ -271,14 +272,14 @@ public class StructureDefinition30_50 { return null; org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentity()) - tgt.setIdentity(src.getIdentity()); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCommentElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java index ea753a4b2..a707829e0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class StructureMap30_50 { @@ -10,40 +11,40 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap tgt = new org.hl7.fhir.r5.model.StructureMap(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasStructure()) { for (org.hl7.fhir.dstu3.model.StructureMap.StructureMapStructureComponent t : src.getStructure()) tgt.addStructure(convertStructureMapStructureComponent(t)); } @@ -61,40 +62,40 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap tgt = new org.hl7.fhir.dstu3.model.StructureMap(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasStructure()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent t : src.getStructure()) tgt.addStructure(convertStructureMapStructureComponent(t)); } @@ -138,14 +139,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasExtends()) - tgt.setExtends(src.getExtends()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasExtendsElement()) + tgt.setExtendsElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getExtendsElement())); if (src.hasTypeMode()) tgt.setTypeMode(convertStructureMapGroupTypeMode(src.getTypeMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasInput()) { for (org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupInputComponent t : src.getInput()) tgt.addInput(convertStructureMapGroupInputComponent(t)); } @@ -160,14 +161,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasExtends()) - tgt.setExtends(src.getExtends()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasExtendsElement()) + tgt.setExtendsElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getExtendsElement())); if (src.hasTypeMode()) tgt.setTypeMode(convertStructureMapGroupTypeMode(src.getTypeMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); if (src.hasInput()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent t : src.getInput()) tgt.addInput(convertStructureMapGroupInputComponent(t)); } @@ -182,14 +183,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupInputComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupInputComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasMode()) tgt.setMode(convertStructureMapInputMode(src.getMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -198,14 +199,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasMode()) tgt.setMode(convertStructureMapInputMode(src.getMode())); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -214,8 +215,8 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasSource()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleSourceComponent t : src.getSource()) tgt.addSource(convertStructureMapGroupRuleSourceComponent(t)); } @@ -228,8 +229,8 @@ public class StructureMap30_50 { if (src.hasDependent()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent t : src.getDependent()) tgt.addDependent(convertStructureMapGroupRuleDependentComponent(t)); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -238,8 +239,8 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasSource()) { for (org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleSourceComponent t : src.getSource()) tgt.addSource(convertStructureMapGroupRuleSourceComponent(t)); } @@ -252,8 +253,8 @@ public class StructureMap30_50 { if (src.hasDependent()) { for (org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleDependentComponent t : src.getDependent()) tgt.addDependent(convertStructureMapGroupRuleDependentComponent(t)); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -262,8 +263,8 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasVariable()) { for (org.hl7.fhir.dstu3.model.StringType t : src.getVariable()) tgt.addVariable(t.getValue()); } @@ -275,8 +276,8 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleDependentComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleDependentComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasVariable()) { for (org.hl7.fhir.r5.model.StringType t : src.getVariable()) tgt.addVariable(t.getValue()); } @@ -288,26 +289,26 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleSourceComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getContextElement())); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasDefaultValue()) tgt.setDefaultValue(VersionConvertor_30_50.convertType(src.getDefaultValue())); - if (src.hasElement()) - tgt.setElement(src.getElement()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getElementElement())); if (src.hasListMode()) tgt.setListMode(convertStructureMapSourceListMode(src.getListMode())); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); - if (src.hasCondition()) - tgt.setCondition(src.getCondition()); - if (src.hasCheck()) - tgt.setCheck(src.getCheck()); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getVariableElement())); + if (src.hasConditionElement()) + tgt.setConditionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getConditionElement())); + if (src.hasCheckElement()) + tgt.setCheckElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getCheckElement())); return tgt; } @@ -316,26 +317,26 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleSourceComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleSourceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); - if (src.hasMin()) - tgt.setMin(src.getMin()); - if (src.hasMax()) - tgt.setMax(src.getMax()); - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getContextElement())); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getMaxElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTypeElement())); if (src.hasDefaultValue()) tgt.setDefaultValue(VersionConvertor_30_50.convertType(src.getDefaultValue())); - if (src.hasElement()) - tgt.setElement(src.getElement()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getElementElement())); if (src.hasListMode()) tgt.setListMode(convertStructureMapSourceListMode(src.getListMode())); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); - if (src.hasCondition()) - tgt.setCondition(src.getCondition()); - if (src.hasCheck()) - tgt.setCheck(src.getCheck()); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getVariableElement())); + if (src.hasConditionElement()) + tgt.setConditionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getConditionElement())); + if (src.hasCheckElement()) + tgt.setCheckElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getCheckElement())); return tgt; } @@ -344,19 +345,19 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleTargetComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleTargetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getContextElement())); if (src.hasContextType()) tgt.setContextType(convertStructureMapContextType(src.getContextType())); - if (src.hasElement()) - tgt.setElement(src.getElement()); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getElementElement())); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getVariableElement())); if (src.hasListMode()) { for (org.hl7.fhir.dstu3.model.Enumeration t : src.getListMode()) VersionConvertor_30_50.copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue()))); } - if (src.hasListRuleId()) - tgt.setListRuleId(src.getListRuleId()); + if (src.hasListRuleIdElement()) + tgt.setListRuleIdElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getListRuleIdElement())); if (src.hasTransform()) tgt.setTransform(convertStructureMapTransform(src.getTransform())); if (src.hasParameter()) { @@ -370,19 +371,19 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleTargetComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupRuleTargetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getContextElement())); if (src.hasContextType()) tgt.setContextType(convertStructureMapContextType(src.getContextType())); - if (src.hasElement()) - tgt.setElement(src.getElement()); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getElementElement())); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getVariableElement())); if (src.hasListMode()) { for (org.hl7.fhir.r5.model.Enumeration t : src.getListMode()) VersionConvertor_30_50.copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue()))); } - if (src.hasListRuleId()) - tgt.setListRuleId(src.getListRuleId()); + if (src.hasListRuleIdElement()) + tgt.setListRuleIdElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getListRuleIdElement())); if (src.hasTransform()) tgt.setTransform(convertStructureMapTransform(src.getTransform())); if (src.hasParameter()) { @@ -544,14 +545,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.dstu3.model.StructureMap.StructureMapStructureComponent tgt = new org.hl7.fhir.dstu3.model.StructureMap.StructureMapStructureComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasMode()) tgt.setMode(convertStructureMapModelMode(src.getMode())); - if (src.hasAlias()) - tgt.setAlias(src.getAlias()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasAliasElement()) + tgt.setAliasElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getAliasElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } @@ -560,14 +561,14 @@ public class StructureMap30_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasMode()) tgt.setMode(convertStructureMapModelMode(src.getMode())); - if (src.hasAlias()) - tgt.setAlias(src.getAlias()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasAliasElement()) + tgt.setAliasElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getAliasElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDocumentationElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java index de54cb3c8..aa1544ae0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Substance30_50 { @@ -50,8 +51,8 @@ public class Substance30_50 { } if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasInstance()) { for (org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t)); } @@ -76,8 +77,8 @@ public class Substance30_50 { } if (src.hasCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode())); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasInstance()) { for (org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t)); } @@ -118,8 +119,8 @@ public class Substance30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasExpiry()) - tgt.setExpiry(src.getExpiry()); + if (src.hasExpiryElement()) + tgt.setExpiryElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getExpiryElement())); if (src.hasQuantity()) tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); return tgt; @@ -132,8 +133,8 @@ public class Substance30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasExpiry()) - tgt.setExpiry(src.getExpiry()); + if (src.hasExpiryElement()) + tgt.setExpiryElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getExpiryElement())); if (src.hasQuantity()) tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SupplyDelivery30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SupplyDelivery30_50.java index cdd38ff27..7d316a3e8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SupplyDelivery30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/SupplyDelivery30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class SupplyDelivery30_50 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestReport30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestReport30_50.java index 681517841..4eaf59fa7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestReport30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestReport30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class TestReport30_50 { @@ -12,20 +13,20 @@ public class TestReport30_50 { VersionConvertor_30_50.copyDomainResource(src, tgt); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(convertTestReportStatus(src.getStatus())); if (src.hasTestScript()) tgt.setTestScript(VersionConvertor_30_50.convertReference(src.getTestScript())); if (src.hasResult()) tgt.setResult(convertTestReportResult(src.getResult())); - if (src.hasScore()) - tgt.setScore(src.getScore()); - if (src.hasTester()) - tgt.setTester(src.getTester()); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.dstu3.model.DecimalType) VersionConvertor_30_50.convertType(src.getScoreElement())); + if (src.hasTesterElement()) + tgt.setTesterElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTesterElement())); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasParticipant()) { for (org.hl7.fhir.r5.model.TestReport.TestReportParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertTestReportParticipantComponent(t)); } @@ -46,20 +47,20 @@ public class TestReport30_50 { VersionConvertor_30_50.copyDomainResource(src, tgt); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasStatus()) tgt.setStatus(convertTestReportStatus(src.getStatus())); if (src.hasTestScript()) tgt.setTestScript(VersionConvertor_30_50.convertReference(src.getTestScript())); if (src.hasResult()) tgt.setResult(convertTestReportResult(src.getResult())); - if (src.hasScore()) - tgt.setScore(src.getScore()); - if (src.hasTester()) - tgt.setTester(src.getTester()); - if (src.hasIssued()) - tgt.setIssued(src.getIssued()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_30_50.convertType(src.getScoreElement())); + if (src.hasTesterElement()) + tgt.setTesterElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTesterElement())); + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getIssuedElement())); if (src.hasParticipant()) { for (org.hl7.fhir.dstu3.model.TestReport.TestReportParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertTestReportParticipantComponent(t)); } @@ -80,10 +81,10 @@ public class TestReport30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertTestReportParticipantType(src.getType())); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); return tgt; } @@ -94,10 +95,10 @@ public class TestReport30_50 { VersionConvertor_30_50.copyElement(src, tgt); if (src.hasType()) tgt.setType(convertTestReportParticipantType(src.getType())); - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUriElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); return tgt; } @@ -248,10 +249,10 @@ public class TestReport30_50 { return null; org.hl7.fhir.dstu3.model.TestReport.TestReportTestComponent tgt = new org.hl7.fhir.dstu3.model.TestReport.TestReportTestComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.r5.model.TestReport.TestActionComponent t : src.getAction()) tgt.addAction(VersionConvertor_30_50.convertTestActionComponent(t)); } @@ -263,10 +264,10 @@ public class TestReport30_50 { return null; org.hl7.fhir.r5.model.TestReport.TestReportTestComponent tgt = new org.hl7.fhir.r5.model.TestReport.TestReportTestComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.dstu3.model.TestReport.TestActionComponent t : src.getAction()) tgt.addAction(VersionConvertor_30_50.convertTestActionComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestScript30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestScript30_50.java index 8b64d0c44..0ba1fafd9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestScript30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/TestScript30_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class TestScript30_50 { @@ -10,39 +11,39 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript tgt = new org.hl7.fhir.r5.model.TestScript(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasOrigin()) { for (org.hl7.fhir.dstu3.model.TestScript.TestScriptOriginComponent t : src.getOrigin()) tgt.addOrigin(convertTestScriptOriginComponent(t)); } @@ -75,39 +76,39 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript tgt = new org.hl7.fhir.dstu3.model.TestScript(); VersionConvertor_30_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifierFirstRep())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasOrigin()) { for (org.hl7.fhir.r5.model.TestScript.TestScriptOriginComponent t : src.getOrigin()) tgt.addOrigin(convertTestScriptOriginComponent(t)); } @@ -140,8 +141,8 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptDestinationComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptDestinationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIndex()) - tgt.setIndex(src.getIndex()); + if (src.hasIndexElement()) + tgt.setIndexElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getIndexElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCoding(src.getProfile())); return tgt; @@ -152,8 +153,8 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptDestinationComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptDestinationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIndex()) - tgt.setIndex(src.getIndex()); + if (src.hasIndexElement()) + tgt.setIndexElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getIndexElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCoding(src.getProfile())); return tgt; @@ -164,10 +165,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptFixtureComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptFixtureComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasAutocreate()) - tgt.setAutocreate(src.getAutocreate()); - if (src.hasAutodelete()) - tgt.setAutodelete(src.getAutodelete()); + if (src.hasAutocreateElement()) + tgt.setAutocreateElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAutocreateElement())); + if (src.hasAutodeleteElement()) + tgt.setAutodeleteElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAutodeleteElement())); if (src.hasResource()) tgt.setResource(VersionConvertor_30_50.convertReference(src.getResource())); return tgt; @@ -178,10 +179,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptFixtureComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptFixtureComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasAutocreate()) - tgt.setAutocreate(src.getAutocreate()); - if (src.hasAutodelete()) - tgt.setAutodelete(src.getAutodelete()); + if (src.hasAutocreateElement()) + tgt.setAutocreateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAutocreateElement())); + if (src.hasAutodeleteElement()) + tgt.setAutodeleteElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAutodeleteElement())); if (src.hasResource()) tgt.setResource(VersionConvertor_30_50.convertReference(src.getResource())); return tgt; @@ -192,17 +193,17 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptMetadataCapabilityComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptMetadataCapabilityComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasValidated()) - tgt.setValidated(src.getValidated()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequiredElement())); + if (src.hasValidatedElement()) + tgt.setValidatedElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getValidatedElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasOrigin()) { for (org.hl7.fhir.r5.model.IntegerType t : src.getOrigin()) tgt.addOrigin(t.getValue()); } - if (src.hasDestination()) - tgt.setDestination(src.getDestination()); + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getDestinationElement())); if (src.hasLink()) { for (org.hl7.fhir.r5.model.UriType t : src.getLink()) tgt.addLink(t.getValue()); } @@ -216,17 +217,17 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptMetadataCapabilityComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptMetadataCapabilityComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasValidated()) - tgt.setValidated(src.getValidated()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getRequiredElement())); + if (src.hasValidatedElement()) + tgt.setValidatedElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getValidatedElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasOrigin()) { for (org.hl7.fhir.dstu3.model.IntegerType t : src.getOrigin()) tgt.addOrigin(t.getValue()); } - if (src.hasDestination()) - tgt.setDestination(src.getDestination()); + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getDestinationElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu3.model.UriType t : src.getLink()) tgt.addLink(t.getValue()); } @@ -268,10 +269,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptMetadataLinkComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptMetadataLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -280,10 +281,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptMetadataLinkComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptMetadataLinkComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); return tgt; } @@ -292,8 +293,8 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptOriginComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptOriginComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIndex()) - tgt.setIndex(src.getIndex()); + if (src.hasIndexElement()) + tgt.setIndexElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getIndexElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCoding(src.getProfile())); return tgt; @@ -304,8 +305,8 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptOriginComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptOriginComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIndex()) - tgt.setIndex(src.getIndex()); + if (src.hasIndexElement()) + tgt.setIndexElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getIndexElement())); if (src.hasProfile()) tgt.setProfile(VersionConvertor_30_50.convertCoding(src.getProfile())); return tgt; @@ -360,10 +361,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptTestComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptTestComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.r5.model.TestScript.TestActionComponent t : src.getAction()) tgt.addAction(VersionConvertor_30_50.convertTestActionComponent(t)); } @@ -375,10 +376,10 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptTestComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptTestComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.dstu3.model.TestScript.TestActionComponent t : src.getAction()) tgt.addAction(VersionConvertor_30_50.convertTestActionComponent(t)); } @@ -390,22 +391,22 @@ public class TestScript30_50 { return null; org.hl7.fhir.r5.model.TestScript.TestScriptVariableComponent tgt = new org.hl7.fhir.r5.model.TestScript.TestScriptVariableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDefaultValue()) - tgt.setDefaultValue(src.getDefaultValue()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasHeaderField()) - tgt.setHeaderField(src.getHeaderField()); - if (src.hasHint()) - tgt.setHint(src.getHint()); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasSourceId()) - tgt.setSourceId(src.getSourceId()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDefaultValueElement()) + tgt.setDefaultValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDefaultValueElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getHeaderFieldElement())); + if (src.hasHintElement()) + tgt.setHintElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getHintElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_30_50.convertType(src.getSourceIdElement())); return tgt; } @@ -414,22 +415,22 @@ public class TestScript30_50 { return null; org.hl7.fhir.dstu3.model.TestScript.TestScriptVariableComponent tgt = new org.hl7.fhir.dstu3.model.TestScript.TestScriptVariableComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDefaultValue()) - tgt.setDefaultValue(src.getDefaultValue()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasExpression()) - tgt.setExpression(src.getExpression()); - if (src.hasHeaderField()) - tgt.setHeaderField(src.getHeaderField()); - if (src.hasHint()) - tgt.setHint(src.getHint()); - if (src.hasPath()) - tgt.setPath(src.getPath()); - if (src.hasSourceId()) - tgt.setSourceId(src.getSourceId()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasDefaultValueElement()) + tgt.setDefaultValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDefaultValueElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getExpressionElement())); + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getHeaderFieldElement())); + if (src.hasHintElement()) + tgt.setHintElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getHintElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPathElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.dstu3.model.IdType) VersionConvertor_30_50.convertType(src.getSourceIdElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ValueSet30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ValueSet30_50.java index c048a2682..426e77c80 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ValueSet30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ValueSet30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.BooleanType; +import java.util.Collections; public class ValueSet30_50 { @@ -11,10 +12,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -26,10 +27,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -41,12 +42,12 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); if (src.hasUse()) tgt.setUse(VersionConvertor_30_50.convertCoding(src.getUse())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -55,12 +56,12 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceDesignationComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceDesignationComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getLanguageElement())); if (src.hasUse()) tgt.setUse(VersionConvertor_30_50.convertCoding(src.getUse())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -69,10 +70,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -90,10 +91,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -111,12 +112,12 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasProperty()) - tgt.setProperty(src.getProperty()); + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getPropertyElement())); if (src.hasOp()) tgt.setOp(convertFilterOperator2(src.getOp())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -125,12 +126,12 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasProperty()) - tgt.setProperty(src.getProperty()); + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getPropertyElement())); if (src.hasOp()) tgt.setOp(VersionConvertor_30_50.convertFilterOperator(src.getOp())); - if (src.hasValue()) - tgt.setValue(src.getValue()); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement())); return tgt; } @@ -166,42 +167,42 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet tgt = new org.hl7.fhir.r5.model.ValueSet(); VersionConvertor_30_50.copyDomainResource(src, tgt, "http://hl7.org/fhir/StructureDefinition/valueset-extensible"); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu3.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.dstu3.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasImmutable()) - tgt.setImmutable(src.getImmutable()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasImmutableElement()) + tgt.setImmutableElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getImmutableElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasExtensible()) tgt.addExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible", new BooleanType(src.getExtensible())); if (src.hasCompose()) @@ -216,42 +217,42 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet tgt = new org.hl7.fhir.dstu3.model.ValueSet(); VersionConvertor_30_50.copyDomainResource(src, tgt, "http://hl7.org/fhir/StructureDefinition/valueset-extensible"); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getTitleElement())); if (src.hasStatus()) tgt.setStatus(VersionConvertor_30_50.convertPublicationStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(VersionConvertor_30_50.convertContactDetail(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getDescriptionElement())); if (src.hasUseContext()) { for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) tgt.addUseContext(VersionConvertor_30_50.convertUsageContext(t)); } if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addJurisdiction(VersionConvertor_30_50.convertCodeableConcept(t)); } - if (src.hasImmutable()) - tgt.setImmutable(src.getImmutable()); - if (src.hasPurpose()) - tgt.setPurpose(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasImmutableElement()) + tgt.setImmutableElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getImmutableElement())); + if (src.hasPurposeElement()) + tgt.setPurposeElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getPurposeElement())); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu3.model.MarkdownType) VersionConvertor_30_50.convertType(src.getCopyrightElement())); if (src.hasExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible")) tgt.setExtensible(((BooleanType) src.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/valueset-extensible").getValue()).booleanValue()); if (src.hasCompose()) @@ -266,10 +267,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetComposeComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetComposeComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLockedDate()) - tgt.setLockedDate(src.getLockedDate()); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); + if (src.hasLockedDateElement()) + tgt.setLockedDateElement((org.hl7.fhir.r5.model.DateType) VersionConvertor_30_50.convertType(src.getLockedDateElement())); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); if (src.hasInclude()) { for (org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent t : src.getInclude()) tgt.addInclude(convertConceptSetComponent(t)); } @@ -284,10 +285,10 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ValueSetComposeComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ValueSetComposeComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasLockedDate()) - tgt.setLockedDate(src.getLockedDate()); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); + if (src.hasLockedDateElement()) + tgt.setLockedDateElement((org.hl7.fhir.dstu3.model.DateType) VersionConvertor_30_50.convertType(src.getLockedDateElement())); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); if (src.hasInclude()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent t : src.getInclude()) tgt.addInclude(convertConceptSetComponent(t)); } @@ -302,14 +303,14 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentifier()) - tgt.setIdentifier(src.getIdentifier()); - if (src.hasTimestamp()) - tgt.setTimestamp(src.getTimestamp()); - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); - if (src.hasOffset()) - tgt.setOffset(src.getOffset()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_30_50.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_30_50.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -324,14 +325,14 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasIdentifier()) - tgt.setIdentifier(src.getIdentifier()); - if (src.hasTimestamp()) - tgt.setTimestamp(src.getTimestamp()); - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); - if (src.hasOffset()) - tgt.setOffset(src.getOffset()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.dstu3.model.DateTimeType) VersionConvertor_30_50.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.dstu3.model.IntegerType) VersionConvertor_30_50.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -346,18 +347,18 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasAbstract()) - tgt.setAbstract(src.getAbstract()); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getAbstractElement())); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -372,18 +373,18 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasSystem()) - tgt.setSystem(src.getSystem()); - if (src.hasAbstract()) - tgt.setAbstract(src.getAbstract()); - if (src.hasInactive()) - tgt.setInactive(src.getInactive()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasCode()) - tgt.setCode(src.getCode()); - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getAbstractElement())); + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.dstu3.model.BooleanType) VersionConvertor_30_50.convertType(src.getInactiveElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -398,8 +399,8 @@ public class ValueSet30_50 { return null; org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); return tgt; @@ -410,8 +411,8 @@ public class ValueSet30_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_30_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getNameElement())); if (src.hasValue()) tgt.setValue(VersionConvertor_30_50.convertType(src.getValue())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java index 6e54f824d..b3e6cd24a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java @@ -92,7 +92,7 @@ public class Parser { // VERSION_FILES.forEach(version -> { - String version = "30_40"; + String version = "30_50"; List filenames = listAllJavaFilesInDirectory(new File("").getAbsolutePath() + "/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/"); System.out.println("Checking the following files:"); Collections.sort(filenames);