From 68979fee959f79a0ffb0ea9dce9e1ad6c807e501 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Thu, 6 Feb 2020 17:24:52 -0500 Subject: [PATCH] conv10_40 files cleaned up --- .../conv10_40/Appointment10_40.java | 61 +- .../conv10_40/AppointmentResponse10_40.java | 31 +- .../convertors/conv10_40/AuditEvent10_40.java | 97 ++-- .../fhir/convertors/conv10_40/Basic10_40.java | 11 +- .../convertors/conv10_40/Binary10_40.java | 11 +- .../convertors/conv10_40/Bundle10_40.java | 134 ++--- .../convertors/conv10_40/CarePlan10_40.java | 31 +- .../conv10_40/Communication10_40.java | 21 +- .../conv10_40/CommunicationRequest10_40.java | 10 +- .../conv10_40/Composition10_40.java | 39 +- .../convertors/conv10_40/ConceptMap10_40.java | 120 ++-- .../convertors/conv10_40/Condition10_40.java | 12 +- .../conv10_40/Conformance10_40.java | 254 ++++----- .../conv10_40/DataElement10_40.java | 46 +- .../conv10_40/DetectedIssue10_40.java | 29 +- .../conv10_40/DeviceMetric10_40.java | 11 +- .../conv10_40/DeviceUseStatement10_40.java | 11 +- .../conv10_40/DiagnosticReport10_40.java | 31 +- .../conv10_40/DocumentReference10_40.java | 22 +- .../convertors/conv10_40/Encounter10_40.java | 1 + .../conv10_40/EnrollmentRequest10_40.java | 11 +- .../conv10_40/EnrollmentResponse10_40.java | 21 +- .../conv10_40/EpisodeOfCare10_40.java | 1 + .../conv10_40/FamilyMemberHistory10_40.java | 19 +- .../fhir/convertors/conv10_40/Flag10_40.java | 1 + .../fhir/convertors/conv10_40/Group10_40.java | 51 +- .../conv10_40/HealthcareService10_40.java | 81 ++- .../conv10_40/ImplementationGuide10_40.java | 156 +++-- .../fhir/convertors/conv10_40/List10_40.java | 37 +- .../convertors/conv10_40/Location10_40.java | 51 +- .../conv10_40/MedicationDispense10_40.java | 35 +- .../conv10_40/MedicationStatement10_40.java | 13 +- .../conv10_40/MessageHeader10_40.java | 71 +-- .../conv10_40/NamingSystem10_40.java | 89 ++- .../conv10_40/Observation10_40.java | 21 +- .../conv10_40/OperationDefinition10_40.java | 167 +++--- .../conv10_40/OperationOutcome10_40.java | 11 +- .../conv10_40/Organization10_40.java | 21 +- .../convertors/conv10_40/Parameters10_40.java | 11 +- .../convertors/conv10_40/Patient10_40.java | 31 +- .../convertors/conv10_40/Person10_40.java | 21 +- .../conv10_40/Practitioner10_40.java | 21 +- .../conv10_40/Questionnaire10_40.java | 99 ++-- .../conv10_40/QuestionnaireResponse10_40.java | 51 +- .../conv10_40/RiskAssessment10_40.java | 31 +- .../convertors/conv10_40/Schedule10_40.java | 11 +- .../conv10_40/SearchParameter10_40.java | 103 ++-- .../fhir/convertors/conv10_40/Slot10_40.java | 41 +- .../conv10_40/StructureDefinition10_40.java | 163 +++--- .../conv10_40/Subscription10_40.java | 66 +-- .../convertors/conv10_40/Substance10_40.java | 21 +- .../conv10_40/SupplyDelivery10_40.java | 1 + .../conv10_40/SupplyRequest10_40.java | 1 + .../convertors/conv10_40/TestScript10_40.java | 533 ++++++++---------- .../convertors/conv10_40/ValueSet10_40.java | 281 ++++----- .../hl7/fhir/convertors/parser/Parser.java | 30 +- 56 files changed, 1462 insertions(+), 1894 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Appointment10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Appointment10_40.java index 2a84bf10a..ec7228a76 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Appointment10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Appointment10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Appointment10_40 { @@ -18,27 +19,21 @@ public class Appointment10_40 { } if (src.hasType()) tgt.addServiceType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); - if (src.hasPriority()) { - tgt.setPriority(src.getPriority()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasStart()) { - tgt.setStart(src.getStart()); - } - if (src.hasEnd()) { - tgt.setEnd(src.getEnd()); - } - if (src.hasMinutesDuration()) { - tgt.setMinutesDuration(src.getMinutesDuration()); - } + if (src.hasPriorityElement()) + tgt.setPriorityElement((org.hl7.fhir.r4.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getPriorityElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); + if (src.hasMinutesDurationElement()) + tgt.setMinutesDurationElement((org.hl7.fhir.r4.model.PositiveIntType) VersionConvertor_10_40.convertType(src.getMinutesDurationElement())); if (src.hasSlot()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getSlot()) tgt.addSlot(VersionConvertor_10_40.convertReference(t)); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); if (src.hasParticipant()) { for (org.hl7.fhir.dstu2.model.Appointment.AppointmentParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertAppointmentParticipantComponent(t)); } @@ -59,27 +54,21 @@ public class Appointment10_40 { if (src.hasServiceType()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getServiceType()) tgt.setType(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasPriority()) { - tgt.setPriority(src.getPriority()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasStart()) { - tgt.setStart(src.getStart()); - } - if (src.hasEnd()) { - tgt.setEnd(src.getEnd()); - } - if (src.hasMinutesDuration()) { - tgt.setMinutesDuration(src.getMinutesDuration()); - } + if (src.hasPriorityElement()) + tgt.setPriorityElement((org.hl7.fhir.dstu2.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getPriorityElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasStartElement()) + tgt.setStartElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); + if (src.hasMinutesDurationElement()) + tgt.setMinutesDurationElement((org.hl7.fhir.dstu2.model.PositiveIntType) VersionConvertor_10_40.convertType(src.getMinutesDurationElement())); if (src.hasSlot()) { for (org.hl7.fhir.r4.model.Reference t : src.getSlot()) tgt.addSlot(VersionConvertor_10_40.convertReference(t)); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); if (src.hasParticipant()) { for (org.hl7.fhir.r4.model.Appointment.AppointmentParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertAppointmentParticipantComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AppointmentResponse10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AppointmentResponse10_40.java index ca7369cf1..536fa257a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AppointmentResponse10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AppointmentResponse10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class AppointmentResponse10_40 { @@ -16,12 +17,10 @@ public class AppointmentResponse10_40 { if (src.hasAppointment()) { tgt.setAppointment(VersionConvertor_10_40.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.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); if (src.hasParticipantType()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getParticipantType()) tgt.addParticipantType(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -31,9 +30,8 @@ public class AppointmentResponse10_40 { if (src.hasParticipantStatus()) { tgt.setParticipantStatus(convertParticipantStatus(src.getParticipantStatus())); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } @@ -48,12 +46,10 @@ public class AppointmentResponse10_40 { if (src.hasAppointment()) { tgt.setAppointment(VersionConvertor_10_40.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.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); if (src.hasParticipantType()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getParticipantType()) tgt.addParticipantType(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -63,9 +59,8 @@ public class AppointmentResponse10_40 { if (src.hasParticipantStatus()) { tgt.setParticipantStatus(convertParticipantStatus(src.getParticipantStatus())); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AuditEvent10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AuditEvent10_40.java index 0cab2fff0..a3316e82f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AuditEvent10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/AuditEvent10_40.java @@ -1,7 +1,12 @@ package org.hl7.fhir.convertors.conv10_40; +import org.hl7.fhir.convertors.VersionConvertor_10_30; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.InstantType; +import org.hl7.fhir.r4.model.StringType; + +import java.util.Collections; public class AuditEvent10_40 { @@ -21,13 +26,13 @@ public class AuditEvent10_40 { tgt.setAction(convertAuditEventAction(src.getEvent().getAction())); } if (src.hasEvent()) { - tgt.setRecorded(src.getEvent().getDateTime()); + tgt.setRecordedElement((InstantType) VersionConvertor_10_40.convertType(src.getEvent().getDateTimeElement())); } if (src.hasEvent()) { tgt.setOutcome(convertAuditEventOutcome(src.getEvent().getOutcome())); } if (src.hasEvent()) { - tgt.setOutcomeDesc(src.getEvent().getOutcomeDesc()); + tgt.setOutcomeDescElement((StringType) VersionConvertor_10_40.convertType(src.getEvent().getOutcomeDescElement())); } if (src.hasEvent()) { for (org.hl7.fhir.dstu2.model.Coding t : src.getEvent().getPurposeOfEvent()) tgt.addPurposeOfEvent().addCoding(VersionConvertor_10_40.convertCoding(t)); @@ -59,14 +64,14 @@ public class AuditEvent10_40 { if (src.hasAction()) { tgt.getEvent().setAction(convertAuditEventAction(src.getAction())); } - if (src.hasRecorded()) { - tgt.getEvent().setDateTime(src.getRecorded()); + if (src.hasRecordedElement()) { + tgt.getEvent().setDateTimeElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getRecordedElement())); } if (src.hasOutcome()) { tgt.getEvent().setOutcome(convertAuditEventOutcome(src.getOutcome())); } - if (src.hasOutcomeDesc()) { - tgt.getEvent().setOutcomeDesc(src.getOutcomeDesc()); + if (src.hasOutcomeDescElement()) { + tgt.getEvent().setOutcomeDescElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getOutcomeDescElement())); } if (src.hasPurposeOfEvent()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getPurposeOfEvent()) for (org.hl7.fhir.r4.model.Coding cc : t.getCoding()) tgt.getEvent().addPurposeOfEvent(VersionConvertor_10_40.convertCoding(cc)); @@ -134,15 +139,12 @@ public class AuditEvent10_40 { } if (src.hasUserId()) tgt.getWho().setIdentifier(VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getAltIdElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasRequestorElement()) + tgt.setRequestorElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequestorElement())); if (src.hasLocation()) { tgt.setLocation(VersionConvertor_10_40.convertReference(src.getLocation())); } @@ -175,15 +177,12 @@ public class AuditEvent10_40 { if (src.getWho().hasReference() || src.getWho().hasDisplay() || src.getWho().hasExtension() || src.getWho().hasId()) tgt.setReference(VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getAltIdElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasRequestorElement()) + tgt.setRequestorElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequestorElement())); if (src.hasLocation()) { tgt.setLocation(VersionConvertor_10_40.convertReference(src.getLocation())); } @@ -207,9 +206,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.dstu2.model.AuditEvent.AuditEventParticipantNetworkComponent tgt = new org.hl7.fhir.dstu2.model.AuditEvent.AuditEventParticipantNetworkComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); - } + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getAddressElement())); if (src.hasType()) { tgt.setType(convertAuditEventParticipantNetworkType(src.getType())); } @@ -221,9 +219,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.r4.model.AuditEvent.AuditEventAgentNetworkComponent tgt = new org.hl7.fhir.r4.model.AuditEvent.AuditEventAgentNetworkComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); - } + if (src.hasAddressElement()) + tgt.setAddressElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getAddressElement())); if (src.hasType()) { tgt.setType(convertAuditEventParticipantNetworkType(src.getType())); } @@ -251,12 +248,10 @@ public class AuditEvent10_40 { if (src.hasSecurityLabel()) { for (org.hl7.fhir.dstu2.model.Coding t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasQuery()) { tgt.setQuery(src.getQuery()); } @@ -289,12 +284,10 @@ public class AuditEvent10_40 { if (src.hasSecurityLabel()) { for (org.hl7.fhir.r4.model.Coding t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasQuery()) { tgt.setQuery(src.getQuery()); } @@ -309,9 +302,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.dstu2.model.AuditEvent.AuditEventObjectDetailComponent tgt = new org.hl7.fhir.dstu2.model.AuditEvent.AuditEventObjectDetailComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasValueStringType()) tgt.setValue(src.getValueStringType().getValue().getBytes()); else if (src.hasValueBase64BinaryType()) @@ -324,9 +316,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.r4.model.AuditEvent.AuditEventEntityDetailComponent tgt = new org.hl7.fhir.r4.model.AuditEvent.AuditEventEntityDetailComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasValue()) tgt.setValue(new org.hl7.fhir.r4.model.Base64BinaryType(src.getValue())); return tgt; @@ -409,9 +400,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.r4.model.AuditEvent.AuditEventSourceComponent tgt = new org.hl7.fhir.r4.model.AuditEvent.AuditEventSourceComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasSite()) { - tgt.setSite(src.getSite()); - } + if (src.hasSiteElement()) + tgt.setSiteElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getSiteElement())); if (src.hasIdentifier()) tgt.getObserver().setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); if (src.hasType()) { @@ -425,9 +415,8 @@ public class AuditEvent10_40 { return null; org.hl7.fhir.dstu2.model.AuditEvent.AuditEventSourceComponent tgt = new org.hl7.fhir.dstu2.model.AuditEvent.AuditEventSourceComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasSite()) { - tgt.setSite(src.getSite()); - } + if (src.hasSiteElement()) + tgt.setSiteElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getSiteElement())); if (src.hasObserver()) tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getObserver().getIdentifier())); if (src.hasType()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Basic10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Basic10_40.java index ea884792b..9502b1eec 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Basic10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Basic10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Basic10_40 { @@ -19,9 +20,8 @@ public class Basic10_40 { if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r4.model.DateType) VersionConvertor_10_40.convertType(src.getCreatedElement())); if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } @@ -42,9 +42,8 @@ public class Basic10_40 { if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu2.model.DateType) VersionConvertor_10_40.convertType(src.getCreatedElement())); if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Binary10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Binary10_40.java index 96be11d7d..51f15d7bd 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Binary10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Binary10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Binary10_40 { @@ -10,9 +11,8 @@ public class Binary10_40 { return null; org.hl7.fhir.dstu2.model.Binary tgt = new org.hl7.fhir.dstu2.model.Binary(); VersionConvertor_10_40.copyResource(src, tgt); - if (src.hasContentType()) { - tgt.setContentType(src.getContentType()); - } + if (src.hasContentTypeElement()) + tgt.setContentTypeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getContentTypeElement())); tgt.setContent(src.getContent()); return tgt; } @@ -22,9 +22,8 @@ public class Binary10_40 { return null; org.hl7.fhir.r4.model.Binary tgt = new org.hl7.fhir.r4.model.Binary(); VersionConvertor_10_40.copyResource(src, tgt); - if (src.hasContentType()) { - tgt.setContentType(src.getContentType()); - } + if (src.hasContentTypeElement()) + tgt.setContentTypeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getContentTypeElement())); if (src.hasContent()) { tgt.setContent(src.getContent()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Bundle10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Bundle10_40.java index 436ce1764..9beb6d9b8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Bundle10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Bundle10_40.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertorAdvisor40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Bundle10_40 { @@ -14,8 +15,8 @@ public class Bundle10_40 { if (src.hasType()) { tgt.setType(convertBundleType(src.getType())); } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r4.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu2.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -36,8 +37,8 @@ public class Bundle10_40 { if (src.hasType()) { tgt.setType(convertBundleType(src.getType())); } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu2.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.r4.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -61,9 +62,8 @@ public class Bundle10_40 { if (src.hasLink()) { for (org.hl7.fhir.dstu2.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getFullUrlElement())); if (src.hasResource()) { tgt.setResource(VersionConvertor_10_40.convertResource(src.getResource())); } @@ -113,21 +113,16 @@ public class Bundle10_40 { 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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getIfNoneExistElement())); return tgt; } @@ -139,21 +134,16 @@ public class Bundle10_40 { 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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getIfNoneExistElement())); return tgt; } @@ -162,18 +152,14 @@ public class Bundle10_40 { return null; org.hl7.fhir.dstu2.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.dstu2.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getLastModifiedElement())); return tgt; } @@ -182,18 +168,14 @@ public class Bundle10_40 { return null; org.hl7.fhir.r4.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.r4.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getLastModifiedElement())); return tgt; } @@ -205,9 +187,8 @@ public class Bundle10_40 { if (src.hasMode()) { tgt.setMode(convertSearchEntryMode(src.getMode())); } - if (src.hasScore()) { - tgt.setScore(src.getScore()); - } + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.dstu2.model.DecimalType) VersionConvertor_10_40.convertType(src.getScoreElement())); return tgt; } @@ -219,9 +200,8 @@ public class Bundle10_40 { if (src.hasMode()) { tgt.setMode(convertSearchEntryMode(src.getMode())); } - if (src.hasScore()) { - tgt.setScore(src.getScore()); - } + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.r4.model.DecimalType) VersionConvertor_10_40.convertType(src.getScoreElement())); return tgt; } @@ -230,12 +210,10 @@ public class Bundle10_40 { return null; org.hl7.fhir.r4.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.r4.model.Bundle.BundleLinkComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); return tgt; } @@ -244,12 +222,10 @@ public class Bundle10_40 { return null; org.hl7.fhir.dstu2.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.dstu2.model.Bundle.BundleLinkComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CarePlan10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CarePlan10_40.java index 7ff2ff587..1497646ad 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CarePlan10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CarePlan10_40.java @@ -2,6 +2,9 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.BooleanType; + +import java.util.Collections; public class CarePlan10_40 { @@ -32,9 +35,8 @@ public class CarePlan10_40 { if (src.hasCategory()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasAddresses()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getAddresses()) tgt.addAddresses(VersionConvertor_10_40.convertReference(t)); } @@ -75,9 +77,8 @@ public class CarePlan10_40 { if (src.hasCategory()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasAddresses()) { for (org.hl7.fhir.r4.model.Reference t : src.getAddresses()) tgt.addAddresses(VersionConvertor_10_40.convertReference(t)); } @@ -144,8 +145,8 @@ public class CarePlan10_40 { if (src.hasStatus()) { tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); } - if (src.hasDoNotPerform()) { - tgt.setProhibited(src.getDoNotPerform()); + if (src.hasDoNotPerformElement()) { + tgt.setProhibitedElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getDoNotPerformElement())); } if (src.hasScheduled()) { tgt.setScheduled(VersionConvertor_10_40.convertType(src.getScheduled())); @@ -165,9 +166,8 @@ public class CarePlan10_40 { if (src.hasQuantity()) { tgt.setQuantity(VersionConvertor_10_40.convertSimpleQuantity(src.getQuantity())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } @@ -191,8 +191,8 @@ public class CarePlan10_40 { if (src.hasStatus()) { tgt.setStatus(convertCarePlanActivityStatus(src.getStatus())); } - if (src.hasProhibited()) { - tgt.setDoNotPerform(src.getProhibited()); + if (src.hasProhibitedElement()) { + tgt.setDoNotPerformElement((BooleanType) VersionConvertor_10_40.convertType(src.getProhibitedElement())); } if (src.hasScheduled()) { tgt.setScheduled(VersionConvertor_10_40.convertType(src.getScheduled())); @@ -212,9 +212,8 @@ public class CarePlan10_40 { if (src.hasQuantity()) { tgt.setQuantity(VersionConvertor_10_40.convertSimpleQuantity(src.getQuantity())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Communication10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Communication10_40.java index 1f40a23b9..93d299910 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Communication10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Communication10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Communication10_40 { @@ -34,12 +35,10 @@ public class Communication10_40 { if (src.hasEncounter()) { tgt.setEncounter(VersionConvertor_10_40.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.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getSentElement())); + if (src.hasReceivedElement()) + tgt.setReceivedElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getReceivedElement())); if (src.hasReason()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReason()) tgt.addReasonCode(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -78,12 +77,10 @@ public class Communication10_40 { if (src.hasEncounter()) { tgt.setEncounter(VersionConvertor_10_40.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.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getSentElement())); + if (src.hasReceivedElement()) + tgt.setReceivedElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getReceivedElement())); if (src.hasReasonCode()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) tgt.addReason(VersionConvertor_10_40.convertCodeableConcept(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CommunicationRequest10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CommunicationRequest10_40.java index f58e1d575..be2a6882e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CommunicationRequest10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/CommunicationRequest10_40.java @@ -1,7 +1,9 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.DateTimeType; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class CommunicationRequest10_40 { @@ -43,8 +45,8 @@ public class CommunicationRequest10_40 { if (src.hasReasonCode()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) tgt.addReason(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasAuthoredOn()) { - tgt.setRequestedOn(src.getAuthoredOn()); + if (src.hasAuthoredOnElement()) { + tgt.setRequestedOnElement((DateTimeType) VersionConvertor_10_40.convertType(src.getAuthoredOnElement())); } if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); @@ -93,8 +95,8 @@ public class CommunicationRequest10_40 { if (src.hasReason()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReason()) tgt.addReasonCode(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasRequestedOn()) { - tgt.setAuthoredOn(src.getRequestedOn()); + if (src.hasRequestedOnElement()) { + tgt.setAuthoredOnElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getRequestedOnElement())); } if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Composition10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Composition10_40.java index 974287ee4..09daa8f24 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Composition10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Composition10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Composition10_40 { @@ -13,16 +14,15 @@ public class Composition10_40 { if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); } if (src.hasCategory()) tgt.setClass_(VersionConvertor_10_40.convertCodeableConcept(src.getCategoryFirstRep())); - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); if (src.hasStatus()) { tgt.setStatus(convertCompositionStatus(src.getStatus())); } @@ -61,17 +61,16 @@ public class Composition10_40 { if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); } if (src.hasClass_()) { tgt.addCategory(VersionConvertor_10_40.convertCodeableConcept(src.getClass_())); } - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); if (src.hasStatus()) { tgt.setStatus(convertCompositionStatus(src.getStatus())); } @@ -147,9 +146,8 @@ public class Composition10_40 { VersionConvertor_10_40.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.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getTimeElement())); if (src.hasParty()) { tgt.setParty(VersionConvertor_10_40.convertReference(src.getParty())); } @@ -163,9 +161,8 @@ public class Composition10_40 { VersionConvertor_10_40.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.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getTimeElement())); if (src.hasParty()) { tgt.setParty(VersionConvertor_10_40.convertReference(src.getParty())); } @@ -245,9 +242,8 @@ public class Composition10_40 { return null; org.hl7.fhir.r4.model.Composition.SectionComponent tgt = new org.hl7.fhir.r4.model.Composition.SectionComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } @@ -281,9 +277,8 @@ public class Composition10_40 { return null; org.hl7.fhir.dstu2.model.Composition.SectionComponent tgt = new org.hl7.fhir.dstu2.model.Composition.SectionComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); - } + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ConceptMap10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ConceptMap10_40.java index 514539dc6..3d68819e1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ConceptMap10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ConceptMap10_40.java @@ -2,11 +2,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.r4.model.CanonicalType; -import org.hl7.fhir.r4.model.ConceptMap; +import org.hl7.fhir.r4.model.*; import org.hl7.fhir.r4.model.ConceptMap.ConceptMapGroupComponent; + import java.util.ArrayList; import java.util.List; +import java.util.Collections; public class ConceptMap10_40 { @@ -15,17 +16,17 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.r4.model.ConceptMap tgt = new org.hl7.fhir.r4.model.ConceptMap(); VersionConvertor_10_40.copyDomainResource(src, tgt); - tgt.setUrl(src.getUrl()); + tgt.setUrlElement((UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); - tgt.setVersion(src.getVersion()); - tgt.setName(src.getName()); + tgt.setVersionElement((StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + tgt.setNameElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + tgt.setPublisherElement((StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); for (org.hl7.fhir.dstu2.model.ConceptMap.ConceptMapContactComponent t : src.getContact()) tgt.addContact(convertConceptMapContactComponent(t)); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); @@ -49,34 +50,29 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.dstu2.model.ConceptMap tgt = new org.hl7.fhir.dstu2.model.ConceptMap(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertConceptMapContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -85,9 +81,8 @@ public class ConceptMap10_40 { if (src.hasPurpose()) { tgt.setRequirements(src.getPurpose()); } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasSource()) { tgt.setSource(VersionConvertor_10_40.convertType(src.getSource())); } @@ -105,9 +100,8 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.dstu2.model.ConceptMap.ConceptMapContactComponent tgt = new org.hl7.fhir.dstu2.model.ConceptMap.ConceptMapContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -119,9 +113,8 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -187,14 +180,14 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.r4.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.r4.model.ConceptMap.OtherElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasElement()) { - tgt.setProperty(src.getElement()); + if (src.hasElementElement()) { + tgt.setPropertyElement((UriType) VersionConvertor_10_40.convertType(src.getElementElement())); } - if (src.hasCodeSystem()) { - tgt.setSystem(src.getCodeSystem()); + if (src.hasCodeSystemElement()) { + tgt.setSystemElement((CanonicalType) VersionConvertor_10_40.convertType(src.getCodeSystemElement())); } - if (src.hasCode()) { - tgt.setValue(src.getCode()); + if (src.hasCodeElement()) { + tgt.setValueElement((StringType) VersionConvertor_10_40.convertType(src.getCodeElement())); } return tgt; } @@ -204,14 +197,14 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.dstu2.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.dstu2.model.ConceptMap.OtherElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setElement(src.getProperty()); + if (src.hasPropertyElement()) { + tgt.setElementElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getPropertyElement())); } - if (src.hasSystem()) { - tgt.setCodeSystem(src.getSystem()); + if (src.hasSystemElement()) { + tgt.setCodeSystemElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getSystemElement())); } - if (src.hasValue()) { - tgt.setCode(src.getValue()); + if (src.hasValueElement()) { + tgt.setCodeElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); } return tgt; } @@ -223,8 +216,8 @@ public class ConceptMap10_40 { for (org.hl7.fhir.dstu2.model.ConceptMap.TargetElementComponent t : src.getTarget()) { org.hl7.fhir.r4.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.r4.model.ConceptMap.SourceElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) { + tgt.setCodeElement((CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); } tgt.addTarget(convertTargetElementComponent(t)); if (src.hasCodeSystem()) { @@ -240,9 +233,8 @@ public class ConceptMap10_40 { org.hl7.fhir.dstu2.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.dstu2.model.ConceptMap.SourceElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); tgt.setCodeSystem(g.getSource()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasTarget()) { for (org.hl7.fhir.r4.model.ConceptMap.TargetElementComponent t : src.getTarget()) tgt.addTarget(convertTargetElementComponent(t, g)); } @@ -255,14 +247,13 @@ public class ConceptMap10_40 { org.hl7.fhir.dstu2.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.dstu2.model.ConceptMap.TargetElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); tgt.setCodeSystem(g.getTarget()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasEquivalence()) { tgt.setEquivalence(convertConceptMapEquivalence(src.getEquivalence())); } - if (src.hasComment()) { - tgt.setComments(src.getComment()); + if (src.hasCommentElement()) { + tgt.setCommentsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); } if (src.hasDependsOn()) { for (org.hl7.fhir.r4.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); @@ -278,14 +269,13 @@ public class ConceptMap10_40 { return null; org.hl7.fhir.r4.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.r4.model.ConceptMap.TargetElementComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasEquivalence()) { tgt.setEquivalence(convertConceptMapEquivalence(src.getEquivalence())); } - if (src.hasComments()) { - tgt.setComment(src.getComments()); + if (src.hasCommentsElement()) { + tgt.setCommentElement((StringType) VersionConvertor_10_40.convertType(src.getCommentsElement())); } if (src.hasDependsOn()) { for (org.hl7.fhir.dstu2.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Condition10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Condition10_40.java index b3691aed3..ba5dac2ea 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Condition10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Condition10_40.java @@ -1,7 +1,11 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.DateType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.DateTimeType; + +import java.util.Collections; public class Condition10_40 { @@ -22,8 +26,8 @@ public class Condition10_40 { if (src.hasAsserter()) { tgt.setAsserter(VersionConvertor_10_40.convertReference(src.getAsserter())); } - if (src.hasRecordedDate()) - tgt.setDateRecorded(src.getRecordedDate()); + if (src.hasRecordedDateElement()) + tgt.setDateRecordedElement((DateType) VersionConvertor_10_40.convertType(src.getRecordedDateElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } @@ -73,8 +77,8 @@ public class Condition10_40 { if (src.hasAsserter()) { tgt.setAsserter(VersionConvertor_10_40.convertReference(src.getAsserter())); } - if (src.hasDateRecorded()) - tgt.setRecordedDate(src.getDateRecorded()); + if (src.hasDateRecordedElement()) + tgt.setRecordedDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateRecordedElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Conformance10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Conformance10_40.java index 61358a884..98be787c2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Conformance10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Conformance10_40.java @@ -2,11 +2,17 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.StringType; +import org.hl7.fhir.dstu2.model.UnsignedIntType; +import org.hl7.fhir.dstu2.model.UriType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.*; import org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestComponent; import org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceComponent; import org.hl7.fhir.r4.model.CapabilityStatement.SystemRestfulInteraction; +import java.util.Collections; + public class Conformance10_40 { public static org.hl7.fhir.dstu2.model.Conformance.ConditionalDeleteStatus convertConditionalDeleteStatus(org.hl7.fhir.r4.model.CapabilityStatement.ConditionalDeleteStatus src) throws FHIRException { @@ -44,37 +50,31 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance tgt = new org.hl7.fhir.dstu2.model.Conformance(); VersionConvertor_10_40.copyDomainResource(src, tgt, "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown"); - 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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertConformanceContactComponent(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasPurpose()) { - tgt.setRequirements(src.getPurpose()); - } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasPurposeElement()) { + tgt.setRequirementsElement((StringType) VersionConvertor_10_40.convertType(src.getPurposeElement())); } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasKind()) { tgt.setKind(convertConformanceStatementKind(src.getKind())); } @@ -110,25 +110,21 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement tgt = new org.hl7.fhir.r4.model.CapabilityStatement(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.Conformance.ConformanceContactComponent t : src.getContact()) tgt.addContact(convertConformanceContactComponent(t)); } @@ -175,9 +171,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceContactComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -189,9 +184,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -206,8 +200,8 @@ public class Conformance10_40 { if (src.hasMode()) { tgt.setMode(convertDocumentMode(src.getMode())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((MarkdownType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } if (src.hasProfile()) { tgt.setProfileElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getProfile())); @@ -223,8 +217,8 @@ public class Conformance10_40 { if (src.hasMode()) { tgt.setMode(convertDocumentMode(src.getMode())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } if (src.hasProfileElement()) { tgt.setProfile(VersionConvertor_10_40.convertCanonicalToReference(src.getProfileElement())); @@ -237,9 +231,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementImplementationComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementImplementationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasUrl()) { tgt.setUrl(src.getUrl()); } @@ -251,12 +244,10 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceImplementationComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceImplementationComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); return tgt; } @@ -268,11 +259,11 @@ public class Conformance10_40 { if (src.hasEndpoint()) { for (org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertConformanceMessagingEndpointComponent(t)); } - if (src.hasReliableCache()) { - tgt.setReliableCache(src.getReliableCache()); + if (src.hasReliableCacheElement()) { + tgt.setReliableCacheElement((UnsignedIntType) VersionConvertor_10_40.convertType(src.getReliableCacheElement())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } for (org.hl7.fhir.r4.model.Extension e : src.getExtensionsByUrl(VersionConvertorConstants.IG_CONFORMANCE_MESSAGE_EVENT)) { org.hl7.fhir.dstu2.model.Conformance.ConformanceMessagingEventComponent event = new org.hl7.fhir.dstu2.model.Conformance.ConformanceMessagingEventComponent(); @@ -304,11 +295,11 @@ public class Conformance10_40 { if (src.hasEndpoint()) { for (org.hl7.fhir.dstu2.model.Conformance.ConformanceMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertConformanceMessagingEndpointComponent(t)); } - if (src.hasReliableCache()) { - tgt.setReliableCache(src.getReliableCache()); + if (src.hasReliableCacheElement()) { + tgt.setReliableCacheElement((org.hl7.fhir.r4.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getReliableCacheElement())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((MarkdownType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } for (org.hl7.fhir.dstu2.model.Conformance.ConformanceMessagingEventComponent t : src.getEvent()) { org.hl7.fhir.r4.model.Extension e = new org.hl7.fhir.r4.model.Extension(VersionConvertorConstants.IG_CONFORMANCE_MESSAGE_EVENT); @@ -341,8 +332,8 @@ public class Conformance10_40 { if (src.hasProtocol()) { tgt.setProtocol(VersionConvertor_10_40.convertCoding(src.getProtocol())); } - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) { + tgt.setAddressElement((UrlType) VersionConvertor_10_40.convertType(src.getAddressElement())); } return tgt; } @@ -355,8 +346,8 @@ public class Conformance10_40 { if (src.hasProtocol()) { tgt.setProtocol(VersionConvertor_10_40.convertCoding(src.getProtocol())); } - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) { + tgt.setAddressElement((UriType) VersionConvertor_10_40.convertType(src.getAddressElement())); } return tgt; } @@ -369,8 +360,8 @@ public class Conformance10_40 { if (src.hasMode()) { tgt.setMode(convertRestfulConformanceMode(src.getMode())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((MarkdownType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } if (src.hasSecurity()) { tgt.setSecurity(convertConformanceRestSecurityComponent(src.getSecurity())); @@ -403,8 +394,8 @@ public class Conformance10_40 { if (src.hasMode()) { tgt.setMode(convertRestfulConformanceMode(src.getMode())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } if (src.hasSecurity()) { tgt.setSecurity(convertConformanceRestSecurityComponent(src.getSecurity())); @@ -443,9 +434,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasDefinition()) { tgt.setDefinitionElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getDefinition())); } @@ -457,9 +447,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceRestOperationComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceRestOperationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasDefinitionElement()) { tgt.setDefinition(VersionConvertor_10_40.convertCanonicalToReference(src.getDefinitionElement())); } @@ -471,8 +460,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); + if (src.hasTypeElement()) { + tgt.setTypeElement((CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); } if (src.hasProfile()) { tgt.setProfileElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getProfile())); @@ -483,17 +472,17 @@ public class Conformance10_40 { if (src.hasVersioning()) { tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); } - if (src.hasReadHistory()) { - tgt.setReadHistory(src.getReadHistory()); + if (src.hasReadHistoryElement()) { + tgt.setReadHistoryElement((BooleanType) VersionConvertor_10_40.convertType(src.getReadHistoryElement())); } - if (src.hasUpdateCreate()) { - tgt.setUpdateCreate(src.getUpdateCreate()); + if (src.hasUpdateCreateElement()) { + tgt.setUpdateCreateElement((BooleanType) VersionConvertor_10_40.convertType(src.getUpdateCreateElement())); } - if (src.hasConditionalCreate()) { - tgt.setConditionalCreate(src.getConditionalCreate()); + if (src.hasConditionalCreateElement()) { + tgt.setConditionalCreateElement((BooleanType) VersionConvertor_10_40.convertType(src.getConditionalCreateElement())); } - if (src.hasConditionalUpdate()) { - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasConditionalUpdateElement()) { + tgt.setConditionalUpdateElement((BooleanType) VersionConvertor_10_40.convertType(src.getConditionalUpdateElement())); } if (src.hasConditionalDelete()) { tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); @@ -526,17 +515,17 @@ public class Conformance10_40 { if (src.hasVersioning()) { tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); } - if (src.hasReadHistory()) { - tgt.setReadHistory(src.getReadHistory()); + if (src.hasReadHistoryElement()) { + tgt.setReadHistoryElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getReadHistoryElement())); } - if (src.hasUpdateCreate()) { - tgt.setUpdateCreate(src.getUpdateCreate()); + if (src.hasUpdateCreateElement()) { + tgt.setUpdateCreateElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getUpdateCreateElement())); } - if (src.hasConditionalCreate()) { - tgt.setConditionalCreate(src.getConditionalCreate()); + if (src.hasConditionalCreateElement()) { + tgt.setConditionalCreateElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getConditionalCreateElement())); } - if (src.hasConditionalUpdate()) { - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasConditionalUpdateElement()) { + tgt.setConditionalUpdateElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getConditionalUpdateElement())); } if (src.hasConditionalDelete()) { tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); @@ -558,17 +547,16 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceRestResourceSearchParamComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceRestResourceSearchParamComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDefinitionElement()) { + tgt.setDefinitionElement((UriType) VersionConvertor_10_40.convertType(src.getDefinitionElement())); } if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertSearchParamType(src.getType())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } return tgt; } @@ -578,17 +566,16 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDefinitionElement()) { + tgt.setDefinitionElement((CanonicalType) VersionConvertor_10_40.convertType(src.getDefinitionElement())); } if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertSearchParamType(src.getType())); } - if (src.hasDocumentation()) { - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) { + tgt.setDocumentationElement((MarkdownType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); } return tgt; } @@ -598,15 +585,14 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceRestSecurityComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceRestSecurityComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasCors()) { - tgt.setCors(src.getCors()); + if (src.hasCorsElement()) { + tgt.setCorsElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getCorsElement())); } if (src.hasService()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getService()) tgt.addService(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } @@ -615,8 +601,8 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestSecurityComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementRestSecurityComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasCors()) { - tgt.setCors(src.getCors()); + if (src.hasCorsElement()) { + tgt.setCorsElement((BooleanType) VersionConvertor_10_40.convertType(src.getCorsElement())); } if (src.hasService()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getService()) tgt.addService(VersionConvertor_10_40.convertCodeableConcept(t)); @@ -632,14 +618,12 @@ public class Conformance10_40 { return null; org.hl7.fhir.dstu2.model.Conformance.ConformanceSoftwareComponent tgt = new org.hl7.fhir.dstu2.model.Conformance.ConformanceSoftwareComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) { + tgt.setReleaseDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getReleaseDateElement())); } return tgt; } @@ -649,14 +633,12 @@ public class Conformance10_40 { return null; org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementSoftwareComponent tgt = new org.hl7.fhir.r4.model.CapabilityStatement.CapabilityStatementSoftwareComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) { + tgt.setReleaseDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getReleaseDateElement())); } return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DataElement10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DataElement10_40.java index 38d477356..0e38b9da8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DataElement10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DataElement10_40.java @@ -2,10 +2,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.*; import org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionKind; import org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule; import java.util.ArrayList; import java.util.List; +import java.util.Collections; public class DataElement10_40 { @@ -19,21 +21,21 @@ public class DataElement10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); + if (src.hasVersionElement()) { + tgt.setVersionElement((StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); } if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) { + tgt.setPublisherElement((StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); } if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.DataElement.DataElementContactComponent t : src.getContact()) tgt.addContact(convertDataElementContactComponent(t)); @@ -69,8 +71,8 @@ public class DataElement10_40 { return null; org.hl7.fhir.dstu2.model.DataElement.DataElementContactComponent tgt = new org.hl7.fhir.dstu2.model.DataElement.DataElementContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); } if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); @@ -83,8 +85,8 @@ public class DataElement10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); } if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); @@ -97,17 +99,17 @@ public class DataElement10_40 { return null; org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasIdentity()) { - tgt.setIdentity(src.getIdentity()); + if (src.hasIdentityElement()) { + tgt.setIdentityElement((IdType) VersionConvertor_10_40.convertType(src.getIdentityElement())); } - if (src.hasUri()) { - tgt.setUri(src.getUri()); + if (src.hasUriElement()) { + tgt.setUriElement((UriType) VersionConvertor_10_40.convertType(src.getUriElement())); } - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); } - if (src.hasComments()) { - tgt.setComment(src.getComments()); + if (src.hasCommentsElement()) { + tgt.setCommentElement((StringType) VersionConvertor_10_40.convertType(src.getCommentsElement())); } return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DetectedIssue10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DetectedIssue10_40.java index a7816da8b..ec958665a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DetectedIssue10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DetectedIssue10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class DetectedIssue10_40 { @@ -22,9 +23,8 @@ public class DetectedIssue10_40 { if (src.hasImplicated()) { for (org.hl7.fhir.r4.model.Reference t : src.getImplicated()) tgt.addImplicated(VersionConvertor_10_40.convertReference(t)); } - if (src.hasDetail()) { - tgt.setDetail(src.getDetail()); - } + if (src.hasDetailElement()) + tgt.setDetailElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDetailElement())); if (src.hasIdentifiedDateTimeType()) tgt.setDateElement(VersionConvertor_10_40.convertDateTime(src.getIdentifiedDateTimeType())); if (src.hasAuthor()) { @@ -33,9 +33,8 @@ public class DetectedIssue10_40 { if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifierFirstRep())); } - if (src.hasReference()) { - tgt.setReference(src.getReference()); - } + if (src.hasReferenceElement()) + tgt.setReferenceElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getReferenceElement())); if (src.hasMitigation()) { for (org.hl7.fhir.r4.model.DetectedIssue.DetectedIssueMitigationComponent t : src.getMitigation()) tgt.addMitigation(convertDetectedIssueMitigationComponent(t)); } @@ -59,9 +58,8 @@ public class DetectedIssue10_40 { if (src.hasImplicated()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getImplicated()) tgt.addImplicated(VersionConvertor_10_40.convertReference(t)); } - if (src.hasDetail()) { - tgt.setDetail(src.getDetail()); - } + if (src.hasDetailElement()) + tgt.setDetailElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDetailElement())); if (src.hasDate()) tgt.setIdentified(VersionConvertor_10_40.convertDateTime(src.getDateElement())); if (src.hasAuthor()) { @@ -70,9 +68,8 @@ public class DetectedIssue10_40 { if (src.hasIdentifier()) { tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasReference()) { - tgt.setReference(src.getReference()); - } + if (src.hasReferenceElement()) + tgt.setReferenceElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getReferenceElement())); if (src.hasMitigation()) { for (org.hl7.fhir.dstu2.model.DetectedIssue.DetectedIssueMitigationComponent t : src.getMitigation()) tgt.addMitigation(convertDetectedIssueMitigationComponent(t)); } @@ -87,8 +84,8 @@ public class DetectedIssue10_40 { if (src.hasAction()) { tgt.setAction(VersionConvertor_10_40.convertCodeableConcept(src.getAction())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } @@ -103,8 +100,8 @@ public class DetectedIssue10_40 { if (src.hasAction()) { tgt.setAction(VersionConvertor_10_40.convertCodeableConcept(src.getAction())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceMetric10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceMetric10_40.java index 867f2fd14..318460f5f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceMetric10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceMetric10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class DeviceMetric10_40 { @@ -92,9 +93,8 @@ public class DeviceMetric10_40 { if (src.hasState()) { tgt.setState(convertDeviceMetricCalibrationState(src.getState())); } - if (src.hasTime()) { - tgt.setTime(src.getTime()); - } + if (src.hasTimeElement()) + tgt.setTimeElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getTimeElement())); return tgt; } @@ -109,9 +109,8 @@ public class DeviceMetric10_40 { if (src.hasState()) { tgt.setState(convertDeviceMetricCalibrationState(src.getState())); } - if (src.hasTime()) { - tgt.setTime(src.getTime()); - } + if (src.hasTimeElement()) + tgt.setTimeElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getTimeElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceUseStatement10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceUseStatement10_40.java index 7ed3171c1..c86f30fc2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceUseStatement10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DeviceUseStatement10_40.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.Annotation; +import java.util.Collections; public class DeviceUseStatement10_40 { @@ -26,9 +27,8 @@ public class DeviceUseStatement10_40 { if (src.hasNote()) { for (Annotation t : src.getNote()) tgt.addNotes(t.getText()); } - if (src.hasRecordedOn()) { - tgt.setRecordedOn(src.getRecordedOn()); - } + if (src.hasRecordedOnElement()) + tgt.setRecordedOnElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getRecordedOnElement())); if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); } @@ -57,9 +57,8 @@ public class DeviceUseStatement10_40 { if (src.hasNotes()) { for (org.hl7.fhir.dstu2.model.StringType t : src.getNotes()) tgt.addNote().setText(t.getValue()); } - if (src.hasRecordedOn()) { - tgt.setRecordedOn(src.getRecordedOn()); - } + if (src.hasRecordedOnElement()) + tgt.setRecordedOnElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getRecordedOnElement())); if (src.hasSubject()) { tgt.setSubject(VersionConvertor_10_40.convertReference(src.getSubject())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DiagnosticReport10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DiagnosticReport10_40.java index 535a930b0..85dfa5f34 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DiagnosticReport10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DiagnosticReport10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class DiagnosticReport10_40 { @@ -31,9 +32,8 @@ public class DiagnosticReport10_40 { if (src.hasEffective()) { tgt.setEffective(VersionConvertor_10_40.convertType(src.getEffective())); } - if (src.hasIssued()) { - tgt.setIssued(src.getIssued()); - } + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getIssuedElement())); if (src.hasSpecimen()) { for (org.hl7.fhir.r4.model.Reference t : src.getSpecimen()) tgt.addSpecimen(VersionConvertor_10_40.convertReference(t)); } @@ -46,9 +46,8 @@ public class DiagnosticReport10_40 { if (src.hasMedia()) { for (org.hl7.fhir.r4.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getConclusionElement())); if (src.hasConclusionCode()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getConclusionCode()) tgt.addCodedDiagnosis(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -84,9 +83,8 @@ public class DiagnosticReport10_40 { if (src.hasEffective()) { tgt.setEffective(VersionConvertor_10_40.convertType(src.getEffective())); } - if (src.hasIssued()) { - tgt.setIssued(src.getIssued()); - } + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getIssuedElement())); if (src.hasSpecimen()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getSpecimen()) tgt.addSpecimen(VersionConvertor_10_40.convertReference(t)); } @@ -99,9 +97,8 @@ public class DiagnosticReport10_40 { if (src.hasImage()) { for (org.hl7.fhir.dstu2.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getConclusionElement())); if (src.hasCodedDiagnosis()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getCodedDiagnosis()) tgt.addConclusionCode(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -116,9 +113,8 @@ public class DiagnosticReport10_40 { return null; org.hl7.fhir.dstu2.model.DiagnosticReport.DiagnosticReportImageComponent tgt = new org.hl7.fhir.dstu2.model.DiagnosticReport.DiagnosticReportImageComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); if (src.hasLink()) { tgt.setLink(VersionConvertor_10_40.convertReference(src.getLink())); } @@ -130,9 +126,8 @@ public class DiagnosticReport10_40 { return null; org.hl7.fhir.r4.model.DiagnosticReport.DiagnosticReportMediaComponent tgt = new org.hl7.fhir.r4.model.DiagnosticReport.DiagnosticReportMediaComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); if (src.hasLink()) { tgt.setLink(VersionConvertor_10_40.convertReference(src.getLink())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DocumentReference10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DocumentReference10_40.java index 124e2eecc..14e2b5d06 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DocumentReference10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/DocumentReference10_40.java @@ -2,8 +2,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.dstu2.model.CodeableConcept; +import org.hl7.fhir.dstu2.model.DateTimeType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.DocumentReference.ReferredDocumentStatus; +import org.hl7.fhir.r4.model.InstantType; + +import java.util.Collections; public class DocumentReference10_40 { @@ -66,8 +70,8 @@ public class DocumentReference10_40 { if (src.hasAuthenticator()) { tgt.setAuthenticator(VersionConvertor_10_40.convertReference(src.getAuthenticator())); } - if (src.hasDate()) { - tgt.setCreated(src.getDate()); + if (src.hasDateElement()) { + tgt.setCreatedElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); } if (src.hasStatus()) { tgt.setStatus(convertDocumentReferenceStatus(src.getStatus())); @@ -78,9 +82,8 @@ public class DocumentReference10_40 { if (src.hasRelatesTo()) { for (org.hl7.fhir.r4.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasSecurityLabel()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_40.convertCodeableConcept(t)); } @@ -119,8 +122,8 @@ public class DocumentReference10_40 { if (src.hasAuthenticator()) { tgt.setAuthenticator(VersionConvertor_10_40.convertReference(src.getAuthenticator())); } - if (src.hasCreated()) { - tgt.setDate(src.getCreated()); + if (src.hasCreatedElement()) { + tgt.setDateElement((InstantType) VersionConvertor_10_40.convertType(src.getCreatedElement())); } if (src.hasStatus()) { tgt.setStatus(convertDocumentReferenceStatus(src.getStatus())); @@ -131,9 +134,8 @@ public class DocumentReference10_40 { if (src.hasRelatesTo()) { for (org.hl7.fhir.dstu2.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasSecurityLabel()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getSecurityLabel()) tgt.addSecurityLabel(VersionConvertor_10_40.convertCodeableConcept(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Encounter10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Encounter10_40.java index 1cd7ee803..fced5fe24 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Encounter10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Encounter10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Encounter10_40 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentRequest10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentRequest10_40.java index 0d901cf15..d3a925c1f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentRequest10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentRequest10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class EnrollmentRequest10_40 { @@ -13,9 +14,8 @@ public class EnrollmentRequest10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getCreatedElement())); if (src.hasProvider()) { tgt.setProvider(VersionConvertor_10_40.convertReference(src.getProvider())); } @@ -36,9 +36,8 @@ public class EnrollmentRequest10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getCreatedElement())); if (src.hasCoverage()) { tgt.setCoverage(VersionConvertor_10_40.convertReference(src.getCoverage())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentResponse10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentResponse10_40.java index 018c78227..fd000172d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentResponse10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EnrollmentResponse10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class EnrollmentResponse10_40 { @@ -16,12 +17,10 @@ public class EnrollmentResponse10_40 { if (src.hasRequest()) { tgt.setRequest(VersionConvertor_10_40.convertReference(src.getRequest())); } - if (src.hasDisposition()) { - tgt.setDisposition(src.getDisposition()); - } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasDispositionElement()) + tgt.setDispositionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDispositionElement())); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getCreatedElement())); if (src.hasOrganization()) { tgt.setOrganization(VersionConvertor_10_40.convertReference(src.getOrganization())); } @@ -39,12 +38,10 @@ public class EnrollmentResponse10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasDisposition()) { - tgt.setDisposition(src.getDisposition()); - } - if (src.hasCreated()) { - tgt.setCreated(src.getCreated()); - } + if (src.hasDispositionElement()) + tgt.setDispositionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDispositionElement())); + if (src.hasCreatedElement()) + tgt.setCreatedElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getCreatedElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EpisodeOfCare10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EpisodeOfCare10_40.java index a70e1133a..bfa28c9a3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EpisodeOfCare10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/EpisodeOfCare10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class EpisodeOfCare10_40 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/FamilyMemberHistory10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/FamilyMemberHistory10_40.java index a9f78250f..405003131 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/FamilyMemberHistory10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/FamilyMemberHistory10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class FamilyMemberHistory10_40 { @@ -50,14 +51,13 @@ public class FamilyMemberHistory10_40 { if (src.hasPatient()) { tgt.setPatient(VersionConvertor_10_40.convertReference(src.getPatient())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasStatus()) { tgt.setStatus(convertFamilyHistoryStatus(src.getStatus())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasRelationship()) { tgt.setRelationship(VersionConvertor_10_40.convertCodeableConcept(src.getRelationship())); } @@ -87,14 +87,13 @@ public class FamilyMemberHistory10_40 { if (src.hasPatient()) { tgt.setPatient(VersionConvertor_10_40.convertReference(src.getPatient())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasStatus()) { tgt.setStatus(convertFamilyHistoryStatus(src.getStatus())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasRelationship()) { tgt.setRelationship(VersionConvertor_10_40.convertCodeableConcept(src.getRelationship())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Flag10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Flag10_40.java index 4ca17c0dd..787d63bd3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Flag10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Flag10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Flag10_40 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Group10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Group10_40.java index b4648b47e..850858b6b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Group10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Group10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Group10_40 { @@ -16,18 +17,15 @@ public class Group10_40 { if (src.hasType()) { tgt.setType(convertGroupType(src.getType())); } - if (src.hasActual()) { - tgt.setActual(src.getActual()); - } + if (src.hasActualElement()) + tgt.setActualElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getActualElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasQuantityElement()) + tgt.setQuantityElement((org.hl7.fhir.r4.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getQuantityElement())); if (src.hasCharacteristic()) { for (org.hl7.fhir.dstu2.model.Group.GroupCharacteristicComponent t : src.getCharacteristic()) tgt.addCharacteristic(convertGroupCharacteristicComponent(t)); } @@ -48,18 +46,15 @@ public class Group10_40 { if (src.hasType()) { tgt.setType(convertGroupType(src.getType())); } - if (src.hasActual()) { - tgt.setActual(src.getActual()); - } + if (src.hasActualElement()) + tgt.setActualElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getActualElement())); if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasQuantityElement()) + tgt.setQuantityElement((org.hl7.fhir.dstu2.model.UnsignedIntType) VersionConvertor_10_40.convertType(src.getQuantityElement())); if (src.hasCharacteristic()) { for (org.hl7.fhir.r4.model.Group.GroupCharacteristicComponent t : src.getCharacteristic()) tgt.addCharacteristic(convertGroupCharacteristicComponent(t)); } @@ -80,9 +75,8 @@ public class Group10_40 { if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } - if (src.hasExclude()) { - tgt.setExclude(src.getExclude()); - } + if (src.hasExcludeElement()) + tgt.setExcludeElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExcludeElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } @@ -100,9 +94,8 @@ public class Group10_40 { if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } - if (src.hasExclude()) { - tgt.setExclude(src.getExclude()); - } + if (src.hasExcludeElement()) + tgt.setExcludeElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExcludeElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } @@ -120,9 +113,8 @@ public class Group10_40 { if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } - if (src.hasInactive()) { - tgt.setInactive(src.getInactive()); - } + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getInactiveElement())); return tgt; } @@ -137,9 +129,8 @@ public class Group10_40 { if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } - if (src.hasInactive()) { - tgt.setInactive(src.getInactive()); - } + if (src.hasInactiveElement()) + tgt.setInactiveElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getInactiveElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/HealthcareService10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/HealthcareService10_40.java index 67999c812..74fc4ab9d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/HealthcareService10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/HealthcareService10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class HealthcareService10_40 { @@ -68,12 +69,10 @@ public class HealthcareService10_40 { if (src.hasLocation()) { tgt.addLocation(VersionConvertor_10_40.convertReference(src.getLocation())); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } - if (src.hasExtraDetails()) { - tgt.setExtraDetails(src.getExtraDetails()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); + if (src.hasExtraDetailsElement()) + tgt.setExtraDetailsElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getExtraDetailsElement())); if (src.hasPhoto()) { tgt.setPhoto(VersionConvertor_10_40.convertAttachment(src.getPhoto())); } @@ -99,18 +98,16 @@ public class HealthcareService10_40 { if (src.hasReferralMethod()) { for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getReferralMethod()) tgt.addReferralMethod(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasAppointmentRequired()) { - tgt.setAppointmentRequired(src.getAppointmentRequired()); - } + if (src.hasAppointmentRequiredElement()) + tgt.setAppointmentRequiredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAppointmentRequiredElement())); if (src.hasAvailableTime()) { for (org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent t : src.getAvailableTime()) tgt.addAvailableTime(convertHealthcareServiceAvailableTimeComponent(t)); } if (src.hasNotAvailable()) { for (org.hl7.fhir.dstu2.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getAvailabilityExceptionsElement())); return tgt; } @@ -133,12 +130,10 @@ public class HealthcareService10_40 { if (src.hasLocation()) { for (org.hl7.fhir.r4.model.Reference t : src.getLocation()) tgt.setLocation(VersionConvertor_10_40.convertReference(t)); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } - if (src.hasExtraDetails()) { - tgt.setExtraDetails(src.getExtraDetails()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); + if (src.hasExtraDetailsElement()) + tgt.setExtraDetailsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getExtraDetailsElement())); if (src.hasPhoto()) { tgt.setPhoto(VersionConvertor_10_40.convertAttachment(src.getPhoto())); } @@ -165,18 +160,16 @@ public class HealthcareService10_40 { if (src.hasReferralMethod()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReferralMethod()) tgt.addReferralMethod(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasAppointmentRequired()) { - tgt.setAppointmentRequired(src.getAppointmentRequired()); - } + if (src.hasAppointmentRequiredElement()) + tgt.setAppointmentRequiredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAppointmentRequiredElement())); if (src.hasAvailableTime()) { for (org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent t : src.getAvailableTime()) tgt.addAvailableTime(convertHealthcareServiceAvailableTimeComponent(t)); } if (src.hasNotAvailable()) { for (org.hl7.fhir.r4.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getAvailabilityExceptionsElement())); return tgt; } @@ -188,15 +181,12 @@ public class HealthcareService10_40 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.dstu2.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_10_40.copyElement(t, tgt.addDaysOfWeekElement().setValue(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.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.r4.model.TimeType) VersionConvertor_10_40.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.r4.model.TimeType) VersionConvertor_10_40.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -208,15 +198,12 @@ public class HealthcareService10_40 { if (src.hasDaysOfWeek()) { for (org.hl7.fhir.r4.model.Enumeration t : src.getDaysOfWeek()) VersionConvertor_10_40.copyElement(t, tgt.addDaysOfWeekElement().setValue(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.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAllDayElement())); + if (src.hasAvailableStartTimeElement()) + tgt.setAvailableStartTimeElement((org.hl7.fhir.dstu2.model.TimeType) VersionConvertor_10_40.convertType(src.getAvailableStartTimeElement())); + if (src.hasAvailableEndTimeElement()) + tgt.setAvailableEndTimeElement((org.hl7.fhir.dstu2.model.TimeType) VersionConvertor_10_40.convertType(src.getAvailableEndTimeElement())); return tgt; } @@ -225,9 +212,8 @@ public class HealthcareService10_40 { return null; org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceNotAvailableComponent tgt = new org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceNotAvailableComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasDuring()) { tgt.setDuring(VersionConvertor_10_40.convertPeriod(src.getDuring())); } @@ -239,9 +225,8 @@ public class HealthcareService10_40 { return null; org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceNotAvailableComponent tgt = new org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceNotAvailableComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasDuring()) { tgt.setDuring(VersionConvertor_10_40.convertPeriod(src.getDuring())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ImplementationGuide10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ImplementationGuide10_40.java index b8e76bf6f..3124c8c71 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ImplementationGuide10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ImplementationGuide10_40.java @@ -1,11 +1,15 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.IdType; import org.hl7.fhir.dstu2.model.ImplementationGuide.GuidePageKind; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.Enumeration; import org.hl7.fhir.r4.model.ImplementationGuide.GuidePageGeneration; +import org.hl7.fhir.r4.model.StringType; + import java.util.List; +import java.util.Collections; public class ImplementationGuide10_40 { @@ -14,38 +18,32 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.r4.model.ImplementationGuide tgt = new org.hl7.fhir.r4.model.ImplementationGuide(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideContactComponent t : src.getContact()) tgt.addContact(convertImplementationGuideContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_10_40.convertCodeableConceptToUsageContext(t)); - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasFhirVersion()) { tgt.addFhirVersion(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); } @@ -69,39 +67,33 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.dstu2.model.ImplementationGuide tgt = new org.hl7.fhir.dstu2.model.ImplementationGuide(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertImplementationGuideContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); for (Enumeration v : src.getFhirVersion()) { tgt.setFhirVersion(v.asStringValue()); } @@ -128,9 +120,8 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -142,9 +133,8 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideContactComponent tgt = new org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -156,9 +146,8 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDependsOnComponent tgt = new org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDependsOnComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasUri()) { - tgt.setUri(src.getUri()); - } + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r4.model.CanonicalType) VersionConvertor_10_40.convertType(src.getUriElement())); return tgt; } @@ -168,9 +157,8 @@ public class ImplementationGuide10_40 { org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideDependencyComponent tgt = new org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideDependencyComponent(); VersionConvertor_10_40.copyElement(src, tgt); tgt.setType(org.hl7.fhir.dstu2.model.ImplementationGuide.GuideDependencyType.REFERENCE); - if (src.hasUri()) { - tgt.setUri(src.getUri()); - } + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUriElement())); return tgt; } @@ -179,9 +167,8 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasProfileElement()) { tgt.setProfile(VersionConvertor_10_40.convertCanonicalToReference(src.getProfileElement())); } @@ -193,9 +180,8 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasProfile()) { tgt.setProfileElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getProfile())); } @@ -207,15 +193,13 @@ public class ImplementationGuide10_40 { return null; org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuidePackageComponent tgt = new org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuidePackageComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasId()) { - tgt.setId(src.getId()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); + if (src.hasIdElement()) { + tgt.setIdElement((IdType) VersionConvertor_10_40.convertType(src.getIdElement())); } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } @@ -225,10 +209,10 @@ public class ImplementationGuide10_40 { org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent tgt = new org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent(); tgt.setId("p" + (context.getGrouping().size() + 1)); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuidePackageResourceComponent t : src.getResource()) { org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDefinitionResourceComponent tn = convertImplementationGuidePackageResourceComponent(t); tn.setGroupingId(tgt.getId()); @@ -244,10 +228,10 @@ public class ImplementationGuide10_40 { VersionConvertor_10_40.copyElement(src, tgt); if (src.hasExampleCanonicalType()) tgt.setExampleFor(VersionConvertor_10_40.convertCanonicalToReference(src.getExampleCanonicalType())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasReference()) tgt.setSource(VersionConvertor_10_40.convertReference(src.getReference())); return tgt; @@ -260,10 +244,10 @@ public class ImplementationGuide10_40 { VersionConvertor_10_40.copyElement(src, tgt); if (src.hasExampleFor()) tgt.setExample(VersionConvertor_10_40.convertReferenceToCanonical(src.getExampleFor())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasSourceReference()) tgt.setReference(VersionConvertor_10_40.convertReference(src.getSourceReference())); else if (src.hasSourceUriType()) @@ -281,8 +265,8 @@ public class ImplementationGuide10_40 { tgt.setName(convertUriToUrl(src.getSourceElement())); } } - if (src.hasName()) { - tgt.setTitle(src.getName()); + if (src.hasNameElement()) { + tgt.setTitleElement((StringType) VersionConvertor_10_40.convertType(src.getNameElement())); } if (src.hasKind()) tgt.setGeneration(convertPageGeneration(src.getKind())); @@ -299,8 +283,8 @@ public class ImplementationGuide10_40 { VersionConvertor_10_40.copyElement(src, tgt); if (src.hasNameUrlType()) tgt.setSource(src.getNameUrlType().getValue()); - if (src.hasTitle()) { - tgt.setName(src.getTitle()); + if (src.hasTitleElement()) { + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); } if (src.hasGeneration()) tgt.setKind(convertPageGeneration(src.getGeneration())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/List10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/List10_40.java index f769f7e58..98741810e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/List10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/List10_40.java @@ -2,6 +2,11 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.BooleanType; +import org.hl7.fhir.r4.model.DateTimeType; +import org.hl7.fhir.r4.model.StringType; + +import java.util.Collections; public class List10_40 { @@ -13,8 +18,8 @@ public class List10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) { + tgt.setTitleElement((StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); } if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); @@ -31,8 +36,8 @@ public class List10_40 { if (src.hasStatus()) { tgt.setStatus(convertListStatus(src.getStatus())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasOrderedBy()) { tgt.setOrderedBy(VersionConvertor_10_40.convertCodeableConcept(src.getOrderedBy())); } @@ -55,8 +60,8 @@ public class List10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasTitle()) { - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) { + tgt.setTitleElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); } if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); @@ -73,8 +78,8 @@ public class List10_40 { if (src.hasStatus()) { tgt.setStatus(convertListStatus(src.getStatus())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasOrderedBy()) { tgt.setOrderedBy(VersionConvertor_10_40.convertCodeableConcept(src.getOrderedBy())); } @@ -98,11 +103,11 @@ public class List10_40 { if (src.hasFlag()) { tgt.setFlag(VersionConvertor_10_40.convertCodeableConcept(src.getFlag())); } - if (src.hasDeleted()) { - tgt.setDeleted(src.getDeleted()); + if (src.hasDeletedElement()) { + tgt.setDeletedElement((BooleanType) VersionConvertor_10_40.convertType(src.getDeletedElement())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasItem()) { tgt.setItem(VersionConvertor_10_40.convertReference(src.getItem())); } @@ -117,11 +122,11 @@ public class List10_40 { if (src.hasFlag()) { tgt.setFlag(VersionConvertor_10_40.convertCodeableConcept(src.getFlag())); } - if (src.hasDeleted()) { - tgt.setDeleted(src.getDeleted()); + if (src.hasDeletedElement()) { + tgt.setDeletedElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getDeletedElement())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); if (src.hasItem()) { tgt.setItem(VersionConvertor_10_40.convertReference(src.getItem())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Location10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Location10_40.java index 7e4441de1..2e2042bd7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Location10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Location10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Location10_40 { @@ -16,12 +17,10 @@ public class Location10_40 { if (src.hasStatus()) { tgt.setStatus(convertLocationStatus(src.getStatus())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasMode()) { tgt.setMode(convertLocationMode(src.getMode())); } @@ -60,12 +59,10 @@ public class Location10_40 { if (src.hasStatus()) { tgt.setStatus(convertLocationStatus(src.getStatus())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasMode()) { tgt.setMode(convertLocationMode(src.getMode())); } @@ -124,15 +121,12 @@ public class Location10_40 { return null; org.hl7.fhir.r4.model.Location.LocationPositionComponent tgt = new org.hl7.fhir.r4.model.Location.LocationPositionComponent(); VersionConvertor_10_40.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.r4.model.DecimalType) VersionConvertor_10_40.convertType(src.getLongitudeElement())); + if (src.hasLatitudeElement()) + tgt.setLatitudeElement((org.hl7.fhir.r4.model.DecimalType) VersionConvertor_10_40.convertType(src.getLatitudeElement())); + if (src.hasAltitudeElement()) + tgt.setAltitudeElement((org.hl7.fhir.r4.model.DecimalType) VersionConvertor_10_40.convertType(src.getAltitudeElement())); return tgt; } @@ -141,15 +135,12 @@ public class Location10_40 { return null; org.hl7.fhir.dstu2.model.Location.LocationPositionComponent tgt = new org.hl7.fhir.dstu2.model.Location.LocationPositionComponent(); VersionConvertor_10_40.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.dstu2.model.DecimalType) VersionConvertor_10_40.convertType(src.getLongitudeElement())); + if (src.hasLatitudeElement()) + tgt.setLatitudeElement((org.hl7.fhir.dstu2.model.DecimalType) VersionConvertor_10_40.convertType(src.getLatitudeElement())); + if (src.hasAltitudeElement()) + tgt.setAltitudeElement((org.hl7.fhir.dstu2.model.DecimalType) VersionConvertor_10_40.convertType(src.getAltitudeElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationDispense10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationDispense10_40.java index e6e0869a2..3e357bc4f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationDispense10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationDispense10_40.java @@ -4,6 +4,9 @@ import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.Dosage; import org.hl7.fhir.r4.model.Dosage.DosageDoseAndRateComponent; +import org.hl7.fhir.r4.model.StringType; + +import java.util.Collections; public class MedicationDispense10_40 { @@ -36,20 +39,18 @@ public class MedicationDispense10_40 { if (src.hasDaysSupply()) { tgt.setDaysSupply(VersionConvertor_10_40.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.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getWhenPreparedElement())); + if (src.hasWhenHandedOverElement()) + tgt.setWhenHandedOverElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getWhenHandedOverElement())); if (src.hasDestination()) { tgt.setDestination(VersionConvertor_10_40.convertReference(src.getDestination())); } if (src.hasReceiver()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getReceiver()) tgt.addReceiver(VersionConvertor_10_40.convertReference(t)); } - if (src.hasNote()) - tgt.addNote().setText(src.getNote()); + if (src.hasNoteElement()) + tgt.setNote(Collections.singletonList((org.hl7.fhir.r4.model.Annotation) VersionConvertor_10_40.convertType(src.getNoteElement()))); if (src.hasDosageInstruction()) { for (org.hl7.fhir.dstu2.model.MedicationDispense.MedicationDispenseDosageInstructionComponent t : src.getDosageInstruction()) tgt.addDosageInstruction(convertMedicationDispenseDosageInstructionComponent(t)); } @@ -88,12 +89,10 @@ public class MedicationDispense10_40 { if (src.hasDaysSupply()) { tgt.setDaysSupply(VersionConvertor_10_40.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.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getWhenPreparedElement())); + if (src.hasWhenHandedOverElement()) + tgt.setWhenHandedOverElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getWhenHandedOverElement())); if (src.hasDestination()) { tgt.setDestination(VersionConvertor_10_40.convertReference(src.getDestination())); } @@ -117,8 +116,8 @@ public class MedicationDispense10_40 { return null; org.hl7.fhir.r4.model.Dosage tgt = new org.hl7.fhir.r4.model.Dosage(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasText()) { - tgt.setText(src.getText()); + if (src.hasTextElement()) { + tgt.setTextElement((StringType) VersionConvertor_10_40.convertType(src.getTextElement())); } if (src.hasTiming()) { tgt.setTiming(VersionConvertor_10_40.convertTiming(src.getTiming())); @@ -152,8 +151,8 @@ public class MedicationDispense10_40 { return null; org.hl7.fhir.dstu2.model.MedicationDispense.MedicationDispenseDosageInstructionComponent tgt = new org.hl7.fhir.dstu2.model.MedicationDispense.MedicationDispenseDosageInstructionComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasText()) { - tgt.setText(src.getText()); + if (src.hasTextElement()) { + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); } if (src.hasTiming()) { tgt.setTiming(VersionConvertor_10_40.convertTiming(src.getTiming())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationStatement10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationStatement10_40.java index 6d687156a..e5d60ff0d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationStatement10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MedicationStatement10_40.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.Dosage.DosageDoseAndRateComponent; +import java.util.Collections; public class MedicationStatement10_40 { @@ -32,8 +33,8 @@ public class MedicationStatement10_40 { if (src.hasDerivedFrom()) { for (org.hl7.fhir.r4.model.Reference t : src.getDerivedFrom()) tgt.addSupportingInformation(VersionConvertor_10_40.convertReference(t)); } - if (src.hasDateAsserted()) - tgt.setDateAsserted(src.getDateAsserted()); + if (src.hasDateAssertedElement()) + tgt.setDateAssertedElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateAssertedElement())); if (src.hasNote()) { for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.setNote(t.getText()); } @@ -69,10 +70,10 @@ public class MedicationStatement10_40 { if (src.hasSupportingInformation()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getSupportingInformation()) tgt.addDerivedFrom(VersionConvertor_10_40.convertReference(t)); } - if (src.hasDateAsserted()) - tgt.setDateAsserted(src.getDateAsserted()); - if (src.hasNote()) - tgt.addNote().setText(src.getNote()); + if (src.hasDateAssertedElement()) + tgt.setDateAssertedElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateAssertedElement())); + if (src.hasNoteElement()) + tgt.setNote(Collections.singletonList((org.hl7.fhir.r4.model.Annotation) VersionConvertor_10_40.convertType(src.getNoteElement()))); if (src.hasDosage()) { for (org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementDosageComponent t : src.getDosage()) tgt.addDosage(convertMedicationStatementDosageComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MessageHeader10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MessageHeader10_40.java index 3021311ad..bf22081fc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MessageHeader10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/MessageHeader10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class MessageHeader10_40 { @@ -10,15 +11,13 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.dstu2.model.MessageHeader.MessageDestinationComponent tgt = new org.hl7.fhir.dstu2.model.MessageHeader.MessageDestinationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTarget()) { tgt.setTarget(VersionConvertor_10_40.convertReference(src.getTarget())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getEndpointElement())); return tgt; } @@ -27,15 +26,13 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.r4.model.MessageHeader.MessageDestinationComponent tgt = new org.hl7.fhir.r4.model.MessageHeader.MessageDestinationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTarget()) { tgt.setTarget(VersionConvertor_10_40.convertReference(src.getTarget())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.r4.model.UrlType) VersionConvertor_10_40.convertType(src.getEndpointElement())); return tgt; } @@ -113,9 +110,8 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.dstu2.model.MessageHeader.MessageHeaderResponseComponent tgt = new org.hl7.fhir.dstu2.model.MessageHeader.MessageHeaderResponseComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasIdentifier()) { - tgt.setIdentifier(src.getIdentifier()); - } + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getIdentifierElement())); if (src.hasCode()) { tgt.setCode(convertResponseType(src.getCode())); } @@ -130,9 +126,8 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.r4.model.MessageHeader.MessageHeaderResponseComponent tgt = new org.hl7.fhir.r4.model.MessageHeader.MessageHeaderResponseComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasIdentifier()) { - tgt.setIdentifier(src.getIdentifier()); - } + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getIdentifierElement())); if (src.hasCode()) { tgt.setCode(convertResponseType(src.getCode())); } @@ -147,21 +142,17 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.r4.model.MessageHeader.MessageSourceComponent tgt = new org.hl7.fhir.r4.model.MessageHeader.MessageSourceComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasSoftwareElement()) + tgt.setSoftwareElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getSoftwareElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); if (src.hasContact()) { tgt.setContact(VersionConvertor_10_40.convertContactPoint(src.getContact())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.r4.model.UrlType) VersionConvertor_10_40.convertType(src.getEndpointElement())); return tgt; } @@ -170,21 +161,17 @@ public class MessageHeader10_40 { return null; org.hl7.fhir.dstu2.model.MessageHeader.MessageSourceComponent tgt = new org.hl7.fhir.dstu2.model.MessageHeader.MessageSourceComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasSoftwareElement()) + tgt.setSoftwareElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getSoftwareElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); if (src.hasContact()) { tgt.setContact(VersionConvertor_10_40.convertContactPoint(src.getContact())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getEndpointElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/NamingSystem10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/NamingSystem10_40.java index 1d8881462..6fe2cbaec 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/NamingSystem10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/NamingSystem10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class NamingSystem10_40 { @@ -10,39 +11,34 @@ public class NamingSystem10_40 { return null; org.hl7.fhir.r4.model.NamingSystem tgt = new org.hl7.fhir.r4.model.NamingSystem(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.NamingSystem.NamingSystemContactComponent t : src.getContact()) tgt.addContact(convertNamingSystemContactComponent(t)); } - if (src.hasResponsible()) { - tgt.setResponsible(src.getResponsible()); - } + if (src.hasResponsibleElement()) + tgt.setResponsibleElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getResponsibleElement())); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_10_40.convertCodeableConceptToUsageContext(t)); - if (src.hasUsage()) { - tgt.setUsage(src.getUsage()); - } + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.dstu2.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -54,40 +50,35 @@ public class NamingSystem10_40 { return null; org.hl7.fhir.dstu2.model.NamingSystem tgt = new org.hl7.fhir.dstu2.model.NamingSystem(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertNamingSystemContactComponent(t)); } - if (src.hasResponsible()) { - tgt.setResponsible(src.getResponsible()); - } + if (src.hasResponsibleElement()) + tgt.setResponsibleElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getResponsibleElement())); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasUsage()) { - tgt.setUsage(src.getUsage()); - } + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.r4.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -99,9 +90,8 @@ public class NamingSystem10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -113,9 +103,8 @@ public class NamingSystem10_40 { return null; org.hl7.fhir.dstu2.model.NamingSystem.NamingSystemContactComponent tgt = new org.hl7.fhir.dstu2.model.NamingSystem.NamingSystemContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -194,12 +183,10 @@ public class NamingSystem10_40 { if (src.hasType()) { tgt.setType(convertNamingSystemIdentifierType(src.getType())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } - if (src.hasPreferred()) { - tgt.setPreferred(src.getPreferred()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getPreferredElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } @@ -214,12 +201,10 @@ public class NamingSystem10_40 { if (src.hasType()) { tgt.setType(convertNamingSystemIdentifierType(src.getType())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } - if (src.hasPreferred()) { - tgt.setPreferred(src.getPreferred()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getPreferredElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_10_40.convertPeriod(src.getPeriod())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Observation10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Observation10_40.java index b11563075..e2d4c8cf2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Observation10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Observation10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Observation10_40 { @@ -31,9 +32,8 @@ public class Observation10_40 { if (src.hasEffective()) { tgt.setEffective(VersionConvertor_10_40.convertType(src.getEffective())); } - if (src.hasIssued()) { - tgt.setIssued(src.getIssued()); - } + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getIssuedElement())); if (src.hasPerformer()) { for (org.hl7.fhir.r4.model.Reference t : src.getPerformer()) tgt.addPerformer(VersionConvertor_10_40.convertReference(t)); } @@ -101,9 +101,8 @@ public class Observation10_40 { if (src.hasEffective()) { tgt.setEffective(VersionConvertor_10_40.convertType(src.getEffective())); } - if (src.hasIssued()) { - tgt.setIssued(src.getIssued()); - } + if (src.hasIssuedElement()) + tgt.setIssuedElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getIssuedElement())); if (src.hasPerformer()) { for (org.hl7.fhir.dstu2.model.Reference t : src.getPerformer()) tgt.addPerformer(VersionConvertor_10_40.convertReference(t)); } @@ -201,9 +200,8 @@ public class Observation10_40 { if (src.hasAge()) { tgt.setAge(VersionConvertor_10_40.convertRange(src.getAge())); } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); return tgt; } @@ -224,9 +222,8 @@ public class Observation10_40 { if (src.hasAge()) { tgt.setAge(VersionConvertor_10_40.convertRange(src.getAge())); } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationDefinition10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationDefinition10_40.java index 214a97267..dd3fdd5ee 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationDefinition10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationDefinition10_40.java @@ -7,6 +7,7 @@ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.Enumerations.SearchParamType; import org.hl7.fhir.r4.model.Type; import org.hl7.fhir.utilities.Utilities; +import java.util.Collections; public class OperationDefinition10_40 { @@ -15,58 +16,50 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.r4.model.OperationDefinition tgt = new org.hl7.fhir.r4.model.OperationDefinition(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionContactComponent t : src.getContact()) tgt.addContact(convertOperationDefinitionContactComponent(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasRequirements()) { tgt.setPurpose(src.getRequirements()); } if (src.hasIdempotent()) tgt.setAffectsState(!src.getIdempotent()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasNotes()) { tgt.setComment(src.getNotes()); } if (src.hasBase()) { tgt.setBaseElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getBase())); } - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getSystemElement())); if (src.hasType()) { for (org.hl7.fhir.dstu2.model.CodeType t : src.getType()) tgt.addResource(t.getValue()); } tgt.setType(tgt.hasResource()); - if (src.hasInstance()) { - tgt.setInstance(src.getInstance()); - } + if (src.hasInstanceElement()) + tgt.setInstanceElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -78,58 +71,50 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.dstu2.model.OperationDefinition tgt = new org.hl7.fhir.dstu2.model.OperationDefinition(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertOperationDefinitionContactComponent(t)); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasPurpose()) { tgt.setRequirements(src.getPurpose()); } if (src.hasAffectsState()) { tgt.setIdempotent(!src.getAffectsState()); } - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasComment()) { tgt.setNotes(src.getComment()); } if (src.hasBase()) tgt.setBase(VersionConvertor_10_40.convertCanonicalToReference(src.getBaseElement())); - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getSystemElement())); if (src.getType()) if (src.hasResource()) { for (org.hl7.fhir.r4.model.CodeType t : src.getResource()) tgt.addType(t.getValue()); } - if (src.hasInstance()) { - tgt.setInstance(src.getInstance()); - } + if (src.hasInstanceElement()) + tgt.setInstanceElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.r4.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -141,9 +126,8 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionContactComponent tgt = new org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -155,9 +139,8 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -202,27 +185,19 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.dstu2.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.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.hasSearchType()) { - if (src.hasSearchType()) { - tgt.setType(src.getSearchType().toCode()); - } - } else - tgt.setType(src.getType()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu2.model.IntegerType) VersionConvertor_10_40.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasTargetProfile()) { for (org.hl7.fhir.r4.model.UriType t : src.getTargetProfile()) tgt.setProfile(new Reference(t.getValue())); } @@ -239,31 +214,19 @@ public class OperationDefinition10_40 { return null; org.hl7.fhir.r4.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.r4.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.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 (Utilities.existsInList(src.getType(), "token", "reference", "composite", "number", "date", "quantity", "uri")) { - tgt.setType("string"); - if (src.hasType()) { - tgt.setSearchType(SearchParamType.fromCode(src.getType())); - } - } else { - if (src.hasType()) { - tgt.setType(src.getType()); - } - } + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r4.model.IntegerType) VersionConvertor_10_40.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDocumentationElement())); + if (Utilities.existsInList(src.getType(), "token", "reference", "composite", "number", "date", "quantity", "uri")) + tgt.setTypeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); if (src.hasProfile()) { tgt.addTargetProfile(src.getProfile().getReference()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationOutcome10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationOutcome10_40.java index c6ab803d8..f7b160b98 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationOutcome10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/OperationOutcome10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class OperationOutcome10_40 { @@ -209,9 +210,8 @@ public class OperationOutcome10_40 { if (src.hasDetails()) { tgt.setDetails(VersionConvertor_10_40.convertCodeableConcept(src.getDetails())); } - if (src.hasDiagnostics()) { - tgt.setDiagnostics(src.getDiagnostics()); - } + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.dstu2.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } @@ -232,9 +232,8 @@ public class OperationOutcome10_40 { if (src.hasDetails()) { tgt.setDetails(VersionConvertor_10_40.convertCodeableConcept(src.getDetails())); } - if (src.hasDiagnostics()) { - tgt.setDiagnostics(src.getDiagnostics()); - } + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.r4.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Organization10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Organization10_40.java index 29bbc0e40..973b62e46 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Organization10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Organization10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Organization10_40 { @@ -13,15 +14,13 @@ public class Organization10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasType()) { tgt.addType(VersionConvertor_10_40.convertCodeableConcept(src.getType())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -45,15 +44,13 @@ public class Organization10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCodeableConcept(src.getTypeFirstRep())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Parameters10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Parameters10_40.java index c7237187f..861a396ea 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Parameters10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Parameters10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Parameters10_40 { @@ -32,9 +33,8 @@ public class Parameters10_40 { return null; org.hl7.fhir.dstu2.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.dstu2.model.Parameters.ParametersParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } @@ -52,9 +52,8 @@ public class Parameters10_40 { return null; org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Patient10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Patient10_40.java index b5635e556..29536e704 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Patient10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Patient10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Patient10_40 { @@ -132,9 +133,8 @@ public class Patient10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.dstu2.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_10_40.convertHumanName(t)); } @@ -144,9 +144,8 @@ public class Patient10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r4.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasDeceased()) { tgt.setDeceased(VersionConvertor_10_40.convertType(src.getDeceased())); } @@ -190,9 +189,8 @@ public class Patient10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.r4.model.HumanName t : src.getName()) tgt.addName(VersionConvertor_10_40.convertHumanName(t)); } @@ -202,9 +200,8 @@ public class Patient10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu2.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasDeceased()) { tgt.setDeceased(VersionConvertor_10_40.convertType(src.getDeceased())); } @@ -248,9 +245,8 @@ public class Patient10_40 { if (src.hasLanguage()) { tgt.setLanguage(VersionConvertor_10_40.convertCodeableConcept(src.getLanguage())); } - if (src.hasPreferred()) { - tgt.setPreferred(src.getPreferred()); - } + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getPreferredElement())); return tgt; } @@ -262,9 +258,8 @@ public class Patient10_40 { if (src.hasLanguage()) { tgt.setLanguage(VersionConvertor_10_40.convertCodeableConcept(src.getLanguage())); } - if (src.hasPreferred()) { - tgt.setPreferred(src.getPreferred()); - } + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getPreferredElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Person10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Person10_40.java index 7103edbf2..1888ffba2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Person10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Person10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Person10_40 { @@ -56,9 +57,8 @@ public class Person10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r4.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasAddress()) { for (org.hl7.fhir.dstu2.model.Address t : src.getAddress()) tgt.addAddress(VersionConvertor_10_40.convertAddress(t)); } @@ -68,9 +68,8 @@ public class Person10_40 { if (src.hasManagingOrganization()) { tgt.setManagingOrganization(VersionConvertor_10_40.convertReference(src.getManagingOrganization())); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu2.model.Person.PersonLinkComponent t : src.getLink()) tgt.addLink(convertPersonLinkComponent(t)); } @@ -94,9 +93,8 @@ public class Person10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu2.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasAddress()) { for (org.hl7.fhir.r4.model.Address t : src.getAddress()) tgt.addAddress(VersionConvertor_10_40.convertAddress(t)); } @@ -106,9 +104,8 @@ public class Person10_40 { if (src.hasManagingOrganization()) { tgt.setManagingOrganization(VersionConvertor_10_40.convertReference(src.getManagingOrganization())); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasLink()) { for (org.hl7.fhir.r4.model.Person.PersonLinkComponent t : src.getLink()) tgt.addLink(convertPersonLinkComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Practitioner10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Practitioner10_40.java index 9e99e0e07..90151af02 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Practitioner10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Practitioner10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Practitioner10_40 { @@ -13,9 +14,8 @@ public class Practitioner10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasName()) { for (org.hl7.fhir.r4.model.HumanName t : src.getName()) tgt.setName(VersionConvertor_10_40.convertHumanName(t)); } @@ -28,9 +28,8 @@ public class Practitioner10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.dstu2.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasPhoto()) { for (org.hl7.fhir.r4.model.Attachment t : src.getPhoto()) tgt.addPhoto(VersionConvertor_10_40.convertAttachment(t)); } @@ -51,9 +50,8 @@ public class Practitioner10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasActive()) { - tgt.setActive(src.getActive()); - } + if (src.hasActiveElement()) + tgt.setActiveElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getActiveElement())); if (src.hasName()) tgt.addName(VersionConvertor_10_40.convertHumanName(src.getName())); if (src.hasTelecom()) { @@ -65,9 +63,8 @@ public class Practitioner10_40 { if (src.hasGender()) { tgt.setGender(VersionConvertor_10_40.convertAdministrativeGender(src.getGender())); } - if (src.hasBirthDate()) { - tgt.setBirthDate(src.getBirthDate()); - } + if (src.hasBirthDateElement()) + tgt.setBirthDateElement((org.hl7.fhir.r4.model.DateType) VersionConvertor_10_40.convertType(src.getBirthDateElement())); if (src.hasPhoto()) { for (org.hl7.fhir.dstu2.model.Attachment t : src.getPhoto()) tgt.addPhoto(VersionConvertor_10_40.convertAttachment(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Questionnaire10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Questionnaire10_40.java index 3a9bc7b0a..79e91f991 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Questionnaire10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Questionnaire10_40.java @@ -4,6 +4,7 @@ import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.ContactDetail; import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemAnswerOptionComponent; +import java.util.Collections; public class Questionnaire10_40 { @@ -15,17 +16,15 @@ public class Questionnaire10_40 { if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); - } + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); if (src.hasStatus()) { tgt.setStatus(convertQuestionnaireStatus(src.getStatus())); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (ContactDetail t : src.getContact()) for (org.hl7.fhir.r4.model.ContactPoint t1 : t.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t1)); } @@ -54,8 +53,8 @@ public class Questionnaire10_40 { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); tgt.setVersion(src.getVersion()); tgt.setStatus(convertQuestionnaireStatus(src.getStatus())); - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); tgt.setPublisher(src.getPublisher()); for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addContact(convertQuestionnaireContactComponent(t)); org.hl7.fhir.dstu2.model.Questionnaire.GroupComponent root = src.getGroup(); @@ -80,21 +79,17 @@ public class Questionnaire10_40 { return null; org.hl7.fhir.dstu2.model.Questionnaire.GroupComponent tgt = new org.hl7.fhir.dstu2.model.Questionnaire.GroupComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); if (src.hasCode()) { for (org.hl7.fhir.r4.model.Coding t : src.getCode()) tgt.addConcept(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasText()) { - tgt.setText(src.getText()); - } - if (src.hasRequired()) { - tgt.setRequired(src.getRequired()); - } - if (src.hasRepeats()) { - tgt.setRepeats(src.getRepeats()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRepeatsElement())); for (org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent t : src.getItem()) if (t.getType() == org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.GROUP) tgt.addGroup(convertQuestionnaireGroupComponent(t)); else @@ -107,22 +102,18 @@ public class Questionnaire10_40 { return null; org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); tgt.setType(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.GROUP); - if (src.hasRequired()) { - tgt.setRequired(src.getRequired()); - } - if (src.hasRepeats()) { - tgt.setRepeats(src.getRepeats()); - } + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRepeatsElement())); if (src.hasGroup()) { for (org.hl7.fhir.dstu2.model.Questionnaire.GroupComponent t : src.getGroup()) tgt.addItem(convertQuestionnaireGroupComponent(t)); } @@ -174,24 +165,20 @@ public class Questionnaire10_40 { return null; org.hl7.fhir.dstu2.model.Questionnaire.QuestionComponent tgt = new org.hl7.fhir.dstu2.model.Questionnaire.QuestionComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); if (src.hasCode()) { for (org.hl7.fhir.r4.model.Coding t : src.getCode()) tgt.addConcept(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); if (src.hasType()) { tgt.setType(convertQuestionnaireItemType(src.getType())); } - if (src.hasRequired()) { - tgt.setRequired(src.getRequired()); - } - if (src.hasRepeats()) { - tgt.setRepeats(src.getRepeats()); - } + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRepeatsElement())); if (src.hasAnswerValueSetElement()) { tgt.setOptions(VersionConvertor_10_40.convertCanonicalToReference(src.getAnswerValueSetElement())); } @@ -212,24 +199,20 @@ public class Questionnaire10_40 { return null; org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_10_40.convertCoding(t)); } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); if (src.hasType()) { tgt.setType(convertQuestionnaireQuestionType(src.getType())); } - if (src.hasRequired()) { - tgt.setRequired(src.getRequired()); - } - if (src.hasRepeats()) { - tgt.setRepeats(src.getRepeats()); - } + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRepeatsElement())); if (src.hasOptions()) { tgt.setAnswerValueSetElement(VersionConvertor_10_40.convertReferenceToCanonical(src.getOptions())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/QuestionnaireResponse10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/QuestionnaireResponse10_40.java index 84aef8183..5b3f0edb0 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/QuestionnaireResponse10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/QuestionnaireResponse10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class QuestionnaireResponse10_40 { @@ -10,12 +11,10 @@ public class QuestionnaireResponse10_40 { return null; org.hl7.fhir.dstu2.model.QuestionnaireResponse.GroupComponent tgt = new org.hl7.fhir.dstu2.model.QuestionnaireResponse.GroupComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); for (org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent t : src.getItem()) if (t.hasAnswer()) tgt.addQuestion(convertQuestionnaireItemToQuestion(t)); else @@ -28,12 +27,10 @@ public class QuestionnaireResponse10_40 { return null; org.hl7.fhir.dstu2.model.QuestionnaireResponse.QuestionComponent tgt = new org.hl7.fhir.dstu2.model.QuestionnaireResponse.QuestionComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } @@ -60,9 +57,8 @@ public class QuestionnaireResponse10_40 { if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } - if (src.hasAuthored()) { - tgt.setAuthored(src.getAuthored()); - } + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getAuthoredElement())); if (src.hasSource()) { tgt.setSource(VersionConvertor_10_40.convertReference(src.getSource())); } @@ -97,9 +93,8 @@ public class QuestionnaireResponse10_40 { if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_10_40.convertReference(src.getAuthor())); } - if (src.hasAuthored()) { - tgt.setAuthored(src.getAuthored()); - } + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getAuthoredElement())); if (src.hasSource()) { tgt.setSource(VersionConvertor_10_40.convertReference(src.getSource())); } @@ -116,12 +111,10 @@ public class QuestionnaireResponse10_40 { return null; org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); if (src.hasGroup()) { for (org.hl7.fhir.dstu2.model.QuestionnaireResponse.GroupComponent t : src.getGroup()) tgt.addItem(convertQuestionnaireResponseGroupComponent(t)); } @@ -164,12 +157,10 @@ public class QuestionnaireResponse10_40 { return null; org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLinkId()) { - tgt.setLinkId(src.getLinkId()); - } - if (src.hasText()) { - tgt.setText(src.getText()); - } + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.dstu2.model.QuestionnaireResponse.QuestionAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/RiskAssessment10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/RiskAssessment10_40.java index 89c40e61d..cb060fc5c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/RiskAssessment10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/RiskAssessment10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class RiskAssessment10_40 { @@ -34,9 +35,8 @@ public class RiskAssessment10_40 { if (src.hasPrediction()) { for (org.hl7.fhir.r4.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getMitigationElement())); return tgt; } @@ -69,9 +69,8 @@ public class RiskAssessment10_40 { if (src.hasPrediction()) { for (org.hl7.fhir.dstu2.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getMitigationElement())); return tgt; } @@ -86,15 +85,13 @@ public class RiskAssessment10_40 { if (src.hasProbability()) { tgt.setProbability(VersionConvertor_10_40.convertType(src.getProbability())); } - if (src.hasRelativeRisk()) { - tgt.setRelativeRisk(src.getRelativeRisk()); - } + if (src.hasRelativeRiskElement()) + tgt.setRelativeRiskElement((org.hl7.fhir.dstu2.model.DecimalType) VersionConvertor_10_40.convertType(src.getRelativeRiskElement())); if (src.hasWhen()) { tgt.setWhen(VersionConvertor_10_40.convertType(src.getWhen())); } - if (src.hasRationale()) { - tgt.setRationale(src.getRationale()); - } + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getRationaleElement())); return tgt; } @@ -109,15 +106,13 @@ public class RiskAssessment10_40 { if (src.hasProbability()) { tgt.setProbability(VersionConvertor_10_40.convertType(src.getProbability())); } - if (src.hasRelativeRisk()) { - tgt.setRelativeRisk(src.getRelativeRisk()); - } + if (src.hasRelativeRiskElement()) + tgt.setRelativeRiskElement((org.hl7.fhir.r4.model.DecimalType) VersionConvertor_10_40.convertType(src.getRelativeRiskElement())); if (src.hasWhen()) { tgt.setWhen(VersionConvertor_10_40.convertType(src.getWhen())); } - if (src.hasRationale()) { - tgt.setRationale(src.getRationale()); - } + if (src.hasRationaleElement()) + tgt.setRationaleElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getRationaleElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Schedule10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Schedule10_40.java index c9991bcf2..e8562ab59 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Schedule10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Schedule10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Schedule10_40 { @@ -22,9 +23,8 @@ public class Schedule10_40 { if (src.hasPlanningHorizon()) { tgt.setPlanningHorizon(VersionConvertor_10_40.convertPeriod(src.getPlanningHorizon())); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } @@ -45,9 +45,8 @@ public class Schedule10_40 { if (src.hasPlanningHorizon()) { tgt.setPlanningHorizon(VersionConvertor_10_40.convertPeriod(src.getPlanningHorizon())); } - if (src.hasComment()) { - tgt.setComment(src.getComment()); - } + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SearchParameter10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SearchParameter10_40.java index 11dfb5a37..f39470f05 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SearchParameter10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SearchParameter10_40.java @@ -1,8 +1,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.StringType; import org.hl7.fhir.dstu2.utils.ToolingExtensions; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.MarkdownType; + +import java.util.Collections; public class SearchParameter10_40 { @@ -11,46 +15,40 @@ public class SearchParameter10_40 { return null; org.hl7.fhir.dstu2.model.SearchParameter tgt = new org.hl7.fhir.dstu2.model.SearchParameter(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t)); } - if (src.hasPurpose()) { - tgt.setRequirements(src.getPurpose()); - } - if (src.hasCode()) { - tgt.setCode(src.getCode()); + if (src.hasPurposeElement()) { + tgt.setRequirementsElement((StringType) VersionConvertor_10_40.convertType(src.getPurposeElement())); } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); if (src.hasBase()) { for (org.hl7.fhir.r4.model.CodeType t : src.getBase()) tgt.setBase(t.asStringValue()); } if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertSearchParamType(src.getType())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasExpression()) { org.hl7.fhir.dstu2.utils.ToolingExtensions.setStringExtension(tgt, ToolingExtensions.EXT_EXPRESSION, src.getExpression()); } - if (src.hasXpath()) { - tgt.setXpath(src.getXpath()); - } + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getXpathElement())); if (src.hasXpathUsage()) { tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); } @@ -65,44 +63,37 @@ public class SearchParameter10_40 { return null; org.hl7.fhir.r4.model.SearchParameter tgt = new org.hl7.fhir.r4.model.SearchParameter(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(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.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.SearchParameter.SearchParameterContactComponent t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t)); } - if (src.hasRequirements()) { - tgt.setPurpose(src.getRequirements()); - } - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasBase()) { - tgt.addBase(src.getBase()); + if (src.hasRequirementsElement()) { + tgt.setPurposeElement((MarkdownType) VersionConvertor_10_40.convertType(src.getRequirementsElement())); } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); + if (src.hasBaseElement()) + tgt.setBase(Collections.singletonList((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getBaseElement()))); if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertSearchParamType(src.getType())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); tgt.setExpression(ToolingExtensions.readStringExtension(src, ToolingExtensions.EXT_EXPRESSION)); - if (src.hasXpath()) { - tgt.setXpath(src.getXpath()); - } + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getXpathElement())); if (src.hasXpathUsage()) { tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); } @@ -117,9 +108,8 @@ public class SearchParameter10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -131,9 +121,8 @@ public class SearchParameter10_40 { return null; org.hl7.fhir.dstu2.model.SearchParameter.SearchParameterContactComponent tgt = new org.hl7.fhir.dstu2.model.SearchParameter.SearchParameterContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Slot10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Slot10_40.java index 947d61764..78271aabb 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Slot10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Slot10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Slot10_40 { @@ -18,18 +19,14 @@ public class Slot10_40 { if (src.hasSchedule()) { tgt.setSchedule(VersionConvertor_10_40.convertReference(src.getSchedule())); } - 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.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); + if (src.hasOverbookedElement()) + tgt.setOverbookedElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getOverbookedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } @@ -47,18 +44,14 @@ public class Slot10_40 { if (src.hasSchedule()) { tgt.setSchedule(VersionConvertor_10_40.convertReference(src.getSchedule())); } - 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.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getStartElement())); + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); + if (src.hasOverbookedElement()) + tgt.setOverbookedElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getOverbookedElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/StructureDefinition10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/StructureDefinition10_40.java index cf3a58a21..009f10def 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/StructureDefinition10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/StructureDefinition10_40.java @@ -1,13 +1,18 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.CodeType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.CanonicalType; import org.hl7.fhir.r4.model.ElementDefinition; +import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionKind; import org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule; +import org.hl7.fhir.r4.model.UriType; import org.hl7.fhir.utilities.Utilities; import java.util.ArrayList; import java.util.List; +import java.util.Collections; public class StructureDefinition10_40 { @@ -51,37 +56,32 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.r4.model.StructureDefinition tgt = new org.hl7.fhir.r4.model.StructureDefinition(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDisplay()) { - tgt.setTitle(src.getDisplay()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDisplayElement()) { + tgt.setTitleElement((StringType) VersionConvertor_10_40.convertType(src.getDisplayElement())); } if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionContactComponent t : src.getContact()) tgt.addContact(convertStructureDefinitionContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); else @@ -89,9 +89,8 @@ public class StructureDefinition10_40 { if (src.hasRequirements()) { tgt.setPurpose(src.getRequirements()); } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasCode()) { for (org.hl7.fhir.dstu2.model.Coding t : src.getCode()) tgt.addKeyword(VersionConvertor_10_40.convertCoding(t)); } @@ -104,9 +103,8 @@ public class StructureDefinition10_40 { if (src.hasKind()) { tgt.setKind(convertStructureDefinitionKind(src.getKind(), tgt.getId())); } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAbstractElement())); for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) { org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext(); if (src.hasContextType()) { @@ -114,16 +112,16 @@ public class StructureDefinition10_40 { } ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue()); } - if (src.hasConstrainedType()) - tgt.setType(src.getConstrainedType()); + if (src.hasConstrainedTypeElement()) + tgt.setTypeElement((UriType) VersionConvertor_10_40.convertType(src.getConstrainedTypeElement())); else if (src.getSnapshot().hasElement()) tgt.setType(src.getSnapshot().getElement().get(0).getPath()); else if (src.getDifferential().hasElement() && !src.getDifferential().getElement().get(0).getPath().contains(".")) tgt.setType(src.getDifferential().getElement().get(0).getPath()); else tgt.setType(src.getDifferential().getElement().get(0).getPath().substring(0, src.getDifferential().getElement().get(0).getPath().indexOf("."))); - if (src.hasBase()) { - tgt.setBaseDefinition(src.getBase()); + if (src.hasBaseElement()) { + tgt.setBaseDefinitionElement((CanonicalType) VersionConvertor_10_40.convertType(src.getBaseElement())); } tgt.setDerivation(src.hasConstrainedType() ? org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule.CONSTRAINT : org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule.SPECIALIZATION); if (src.hasSnapshot()) { @@ -156,37 +154,32 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.dstu2.model.StructureDefinition tgt = new org.hl7.fhir.dstu2.model.StructureDefinition(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(t)); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasTitle()) { - tgt.setDisplay(src.getTitle()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasTitleElement()) { + tgt.setDisplayElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getTitleElement())); } if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertStructureDefinitionContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -195,9 +188,8 @@ public class StructureDefinition10_40 { if (src.hasPurpose()) { tgt.setRequirements(src.getPurpose()); } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasKeyword()) { for (org.hl7.fhir.r4.model.Coding t : src.getKeyword()) tgt.addCode(VersionConvertor_10_40.convertCoding(t)); } @@ -209,19 +201,18 @@ public class StructureDefinition10_40 { if (src.hasKind()) { tgt.setKind(convertStructureDefinitionKind(src.getKind())); } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAbstractElement())); for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) { if (!tgt.hasContextType()) tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression())); tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression()); } - if (src.hasType()) { - tgt.setConstrainedType(src.getType()); + if (src.hasTypeElement()) { + tgt.setConstrainedTypeElement((CodeType) VersionConvertor_10_40.convertType(src.getTypeElement())); } - if (src.hasBaseDefinition()) { - tgt.setBase(src.getBaseDefinition()); + if (src.hasBaseDefinitionElement()) { + tgt.setBaseElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getBaseDefinitionElement())); } if (src.hasSnapshot()) { tgt.setSnapshot(convertStructureDefinitionSnapshotComponent(src.getSnapshot())); @@ -243,9 +234,8 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionContactComponent tgt = new org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -257,9 +247,8 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -333,17 +322,14 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_10_40.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.setComments(src.getComment()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasCommentElement()) { + tgt.setCommentsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCommentElement())); } return tgt; } @@ -353,17 +339,14 @@ public class StructureDefinition10_40 { return null; org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_10_40.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.hasComments()) { - tgt.setComment(src.getComments()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasCommentsElement()) { + tgt.setCommentElement((StringType) VersionConvertor_10_40.convertType(src.getCommentsElement())); } return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Subscription10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Subscription10_40.java index 27e4401a0..a739c6e95 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Subscription10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Subscription10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Subscription10_40 { @@ -10,27 +11,23 @@ public class Subscription10_40 { return null; org.hl7.fhir.r4.model.Subscription tgt = new org.hl7.fhir.r4.model.Subscription(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasCriteria()) { - tgt.setCriteria(src.getCriteria()); - } + if (src.hasCriteriaElement()) + tgt.setCriteriaElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCriteriaElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getContact()) tgt.addContact(VersionConvertor_10_40.convertContactPoint(t)); } - if (src.hasReason()) { - tgt.setReason(src.getReason()); - } + if (src.hasReasonElement()) + tgt.setReasonElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getReasonElement())); if (src.hasStatus()) { tgt.setStatus(convertSubscriptionStatus(src.getStatus())); } - if (src.hasError()) { - tgt.setError(src.getError()); - } + if (src.hasErrorElement()) + tgt.setErrorElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getErrorElement())); if (src.hasChannel()) { tgt.setChannel(convertSubscriptionChannelComponent(src.getChannel())); } - if (src.hasEnd()) { - tgt.setEnd(src.getEnd()); - } + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.r4.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); return tgt; } @@ -39,27 +36,23 @@ public class Subscription10_40 { return null; org.hl7.fhir.dstu2.model.Subscription tgt = new org.hl7.fhir.dstu2.model.Subscription(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasCriteria()) { - tgt.setCriteria(src.getCriteria()); - } + if (src.hasCriteriaElement()) + tgt.setCriteriaElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCriteriaElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getContact()) tgt.addContact(VersionConvertor_10_40.convertContactPoint(t)); } - if (src.hasReason()) { - tgt.setReason(src.getReason()); - } + if (src.hasReasonElement()) + tgt.setReasonElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getReasonElement())); if (src.hasStatus()) { tgt.setStatus(convertSubscriptionStatus(src.getStatus())); } - if (src.hasError()) { - tgt.setError(src.getError()); - } + if (src.hasErrorElement()) + tgt.setErrorElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getErrorElement())); if (src.hasChannel()) { tgt.setChannel(convertSubscriptionChannelComponent(src.getChannel())); } - if (src.hasEnd()) { - tgt.setEnd(src.getEnd()); - } + if (src.hasEndElement()) + tgt.setEndElement((org.hl7.fhir.dstu2.model.InstantType) VersionConvertor_10_40.convertType(src.getEndElement())); return tgt; } @@ -71,15 +64,12 @@ public class Subscription10_40 { if (src.hasType()) { tgt.setType(convertSubscriptionChannelType(src.getType())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } - if (src.hasPayload()) { - tgt.setPayload(src.getPayload()); - } - if (src.hasHeader()) { - tgt.addHeader(src.getHeader()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.r4.model.UrlType) VersionConvertor_10_40.convertType(src.getEndpointElement())); + if (src.hasPayloadElement()) + tgt.setPayloadElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getPayloadElement())); + if (src.hasHeaderElement()) + tgt.setHeader(Collections.singletonList((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getHeaderElement()))); return tgt; } @@ -91,12 +81,10 @@ public class Subscription10_40 { if (src.hasType()) { tgt.setType(convertSubscriptionChannelType(src.getType())); } - if (src.hasEndpoint()) { - tgt.setEndpoint(src.getEndpoint()); - } - if (src.hasPayload()) { - tgt.setPayload(src.getPayload()); - } + if (src.hasEndpointElement()) + tgt.setEndpointElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getEndpointElement())); + if (src.hasPayloadElement()) + tgt.setPayloadElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPayloadElement())); if (src.hasHeader()) tgt.setHeaderElement(VersionConvertor_10_40.convertString(src.getHeader().get(0))); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Substance10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Substance10_40.java index 23c9b4e1d..15623f78d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Substance10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Substance10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Substance10_40 { @@ -19,9 +20,8 @@ public class Substance10_40 { if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasInstance()) { for (org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t)); } @@ -45,9 +45,8 @@ public class Substance10_40 { if (src.hasCode()) { tgt.setCode(VersionConvertor_10_40.convertCodeableConcept(src.getCode())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasInstance()) { for (org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t)); } @@ -90,9 +89,8 @@ public class Substance10_40 { if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasExpiry()) { - tgt.setExpiry(src.getExpiry()); - } + if (src.hasExpiryElement()) + tgt.setExpiryElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getExpiryElement())); if (src.hasQuantity()) { tgt.setQuantity(VersionConvertor_10_40.convertSimpleQuantity(src.getQuantity())); } @@ -107,9 +105,8 @@ public class Substance10_40 { if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasExpiry()) { - tgt.setExpiry(src.getExpiry()); - } + if (src.hasExpiryElement()) + tgt.setExpiryElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getExpiryElement())); if (src.hasQuantity()) { tgt.setQuantity(VersionConvertor_10_40.convertSimpleQuantity(src.getQuantity())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyDelivery10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyDelivery10_40.java index 5bc364e02..b47553583 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyDelivery10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyDelivery10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class SupplyDelivery10_40 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyRequest10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyRequest10_40.java index 10d2cead5..9c4d7ba2a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyRequest10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/SupplyRequest10_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class SupplyRequest10_40 { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/TestScript10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/TestScript10_40.java index 016926092..82b25c7f3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/TestScript10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/TestScript10_40.java @@ -1,7 +1,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertor_10_40; +import org.hl7.fhir.dstu2.model.IdType; +import org.hl7.fhir.dstu2.model.StringType; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.MarkdownType; + +import java.util.Collections; public class TestScript10_40 { @@ -183,60 +188,46 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptSetupActionAssertComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptSetupActionAssertComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLabel()) { - tgt.setLabel(src.getLabel()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasLabelElement()) + tgt.setLabelElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLabelElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasDirection()) { tgt.setDirection(convertAssertionDirectionType(src.getDirection())); } - if (src.hasCompareToSourceId()) { - tgt.setCompareToSourceId(src.getCompareToSourceId()); - } - if (src.hasCompareToSourcePath()) { - tgt.setCompareToSourcePath(src.getCompareToSourcePath()); - } - if (src.hasContentType()) { - tgt.setContentType(convertContentType(src.getContentType())); - } - if (src.hasHeaderField()) { - tgt.setHeaderField(src.getHeaderField()); - } - if (src.hasMinimumId()) { - tgt.setMinimumId(src.getMinimumId()); - } - if (src.hasNavigationLinks()) { - tgt.setNavigationLinks(src.getNavigationLinks()); - } + if (src.hasCompareToSourceIdElement()) + tgt.setCompareToSourceIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCompareToSourceIdElement())); + if (src.hasCompareToSourcePathElement()) + tgt.setCompareToSourcePathElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCompareToSourcePathElement())); + if (src.hasContentType()) { + tgt.setContentType(convertContentType(src.getContentType())); + } + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getHeaderFieldElement())); + if (src.hasMinimumIdElement()) + tgt.setMinimumIdElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getMinimumIdElement())); + if (src.hasNavigationLinksElement()) + tgt.setNavigationLinksElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getNavigationLinksElement())); if (src.hasOperator()) { tgt.setOperator(convertAssertionOperatorType(src.getOperator())); } - if (src.hasPath()) { - tgt.setPath(src.getPath()); - } - if (src.hasResource()) { - tgt.setResource(src.getResource()); - } + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPathElement())); + if (src.hasResourceElement()) + tgt.setResourceElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getResourceElement())); if (src.hasResponse()) { tgt.setResponse(convertAssertionResponseTypes(src.getResponse())); } - if (src.hasResponseCode()) { - tgt.setResponseCode(src.getResponseCode()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } - if (src.hasValidateProfileId()) { - tgt.setValidateProfileId(src.getValidateProfileId()); - } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } - if (src.hasWarningOnly()) { - tgt.setWarningOnly(src.getWarningOnly()); - } + if (src.hasResponseCodeElement()) + tgt.setResponseCodeElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getResponseCodeElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); + if (src.hasValidateProfileIdElement()) + tgt.setValidateProfileIdElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getValidateProfileIdElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); + if (src.hasWarningOnlyElement()) + tgt.setWarningOnlyElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getWarningOnlyElement())); return tgt; } @@ -245,60 +236,46 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.SetupActionAssertComponent tgt = new org.hl7.fhir.r4.model.TestScript.SetupActionAssertComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLabel()) { - tgt.setLabel(src.getLabel()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasLabelElement()) + tgt.setLabelElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLabelElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasDirection()) { tgt.setDirection(convertAssertionDirectionType(src.getDirection())); } - if (src.hasCompareToSourceId()) { - tgt.setCompareToSourceId(src.getCompareToSourceId()); - } - if (src.hasCompareToSourcePath()) { - tgt.setCompareToSourcePath(src.getCompareToSourcePath()); - } - if (src.hasContentType()) { - tgt.setContentType(convertContentType(src.getContentType())); - } - if (src.hasHeaderField()) { - tgt.setHeaderField(src.getHeaderField()); - } - if (src.hasMinimumId()) { - tgt.setMinimumId(src.getMinimumId()); - } - if (src.hasNavigationLinks()) { - tgt.setNavigationLinks(src.getNavigationLinks()); - } + if (src.hasCompareToSourceIdElement()) + tgt.setCompareToSourceIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCompareToSourceIdElement())); + if (src.hasCompareToSourcePathElement()) + tgt.setCompareToSourcePathElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getCompareToSourcePathElement())); + if (src.hasContentType()) { + tgt.setContentType(convertContentType(src.getContentType())); + } + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getHeaderFieldElement())); + if (src.hasMinimumIdElement()) + tgt.setMinimumIdElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getMinimumIdElement())); + if (src.hasNavigationLinksElement()) + tgt.setNavigationLinksElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getNavigationLinksElement())); if (src.hasOperator()) { tgt.setOperator(convertAssertionOperatorType(src.getOperator())); } - if (src.hasPath()) { - tgt.setPath(src.getPath()); - } - if (src.hasResource()) { - tgt.setResource(src.getResource()); - } + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPathElement())); + if (src.hasResourceElement()) + tgt.setResourceElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getResourceElement())); if (src.hasResponse()) { tgt.setResponse(convertAssertionResponseTypes(src.getResponse())); } - if (src.hasResponseCode()) { - tgt.setResponseCode(src.getResponseCode()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } - if (src.hasValidateProfileId()) { - tgt.setValidateProfileId(src.getValidateProfileId()); - } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } - if (src.hasWarningOnly()) { - tgt.setWarningOnly(src.getWarningOnly()); - } + if (src.hasResponseCodeElement()) + tgt.setResponseCodeElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getResponseCodeElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); + if (src.hasValidateProfileIdElement()) + tgt.setValidateProfileIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getValidateProfileIdElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); + if (src.hasWarningOnlyElement()) + tgt.setWarningOnlyElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getWarningOnlyElement())); return tgt; } @@ -338,45 +315,36 @@ public class TestScript10_40 { if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCoding(src.getType())); } - if (src.hasResource()) { - tgt.setResource(src.getResource()); - } - if (src.hasLabel()) { - tgt.setLabel(src.getLabel()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasAccept()) { - tgt.setAccept(convertContentType(src.getAccept())); - } - if (src.hasContentType()) { - tgt.setContentType(convertContentType(src.getContentType())); - } - if (src.hasDestination()) { - tgt.setDestination(src.getDestination()); - } - if (src.hasEncodeRequestUrl()) { - tgt.setEncodeRequestUrl(src.getEncodeRequestUrl()); - } - if (src.hasParams()) { - tgt.setParams(src.getParams()); - } + if (src.hasResourceElement()) + tgt.setResourceElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getResourceElement())); + if (src.hasLabelElement()) + tgt.setLabelElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getLabelElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasAccept()) { + tgt.setAccept(convertContentType(src.getAccept())); + } + if (src.hasContentType()) { + tgt.setContentType(convertContentType(src.getContentType())); + } + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.dstu2.model.IntegerType) VersionConvertor_10_40.convertType(src.getDestinationElement())); + if (src.hasEncodeRequestUrlElement()) + tgt.setEncodeRequestUrlElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getEncodeRequestUrlElement())); + if (src.hasParamsElement()) + tgt.setParamsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getParamsElement())); if (src.hasRequestHeader()) { for (org.hl7.fhir.r4.model.TestScript.SetupActionOperationRequestHeaderComponent t : src.getRequestHeader()) tgt.addRequestHeader(convertSetupActionOperationRequestHeaderComponent(t)); } - if (src.hasResponseId()) { - tgt.setResponseId(src.getResponseId()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } - if (src.hasTargetId()) { - tgt.setTargetId(src.getTargetId()); - } - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); + if (src.hasResponseIdElement()) + tgt.setResponseIdElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getResponseIdElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); + if (src.hasTargetIdElement()) { + tgt.setTargetIdElement((IdType) VersionConvertor_10_40.convertType(src.getTargetIdElement())); } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getUrlElement())); return tgt; } @@ -388,45 +356,36 @@ public class TestScript10_40 { if (src.hasType()) { tgt.setType(VersionConvertor_10_40.convertCoding(src.getType())); } - if (src.hasResource()) { - tgt.setResource(src.getResource()); - } - if (src.hasLabel()) { - tgt.setLabel(src.getLabel()); - } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasAccept()) { - tgt.setAccept(convertContentType(src.getAccept())); - } - if (src.hasContentType()) { - tgt.setContentType(convertContentType(src.getContentType())); - } - if (src.hasDestination()) { - tgt.setDestination(src.getDestination()); - } - if (src.hasEncodeRequestUrl()) { - tgt.setEncodeRequestUrl(src.getEncodeRequestUrl()); - } - if (src.hasParams()) { - tgt.setParams(src.getParams()); - } + if (src.hasResourceElement()) + tgt.setResourceElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getResourceElement())); + if (src.hasLabelElement()) + tgt.setLabelElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getLabelElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasAccept()) { + tgt.setAccept(convertContentType(src.getAccept())); + } + if (src.hasContentType()) { + tgt.setContentType(convertContentType(src.getContentType())); + } + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.r4.model.IntegerType) VersionConvertor_10_40.convertType(src.getDestinationElement())); + if (src.hasEncodeRequestUrlElement()) + tgt.setEncodeRequestUrlElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getEncodeRequestUrlElement())); + if (src.hasParamsElement()) + tgt.setParamsElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getParamsElement())); if (src.hasRequestHeader()) { for (org.hl7.fhir.dstu2.model.TestScript.TestScriptSetupActionOperationRequestHeaderComponent t : src.getRequestHeader()) tgt.addRequestHeader(convertSetupActionOperationRequestHeaderComponent(t)); } - if (src.hasResponseId()) { - tgt.setResponseId(src.getResponseId()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } - if (src.hasTargetId()) { - tgt.setTargetId(src.getTargetId()); - } - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); + if (src.hasResponseIdElement()) + tgt.setResponseIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getResponseIdElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); + if (src.hasTargetIdElement()) { + tgt.setTargetIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getTargetIdElement())); } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getUrlElement())); return tgt; } @@ -435,12 +394,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.SetupActionOperationRequestHeaderComponent tgt = new org.hl7.fhir.r4.model.TestScript.SetupActionOperationRequestHeaderComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasField()) { - tgt.setField(src.getField()); - } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasFieldElement()) + tgt.setFieldElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getFieldElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -449,12 +406,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptSetupActionOperationRequestHeaderComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptSetupActionOperationRequestHeaderComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasField()) { - tgt.setField(src.getField()); - } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasFieldElement()) + tgt.setFieldElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getFieldElement())); + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -513,45 +468,39 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript tgt = new org.hl7.fhir.dstu2.model.TestScript(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertTestScriptContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t)); } - if (src.hasPurpose()) { - tgt.setRequirements(src.getPurpose()); - } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); + if (src.hasPurposeElement()) { + tgt.setRequirementsElement((StringType) VersionConvertor_10_40.convertType(src.getPurposeElement())); } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasMetadata()) { tgt.setMetadata(convertTestScriptMetadataComponent(src.getMetadata())); } @@ -581,44 +530,38 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript tgt = new org.hl7.fhir.r4.model.TestScript(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } if (src.hasIdentifier()) { tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.TestScript.TestScriptContactComponent t : src.getContact()) tgt.addContact(convertTestScriptContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_10_40.convertCodeableConceptToUsageContext(t)); - if (src.hasRequirements()) { - tgt.setPurpose(src.getRequirements()); - } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); + if (src.hasRequirementsElement()) { + tgt.setPurposeElement((MarkdownType) VersionConvertor_10_40.convertType(src.getRequirementsElement())); } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasMetadata()) { tgt.setMetadata(convertTestScriptMetadataComponent(src.getMetadata())); } @@ -648,9 +591,8 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptContactComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -662,9 +604,8 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -676,12 +617,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.TestScriptFixtureComponent tgt = new org.hl7.fhir.r4.model.TestScript.TestScriptFixtureComponent(); VersionConvertor_10_40.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.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAutocreateElement())); + if (src.hasAutodeleteElement()) + tgt.setAutodeleteElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAutodeleteElement())); if (src.hasResource()) { tgt.setResource(VersionConvertor_10_40.convertReference(src.getResource())); } @@ -693,12 +632,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptFixtureComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptFixtureComponent(); VersionConvertor_10_40.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.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAutocreateElement())); + if (src.hasAutodeleteElement()) + tgt.setAutodeleteElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAutodeleteElement())); if (src.hasResource()) { tgt.setResource(VersionConvertor_10_40.convertReference(src.getResource())); } @@ -710,18 +647,14 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptMetadataCapabilityComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptMetadataCapabilityComponent(); VersionConvertor_10_40.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.hasDestination()) { - tgt.setDestination(src.getDestination()); - } + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasValidatedElement()) + tgt.setValidatedElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getValidatedElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.dstu2.model.IntegerType) VersionConvertor_10_40.convertType(src.getDestinationElement())); if (src.hasLink()) { for (org.hl7.fhir.r4.model.UriType t : src.getLink()) tgt.addLink(t.getValue()); } @@ -736,18 +669,14 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.TestScriptMetadataCapabilityComponent tgt = new org.hl7.fhir.r4.model.TestScript.TestScriptMetadataCapabilityComponent(); VersionConvertor_10_40.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.hasDestination()) { - tgt.setDestination(src.getDestination()); - } + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getRequiredElement())); + if (src.hasValidatedElement()) + tgt.setValidatedElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getValidatedElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); + if (src.hasDestinationElement()) + tgt.setDestinationElement((org.hl7.fhir.r4.model.IntegerType) VersionConvertor_10_40.convertType(src.getDestinationElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu2.model.UriType t : src.getLink()) tgt.addLink(t.getValue()); } @@ -790,12 +719,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.TestScriptMetadataLinkComponent tgt = new org.hl7.fhir.r4.model.TestScript.TestScriptMetadataLinkComponent(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } @@ -804,12 +731,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptMetadataLinkComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptMetadataLinkComponent(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); return tgt; } @@ -862,12 +787,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.TestScriptTestComponent tgt = new org.hl7.fhir.r4.model.TestScript.TestScriptTestComponent(); VersionConvertor_10_40.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.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.dstu2.model.TestScript.TestScriptTestActionComponent t : src.getAction()) tgt.addAction(convertTestActionComponent(t)); } @@ -879,12 +802,10 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptTestComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptTestComponent(); VersionConvertor_10_40.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.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); if (src.hasAction()) { for (org.hl7.fhir.r4.model.TestScript.TestActionComponent t : src.getAction()) tgt.addAction(convertTestActionComponent(t)); } @@ -896,18 +817,14 @@ public class TestScript10_40 { return null; org.hl7.fhir.dstu2.model.TestScript.TestScriptVariableComponent tgt = new org.hl7.fhir.dstu2.model.TestScript.TestScriptVariableComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasHeaderField()) { - tgt.setHeaderField(src.getHeaderField()); - } - if (src.hasPath()) { - tgt.setPath(src.getPath()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getHeaderFieldElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPathElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.dstu2.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); return tgt; } @@ -916,18 +833,14 @@ public class TestScript10_40 { return null; org.hl7.fhir.r4.model.TestScript.TestScriptVariableComponent tgt = new org.hl7.fhir.r4.model.TestScript.TestScriptVariableComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasHeaderField()) { - tgt.setHeaderField(src.getHeaderField()); - } - if (src.hasPath()) { - tgt.setPath(src.getPath()); - } - if (src.hasSourceId()) { - tgt.setSourceId(src.getSourceId()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); + if (src.hasHeaderFieldElement()) + tgt.setHeaderFieldElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getHeaderFieldElement())); + if (src.hasPathElement()) + tgt.setPathElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPathElement())); + if (src.hasSourceIdElement()) + tgt.setSourceIdElement((org.hl7.fhir.r4.model.IdType) VersionConvertor_10_40.convertType(src.getSourceIdElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ValueSet10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ValueSet10_40.java index dd7a231cf..4618f4956 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ValueSet10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/ValueSet10_40.java @@ -3,12 +3,12 @@ package org.hl7.fhir.convertors.conv10_40; import org.hl7.fhir.convertors.VersionConvertorAdvisor40; import org.hl7.fhir.convertors.VersionConvertor_10_40; import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.r4.model.BooleanType; -import org.hl7.fhir.r4.model.CodeSystem; +import org.hl7.fhir.r4.model.*; import org.hl7.fhir.r4.model.CodeSystem.CodeSystemContentMode; import org.hl7.fhir.r4.model.CodeSystem.ConceptDefinitionComponent; import org.hl7.fhir.r4.terminologies.CodeSystemUtilities; import java.util.List; +import java.util.Collections; public class ValueSet10_40 { @@ -17,12 +17,10 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_10_40.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.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu2.model.ValueSet.ConceptDefinitionDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -34,12 +32,10 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_10_40.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.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r4.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -51,15 +47,13 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ConceptReferenceDesignationComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ConceptReferenceDesignationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLanguage()) { - tgt.setLanguage(src.getLanguage()); - } + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_10_40.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -68,15 +62,13 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ConceptDefinitionDesignationComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ConceptDefinitionDesignationComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasLanguage()) { - tgt.setLanguage(src.getLanguage()); - } + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_10_40.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -85,12 +77,10 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -105,12 +95,10 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ConceptSetComponent(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.r4.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -125,15 +113,13 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setProperty(src.getProperty()); - } + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getPropertyElement())); if (src.hasOp()) { tgt.setOp(convertFilterOperator(src.getOp())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -142,15 +128,13 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setProperty(src.getProperty()); - } + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getPropertyElement())); if (src.hasOp()) { tgt.setOp(convertFilterOperator(src.getOp())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getValueElement())); return tgt; } @@ -205,55 +189,48 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet tgt = new org.hl7.fhir.r4.model.ValueSet(); VersionConvertor_10_40.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r4.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); if (src.hasIdentifier()) { tgt.addIdentifier(VersionConvertor_10_40.convertIdentifier(src.getIdentifier())); } - if (src.hasVersion()) { - tgt.setVersion(src.getVersion()); - } - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgt.setPublisher(src.getPublisher()); - } + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.ValueSet.ValueSetContactComponent t : src.getContact()) tgt.addContact(convertValueSetContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_10_40.convertCodeableConceptToUsageContext(t)); - if (src.hasImmutable()) { - tgt.setImmutable(src.getImmutable()); - } + if (src.hasImmutableElement()) + tgt.setImmutableElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getImmutableElement())); if (src.hasRequirements()) { tgt.setPurpose(src.getRequirements()); } - if (src.hasCopyright()) { - tgt.setCopyright(src.getCopyright()); - } + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.r4.model.MarkdownType) VersionConvertor_10_40.convertType(src.getCopyrightElement())); if (src.hasExtensible()) tgt.addExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible", new BooleanType(src.getExtensible())); if (src.hasCompose()) { if (src.hasCompose()) { tgt.setCompose(convertValueSetComposeComponent(src.getCompose())); } - if (src.hasLockedDate()) { - tgt.getCompose().setLockedDate(src.getLockedDate()); + if (src.hasLockedDateElement()) { + tgt.getCompose().setLockedDateElement((DateType) VersionConvertor_10_40.convertType(src.getLockedDateElement())); } } if (src.hasCodeSystem() && advisor != null) { @@ -274,18 +251,18 @@ public class ValueSet10_40 { if (src.hasStatus()) { tgtcs.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgtcs.setExperimental(src.getExperimental()); - if (src.hasPublisher()) { - tgtcs.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgtcs.setExperimentalElement((BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) { + tgtcs.setPublisherElement((StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); } if (src.hasContact()) { for (org.hl7.fhir.dstu2.model.ValueSet.ValueSetContactComponent t : src.getContact()) tgtcs.addContact(convertValueSetContactComponent(t)); } - if (src.hasDate()) - tgtcs.setDate(src.getDate()); - if (src.hasDescription()) { - tgtcs.setDescription(src.getDescription()); + if (src.hasDateElement()) + tgtcs.setDateElement((DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) { + tgtcs.setDescriptionElement((MarkdownType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); } for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_40.isJurisdiction(t)) tgtcs.addJurisdiction(VersionConvertor_10_40.convertCodeableConcept(t)); @@ -319,24 +296,24 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet tgt = new org.hl7.fhir.dstu2.model.ValueSet(); VersionConvertor_10_40.copyDomainResource(src, tgt); - tgt.setUrl(src.getUrl()); + tgt.setUrlElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getUrlElement())); for (org.hl7.fhir.r4.model.Identifier i : src.getIdentifier()) tgt.setIdentifier(VersionConvertor_10_40.convertIdentifier(i)); - tgt.setVersion(src.getVersion()); - tgt.setName(src.getName()); + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); tgt.setStatus(VersionConvertor_10_40.convertConformanceResourceStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getExperimentalElement())); + tgt.setPublisherElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPublisherElement())); for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertValueSetContactComponent(t)); - if (src.hasDate()) - tgt.setDate(src.getDate()); - tgt.setLockedDate(src.getCompose().getLockedDate()); - tgt.setDescription(src.getDescription()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getDateElement())); + tgt.setLockedDateElement((org.hl7.fhir.dstu2.model.DateType) VersionConvertor_10_40.convertType(src.getCompose().getLockedDateElement())); + tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r4.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t.getValueCodeableConcept())); for (org.hl7.fhir.r4.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_10_40.convertCodeableConcept(t)); - tgt.setImmutable(src.getImmutable()); - tgt.setRequirements(src.getPurpose()); + tgt.setImmutableElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getImmutableElement())); + tgt.setRequirementsElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getPurposeElement())); tgt.setCopyright(src.getCopyright()); if (src.hasExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible")) tgt.setExtensible(((BooleanType) src.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/valueset-extensible").getValue()).booleanValue()); @@ -396,9 +373,8 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ContactDetail tgt = new org.hl7.fhir.r4.model.ContactDetail(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -410,9 +386,8 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ValueSetContactComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ValueSetContactComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_10_40.convertContactPoint(t)); } @@ -424,18 +399,14 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_10_40.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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_40.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu2.model.IntegerType) VersionConvertor_10_40.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.dstu2.model.IntegerType) VersionConvertor_10_40.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -450,18 +421,14 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_10_40.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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.r4.model.DateTimeType) VersionConvertor_10_40.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r4.model.IntegerType) VersionConvertor_10_40.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.r4.model.IntegerType) VersionConvertor_10_40.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -476,21 +443,16 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } - 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.dstu2.model.UriType) VersionConvertor_10_40.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu2.model.BooleanType) VersionConvertor_10_40.convertType(src.getAbstractElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getDisplayElement())); if (src.hasContains()) { for (org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionContainsComponent t : src.getContains()) tgt.addContains(convertValueSetExpansionContainsComponent(t)); } @@ -502,21 +464,16 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } - 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.r4.model.UriType) VersionConvertor_10_40.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r4.model.BooleanType) VersionConvertor_10_40.convertType(src.getAbstractElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r4.model.CodeType) VersionConvertor_10_40.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getDisplayElement())); if (src.hasContains()) { for (org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionContainsComponent t : src.getContains()) tgt.addContains(convertValueSetExpansionContainsComponent(t)); } @@ -528,9 +485,8 @@ public class ValueSet10_40 { return null; org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r4.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } @@ -542,9 +498,8 @@ public class ValueSet10_40 { return null; org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.dstu2.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_10_40.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_40.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_10_40.convertType(src.getValue())); } 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 103728fbe..75711c42c 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 @@ -47,8 +47,8 @@ public class Parser { public static final String ELEMENT = "Element"; private static final String RESOURCE_FILE_FORMAT = "_%s"; //TODO fix private static final List VERSION_FILES = Arrays.asList("10_30", "10_40", "10_50", "14_30", "14_40", "14_50", "30_40", "30_50", "40_50"); - private static final List BASE_TYPES = Arrays.asList("Base64Binary", "Boolean", "Canonical", "Code", - "Enumeration", "Date", "DateType", "Decimal", "Id", "Instant", "Integer", "Integer64", + private static final List BASE_TYPES = Arrays.asList("Base64Binary", "Boolean", "boolean", "Canonical", "Code", + "Enumeration", "Date", "DateTime", "DateType", "Decimal", "BigDecimal", "Id", "Instant", "Integer", "int", "Integer64", "Markdown", "Oid", "PositiveInt", "String", "Time", "UnsignedInt", "Uri", "Url", "Uuid", "XhtmlNode"); @@ -92,22 +92,22 @@ public class Parser { // VERSION_FILES.forEach(version -> { - String version = "10_30"; - 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); - filenames.forEach(System.out::println); - filenames.forEach(name -> { - try { - modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/", name, ".java", listOfPrimitiveTypes, version); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - }); +// String version = "10_40"; +// 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); +// filenames.forEach(System.out::println); +// filenames.forEach(name -> { +// try { +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/", name, ".java", listOfPrimitiveTypes, version); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } +// }); // }); // try { -// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Subscription10_30", ".java", listOfPrimitiveTypes, "10_30"); + modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/", "DataElement10_40", ".java", listOfPrimitiveTypes, "10_40"); // modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "AuditEvent10_30", ".java", listOfPrimitiveTypes, "10_30"); // modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Binary10_30", ".java", listOfPrimitiveTypes, "10_30"); // modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Bundle10_30", ".java", listOfPrimitiveTypes, "10_30");