diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Bundle14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Bundle14_50.java index becb96bd3..44bba695b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Bundle14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Bundle14_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Bundle14_50 { @@ -13,8 +14,8 @@ public class Bundle14_50 { if (src.hasType()) { tgt.setType(convertBundleType(src.getType())); } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.dstu2016may.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -35,8 +36,8 @@ public class Bundle14_50 { if (src.hasType()) { tgt.setType(convertBundleType(src.getType())); } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu2016may.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getTotalElement())); if (src.hasLink()) { for (org.hl7.fhir.r5.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } @@ -57,8 +58,8 @@ public class Bundle14_50 { if (src.hasLink()) { for (org.hl7.fhir.r5.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } - if (src.hasFullUrl()) - tgt.setFullUrl(src.getFullUrl()); + if (src.hasFullUrlElement()) + tgt.setFullUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getFullUrlElement())); if (src.hasResource()) { tgt.setResource(VersionConvertor_14_50.convertResource(src.getResource())); } @@ -82,8 +83,8 @@ public class Bundle14_50 { if (src.hasLink()) { for (org.hl7.fhir.dstu2016may.model.Bundle.BundleLinkComponent t : src.getLink()) tgt.addLink(convertBundleLinkComponent(t)); } - if (src.hasFullUrl()) - tgt.setFullUrl(src.getFullUrl()); + if (src.hasFullUrlElement()) + tgt.setFullUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getFullUrlElement())); if (src.hasResource()) { tgt.setResource(VersionConvertor_14_50.convertResource(src.getResource())); } @@ -107,17 +108,16 @@ public class Bundle14_50 { 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.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.dstu2016may.model.InstantType) VersionConvertor_14_50.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getIfNoneExistElement())); return tgt; } @@ -129,17 +129,16 @@ public class Bundle14_50 { if (src.hasMethod()) { tgt.setMethod(convertHTTPVerb(src.getMethod())); } - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasIfNoneMatch()) - tgt.setIfNoneMatch(src.getIfNoneMatch()); - if (src.hasIfModifiedSince()) - tgt.setIfModifiedSince(src.getIfModifiedSince()); - if (src.hasIfMatch()) - tgt.setIfMatch(src.getIfMatch()); - if (src.hasIfNoneExist()) - tgt.setIfNoneExist(src.getIfNoneExist()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasIfNoneMatchElement()) + tgt.setIfNoneMatchElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getIfNoneMatchElement())); + if (src.hasIfModifiedSinceElement()) + tgt.setIfModifiedSinceElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_14_50.convertType(src.getIfModifiedSinceElement())); + if (src.hasIfMatchElement()) + tgt.setIfMatchElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getIfMatchElement())); + if (src.hasIfNoneExistElement()) + tgt.setIfNoneExistElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getIfNoneExistElement())); return tgt; } @@ -148,15 +147,14 @@ public class Bundle14_50 { return null; org.hl7.fhir.dstu2016may.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.dstu2016may.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasStatus()) { - tgt.setStatus(src.getStatus()); - } - if (src.hasLocation()) - tgt.setLocation(src.getLocation()); - if (src.hasEtag()) - tgt.setEtag(src.getEtag()); - if (src.hasLastModified()) - tgt.setLastModified(src.getLastModified()); + if (src.hasStatusElement()) + tgt.setStatusElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.dstu2016may.model.InstantType) VersionConvertor_14_50.convertType(src.getLastModifiedElement())); return tgt; } @@ -165,15 +163,14 @@ public class Bundle14_50 { return null; org.hl7.fhir.r5.model.Bundle.BundleEntryResponseComponent tgt = new org.hl7.fhir.r5.model.Bundle.BundleEntryResponseComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasStatus()) { - tgt.setStatus(src.getStatus()); - } - if (src.hasLocation()) - tgt.setLocation(src.getLocation()); - if (src.hasEtag()) - tgt.setEtag(src.getEtag()); - if (src.hasLastModified()) - tgt.setLastModified(src.getLastModified()); + if (src.hasStatusElement()) + tgt.setStatusElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getStatusElement())); + if (src.hasLocationElement()) + tgt.setLocationElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getLocationElement())); + if (src.hasEtagElement()) + tgt.setEtagElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getEtagElement())); + if (src.hasLastModifiedElement()) + tgt.setLastModifiedElement((org.hl7.fhir.r5.model.InstantType) VersionConvertor_14_50.convertType(src.getLastModifiedElement())); return tgt; } @@ -185,8 +182,8 @@ public class Bundle14_50 { if (src.hasMode()) { tgt.setMode(convertSearchEntryMode(src.getMode())); } - if (src.hasScore()) - tgt.setScore(src.getScore()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.dstu2016may.model.DecimalType) VersionConvertor_14_50.convertType(src.getScoreElement())); return tgt; } @@ -198,8 +195,8 @@ public class Bundle14_50 { if (src.hasMode()) { tgt.setMode(convertSearchEntryMode(src.getMode())); } - if (src.hasScore()) - tgt.setScore(src.getScore()); + if (src.hasScoreElement()) + tgt.setScoreElement((org.hl7.fhir.r5.model.DecimalType) VersionConvertor_14_50.convertType(src.getScoreElement())); return tgt; } @@ -208,12 +205,10 @@ public class Bundle14_50 { return null; org.hl7.fhir.dstu2016may.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.dstu2016may.model.Bundle.BundleLinkComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasRelation()) { - tgt.setRelation(src.getRelation()); - } - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasRelationElement()) + tgt.setRelationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); return tgt; } @@ -222,12 +217,10 @@ public class Bundle14_50 { return null; org.hl7.fhir.r5.model.Bundle.BundleLinkComponent tgt = new org.hl7.fhir.r5.model.Bundle.BundleLinkComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasRelation()) { - tgt.setRelation(src.getRelation()); - } - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasRelationElement()) + tgt.setRelationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getRelationElement())); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CodeSystem14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CodeSystem14_50.java index f230297a1..99a518965 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CodeSystem14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CodeSystem14_50.java @@ -1,11 +1,14 @@ package org.hl7.fhir.convertors.conv14_50; +import org.hl7.fhir.convertors.VersionConvertor_14_40; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionPropertyComponent; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.Enumerations; import org.hl7.fhir.r5.model.Enumerations.FilterOperator; +import java.util.Collections; public class CodeSystem14_50 { @@ -14,28 +17,28 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.setIdentifier(VersionConvertor_14_50.convertIdentifier(src.getIdentifierFirstRep())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertCodeSystemContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -43,21 +46,21 @@ public class CodeSystem14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); - if (src.hasCaseSensitive()) - tgt.setCaseSensitive(src.getCaseSensitive()); - if (src.hasValueSet()) - tgt.setValueSet(src.getValueSet()); - if (src.hasCompositional()) - tgt.setCompositional(src.getCompositional()); - if (src.hasVersionNeeded()) - tgt.setVersionNeeded(src.getVersionNeeded()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); + if (src.hasCaseSensitiveElement()) + tgt.setCaseSensitiveElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getCaseSensitiveElement())); + if (src.hasValueSetElement()) + tgt.setValueSetElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getValueSetElement())); + if (src.hasCompositionalElement()) + tgt.setCompositionalElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getCompositionalElement())); + if (src.hasVersionNeededElement()) + tgt.setVersionNeededElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getVersionNeededElement())); if (src.hasContent()) { tgt.setContent(convertCodeSystemContentMode(src.getContent())); } - if (src.hasCount()) - tgt.setCount(src.getCount()); + if (src.hasCountElement()) + tgt.setCountElement((org.hl7.fhir.dstu2016may.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getCountElement())); if (src.hasFilter()) { for (org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent t : src.getFilter()) tgt.addFilter(convertCodeSystemFilterComponent(t)); } @@ -75,26 +78,26 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem tgt = new org.hl7.fhir.r5.model.CodeSystem(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemContactComponent t : src.getContact()) tgt.addContact(convertCodeSystemContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) @@ -105,19 +108,19 @@ public class CodeSystem14_50 { tgt.setPurpose(src.getRequirements()); if (src.hasCopyright()) tgt.setCopyright(src.getCopyright()); - if (src.hasCaseSensitive()) - tgt.setCaseSensitive(src.getCaseSensitive()); - if (src.hasValueSet()) - tgt.setValueSet(src.getValueSet()); - if (src.hasCompositional()) - tgt.setCompositional(src.getCompositional()); - if (src.hasVersionNeeded()) - tgt.setVersionNeeded(src.getVersionNeeded()); + if (src.hasCaseSensitiveElement()) + tgt.setCaseSensitiveElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getCaseSensitiveElement())); + if (src.hasValueSetElement()) + tgt.setValueSetElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getValueSetElement())); + if (src.hasCompositionalElement()) + tgt.setCompositionalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getCompositionalElement())); + if (src.hasVersionNeededElement()) + tgt.setVersionNeededElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getVersionNeededElement())); if (src.hasContent()) { tgt.setContent(convertCodeSystemContentMode(src.getContent())); } - if (src.hasCount()) - tgt.setCount(src.getCount()); + if (src.hasCountElement()) + tgt.setCountElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getCountElement())); if (src.hasFilter()) { for (org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemFilterComponent t : src.getFilter()) tgt.addFilter(convertCodeSystemFilterComponent(t)); } @@ -135,8 +138,8 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemContactComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -148,8 +151,8 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -195,16 +198,12 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemFilterComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemFilterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); - if (src.hasOperator()) { - for (Enumeration t : src.getOperator()) tgt.addOperator(t.getValue().toCode()); - } - if (src.hasValue()) { - tgt.setValue(src.getValue()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); + if (src.hasValueElement()) { + tgt.setValueElement((StringType) VersionConvertor_14_50.convertType(src.getValueElement())); } return tgt; } @@ -214,18 +213,17 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.CodeSystemFilterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2016may.model.CodeType t : src.getOperator()) try { tgt.addOperator(Enumerations.FilterOperator.fromCode(t.getValue())); } catch (org.hl7.fhir.exceptions.FHIRException e) { throw new FHIRException(e); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); + if (src.hasValueElement()) { + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); } return tgt; } @@ -235,13 +233,12 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDefinitionElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptDefinitionDesignationComponent(t)); } @@ -259,13 +256,12 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); - if (src.hasDefinition()) - tgt.setDefinition(src.getDefinition()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); + if (src.hasDefinitionElement()) + tgt.setDefinitionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDefinitionElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptDefinitionDesignationComponent(t)); } @@ -283,14 +279,13 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionDesignationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_14_50.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -299,14 +294,13 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionDesignationComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionDesignationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_14_50.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -315,9 +309,8 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionPropertyComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.ConceptDefinitionPropertyComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.convertType(src.getValue())); } @@ -329,9 +322,8 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem.ConceptPropertyComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.ConceptPropertyComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.convertType(src.getValue())); } @@ -343,11 +335,10 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.r5.model.CodeSystem.PropertyComponent tgt = new org.hl7.fhir.r5.model.CodeSystem.PropertyComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); if (src.hasType()) { tgt.setType(convertPropertyType(src.getType())); } @@ -359,11 +350,10 @@ public class CodeSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemPropertyComponent tgt = new org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemPropertyComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); if (src.hasType()) { tgt.setType(convertPropertyType(src.getType())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CompartmentDefinition14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CompartmentDefinition14_50.java index e4a22c792..ee1fc492d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CompartmentDefinition14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/CompartmentDefinition14_50.java @@ -1,7 +1,9 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class CompartmentDefinition14_50 { @@ -10,34 +12,31 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.CompartmentDefinition tgt = new org.hl7.fhir.dstu2016may.model.CompartmentDefinition(); VersionConvertor_14_50.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.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertCompartmentDefinitionContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); if (src.hasCode()) { tgt.setCode(convertCompartmentType(src.getCode())); } - if (src.hasSearch()) { - tgt.setSearch(src.getSearch()); - } + if (src.hasSearchElement()) + tgt.setSearchElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getSearchElement())); if (src.hasResource()) { for (org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent t : src.getResource()) tgt.addResource(convertCompartmentDefinitionResourceComponent(t)); } @@ -49,24 +48,22 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.r5.model.CompartmentDefinition tgt = new org.hl7.fhir.r5.model.CompartmentDefinition(); VersionConvertor_14_50.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.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionContactComponent t : src.getContact()) tgt.addContact(convertCompartmentDefinitionContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); if (src.hasRequirements()) @@ -74,9 +71,8 @@ public class CompartmentDefinition14_50 { if (src.hasCode()) { tgt.setCode(convertCompartmentType(src.getCode())); } - if (src.hasSearch()) { - tgt.setSearch(src.getSearch()); - } + if (src.hasSearchElement()) + tgt.setSearchElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getSearchElement())); if (src.hasResource()) { for (org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionResourceComponent t : src.getResource()) tgt.addResource(convertCompartmentDefinitionResourceComponent(t)); } @@ -88,8 +84,8 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionContactComponent tgt = new org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -101,8 +97,8 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -114,16 +110,13 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionResourceComponent tgt = new org.hl7.fhir.dstu2016may.model.CompartmentDefinition.CompartmentDefinitionResourceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasParam()) { for (org.hl7.fhir.r5.model.StringType t : src.getParam()) tgt.addParam(t.getValue()); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -132,14 +125,13 @@ public class CompartmentDefinition14_50 { return null; org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent tgt = new org.hl7.fhir.r5.model.CompartmentDefinition.CompartmentDefinitionResourceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasParam()) { for (org.hl7.fhir.dstu2016may.model.StringType t : src.getParam()) tgt.addParam(t.getValue()); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ConceptMap14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ConceptMap14_50.java index 491be6d5e..347d46572 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ConceptMap14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ConceptMap14_50.java @@ -1,12 +1,16 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.StringType; +import org.hl7.fhir.dstu2016may.model.UriType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CanonicalType; +import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.ConceptMap; import org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent; import java.util.ArrayList; import java.util.List; +import java.util.Collections; public class ConceptMap14_50 { @@ -15,21 +19,21 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.r5.model.ConceptMap tgt = new org.hl7.fhir.r5.model.ConceptMap(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(src.getIdentifier())); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); - tgt.setStatus(VersionConvertor_14_50.convertConformanceResourceStatus(src.getStatus())); - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(src.getIdentifier())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasStatus()) tgt.setStatus(VersionConvertor_14_50.convertConformanceResourceStatus(src.getStatus())); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); for (org.hl7.fhir.dstu2016may.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.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) @@ -56,31 +60,29 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.dstu2016may.model.ConceptMap tgt = new org.hl7.fhir.dstu2016may.model.ConceptMap(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { - if (src.hasIdentifier()) { - tgt.setIdentifier(VersionConvertor_14_50.convertIdentifier(src.getIdentifierFirstRep())); - } + tgt.setIdentifier(VersionConvertor_14_50.convertIdentifier(src.getIdentifierFirstRep())); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.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.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -88,8 +90,8 @@ public class ConceptMap14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.getSource() instanceof CanonicalType) tgt.setSource(VersionConvertor_14_50.convertCanonicalToReference((CanonicalType) src.getSource())); else if (src.hasSource()) { @@ -117,8 +119,8 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -130,8 +132,8 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.dstu2016may.model.ConceptMap.ConceptMapContactComponent tgt = new org.hl7.fhir.dstu2016may.model.ConceptMap.ConceptMapContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -187,14 +189,13 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.dstu2016may.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.dstu2016may.model.ConceptMap.OtherElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setElement(src.getProperty()); + if (src.hasPropertyElement()) { + tgt.setElementElement((UriType) VersionConvertor_14_50.convertType(src.getPropertyElement())); } - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasValue()) { - tgt.setCode(src.getValue()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasValueElement()) { + tgt.setCodeElement((StringType) VersionConvertor_14_50.convertType(src.getValueElement())); } return tgt; } @@ -204,14 +205,13 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasElement()) { - tgt.setProperty(src.getElement()); + if (src.hasElementElement()) { + tgt.setPropertyElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getElementElement())); } - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasCode()) { - tgt.setValue(src.getCode()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasCodeElement()) { + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getCodeElement())); } return tgt; } @@ -223,8 +223,8 @@ public class ConceptMap14_50 { for (org.hl7.fhir.dstu2016may.model.ConceptMap.TargetElementComponent t : src.getTarget()) { org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (t.getEquivalence() == org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.UNMATCHED) { tgt.setNoMap(true); } else { @@ -242,10 +242,10 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.dstu2016may.model.ConceptMap.SourceElementComponent tgt = new org.hl7.fhir.dstu2016may.model.ConceptMap.SourceElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (g.hasSource()) - tgt.setSystem(g.getSource()); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (g.hasSourceElement()) + tgt.setSystemElement((UriType) VersionConvertor_14_50.convertType(g.getSourceElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasNoMap() && src.getNoMap() == true) { tgt.addTarget(new org.hl7.fhir.dstu2016may.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.UNMATCHED)); } else { @@ -261,15 +261,15 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.dstu2016may.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.dstu2016may.model.ConceptMap.TargetElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (g.hasTarget()) - tgt.setSystem(g.getTarget()); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (g.hasTargetElement()) + tgt.setSystemElement((UriType) VersionConvertor_14_50.convertType(g.getTargetElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasRelationship()) { tgt.setEquivalence(convertConceptMapEquivalence(src.getRelationship())); } - if (src.hasComment()) - tgt.setComments(src.getComment()); + if (src.hasCommentElement()) + tgt.setCommentsElement((StringType) VersionConvertor_14_50.convertType(src.getCommentElement())); if (src.hasDependsOn()) { for (org.hl7.fhir.r5.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); } @@ -284,13 +284,13 @@ public class ConceptMap14_50 { return null; org.hl7.fhir.r5.model.ConceptMap.TargetElementComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.TargetElementComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) - tgt.setCode(src.getCode()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasEquivalence()) { tgt.setRelationship(convertConceptMapRelationship(src.getEquivalence())); } - if (src.hasComments()) - tgt.setComment(src.getComments()); + if (src.hasCommentsElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getCommentsElement())); if (src.hasDependsOn()) { for (org.hl7.fhir.dstu2016may.model.ConceptMap.OtherElementComponent t : src.getDependsOn()) tgt.addDependsOn(convertOtherElementComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Conformance14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Conformance14_50.java index f935bcdd8..45ceb30c6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Conformance14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Conformance14_50.java @@ -2,9 +2,18 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.BooleanType; +import org.hl7.fhir.dstu2016may.model.CodeType; +import org.hl7.fhir.dstu2016may.model.UnsignedIntType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestComponent; import org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceComponent; +import org.hl7.fhir.r5.model.DateTimeType; +import org.hl7.fhir.r5.model.StringType; +import org.hl7.fhir.r5.model.UriType; +import org.hl7.fhir.r5.model.UrlType; + +import java.util.Collections; public class Conformance14_50 { @@ -43,21 +52,21 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement tgt = new org.hl7.fhir.r5.model.CapabilityStatement(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasUrlElement()) + tgt.setUrlElement((UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.Conformance.ConformanceContactComponent t : src.getContact()) tgt.addContact(convertConformanceContactComponent(t)); } @@ -105,26 +114,26 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance tgt = new org.hl7.fhir.dstu2016may.model.Conformance(); VersionConvertor_14_50.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.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertConformanceContactComponent(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -132,8 +141,8 @@ public class Conformance14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.hasKind()) { tgt.setKind(convertConformanceStatementKind(src.getKind())); } @@ -171,8 +180,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceContactComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -184,8 +193,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -232,8 +241,8 @@ public class Conformance14_50 { if (src.hasDescription()) { tgt.setDescription(src.getDescription()); } - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((UrlType) VersionConvertor_14_50.convertType(src.getUrlElement())); return tgt; } @@ -245,8 +254,8 @@ public class Conformance14_50 { if (src.hasDescription()) { tgt.setDescription(src.getDescription()); } - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); return tgt; } @@ -258,8 +267,8 @@ public class Conformance14_50 { if (src.hasEndpoint()) { for (org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertConformanceMessagingEndpointComponent(t)); } - if (src.hasReliableCache()) - tgt.setReliableCache(src.getReliableCache()); + if (src.hasReliableCacheElement()) + tgt.setReliableCacheElement((UnsignedIntType) VersionConvertor_14_50.convertType(src.getReliableCacheElement())); if (src.hasDocumentation()) tgt.setDocumentation(src.getDocumentation()); for (org.hl7.fhir.r5.model.Extension e : src.getExtensionsByUrl(VersionConvertorConstants.IG_CONFORMANCE_MESSAGE_EVENT)) { @@ -292,8 +301,8 @@ public class Conformance14_50 { if (src.hasEndpoint()) { for (org.hl7.fhir.dstu2016may.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.r5.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getReliableCacheElement())); if (src.hasDocumentation()) tgt.setDocumentation(src.getDocumentation()); for (org.hl7.fhir.dstu2016may.model.Conformance.ConformanceMessagingEventComponent t : src.getEvent()) { @@ -327,8 +336,8 @@ public class Conformance14_50 { if (src.hasProtocol()) { tgt.setProtocol(VersionConvertor_14_50.convertCoding(src.getProtocol())); } - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) { + tgt.setAddressElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getAddressElement())); } return tgt; } @@ -341,8 +350,8 @@ public class Conformance14_50 { if (src.hasProtocol()) { tgt.setProtocol(VersionConvertor_14_50.convertCoding(src.getProtocol())); } - if (src.hasAddress()) { - tgt.setAddress(src.getAddress()); + if (src.hasAddressElement()) { + tgt.setAddressElement((UrlType) VersionConvertor_14_50.convertType(src.getAddressElement())); } return tgt; } @@ -414,8 +423,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestOperationComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestOperationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } if (src.hasDefinitionElement()) { tgt.setDefinition(VersionConvertor_14_50.convertCanonicalToReference(src.getDefinitionElement())); @@ -428,8 +437,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceOperationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } if (src.hasDefinition()) { tgt.setDefinitionElement(VersionConvertor_14_50.convertReferenceToCanonical(src.getDefinition())); @@ -442,10 +451,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestResourceComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestResourceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasType()) { - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) { + tgt.setTypeElement((CodeType) VersionConvertor_14_50.convertType(src.getTypeElement())); } if (src.hasProfileElement()) { tgt.setProfile(VersionConvertor_14_50.convertCanonicalToReference(src.getProfileElement())); @@ -456,14 +463,14 @@ public class Conformance14_50 { if (src.hasVersioning()) { tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); } - if (src.hasReadHistory()) - tgt.setReadHistory(src.getReadHistory()); - if (src.hasUpdateCreate()) - tgt.setUpdateCreate(src.getUpdateCreate()); - if (src.hasConditionalCreate()) - tgt.setConditionalCreate(src.getConditionalCreate()); - if (src.hasConditionalUpdate()) - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasReadHistoryElement()) + tgt.setReadHistoryElement((BooleanType) VersionConvertor_14_50.convertType(src.getReadHistoryElement())); + if (src.hasUpdateCreateElement()) + tgt.setUpdateCreateElement((BooleanType) VersionConvertor_14_50.convertType(src.getUpdateCreateElement())); + if (src.hasConditionalCreateElement()) + tgt.setConditionalCreateElement((BooleanType) VersionConvertor_14_50.convertType(src.getConditionalCreateElement())); + if (src.hasConditionalUpdateElement()) + tgt.setConditionalUpdateElement((BooleanType) VersionConvertor_14_50.convertType(src.getConditionalUpdateElement())); if (src.hasConditionalDelete()) { tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); } @@ -484,8 +491,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); + if (src.hasTypeElement()) { + tgt.setTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getTypeElement())); } if (src.hasProfile()) { tgt.setProfileElement(VersionConvertor_14_50.convertReferenceToCanonical(src.getProfile())); @@ -496,14 +503,14 @@ public class Conformance14_50 { if (src.hasVersioning()) { tgt.setVersioning(convertResourceVersionPolicy(src.getVersioning())); } - if (src.hasReadHistory()) - tgt.setReadHistory(src.getReadHistory()); - if (src.hasUpdateCreate()) - tgt.setUpdateCreate(src.getUpdateCreate()); - if (src.hasConditionalCreate()) - tgt.setConditionalCreate(src.getConditionalCreate()); - if (src.hasConditionalUpdate()) - tgt.setConditionalUpdate(src.getConditionalUpdate()); + if (src.hasReadHistoryElement()) + tgt.setReadHistoryElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getReadHistoryElement())); + if (src.hasUpdateCreateElement()) + tgt.setUpdateCreateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getUpdateCreateElement())); + if (src.hasConditionalCreateElement()) + tgt.setConditionalCreateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getConditionalCreateElement())); + if (src.hasConditionalUpdateElement()) + tgt.setConditionalUpdateElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getConditionalUpdateElement())); if (src.hasConditionalDelete()) { tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete())); } @@ -524,8 +531,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestResourceSearchParamComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestResourceSearchParamComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } if (src.hasDefinition()) tgt.setDefinition(src.getDefinition()); @@ -542,8 +549,8 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementRestResourceSearchParamComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } if (src.hasDefinition()) tgt.setDefinition(src.getDefinition()); @@ -575,13 +582,13 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestSecurityComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceRestSecurityComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCors()) - tgt.setCors(src.getCors()); + if (src.hasCorsElement()) + tgt.setCorsElement((BooleanType) VersionConvertor_14_50.convertType(src.getCorsElement())); if (src.hasService()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getService()) tgt.addService(VersionConvertor_14_50.convertCodeableConcept(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); return tgt; } @@ -590,13 +597,13 @@ public class Conformance14_50 { return null; org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementSoftwareComponent tgt = new org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementSoftwareComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasReleaseDate()) - tgt.setReleaseDate(src.getReleaseDate()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) + tgt.setReleaseDateElement((DateTimeType) VersionConvertor_14_50.convertType(src.getReleaseDateElement())); return tgt; } @@ -605,13 +612,13 @@ public class Conformance14_50 { return null; org.hl7.fhir.dstu2016may.model.Conformance.ConformanceSoftwareComponent tgt = new org.hl7.fhir.dstu2016may.model.Conformance.ConformanceSoftwareComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); + if (src.hasNameElement()) { + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasReleaseDate()) - tgt.setReleaseDate(src.getReleaseDate()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasReleaseDateElement()) + tgt.setReleaseDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getReleaseDateElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/DataElement14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/DataElement14_50.java index ffd4872b0..5dd224286 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/DataElement14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/DataElement14_50.java @@ -2,7 +2,13 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.model.BooleanType; +import org.hl7.fhir.r5.model.DateTimeType; +import org.hl7.fhir.r5.model.StringType; import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind; +import org.hl7.fhir.r5.model.UriType; + +import java.util.Collections; public class DataElement14_50 { @@ -11,24 +17,24 @@ public class DataElement14_50 { return null; org.hl7.fhir.r5.model.StructureDefinition tgt = new org.hl7.fhir.r5.model.StructureDefinition(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2016may.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasVersionElement()) + tgt.setVersionElement((StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.convertConformanceResourceStatus(src.getStatus())); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); + if (src.hasDateElement()) + tgt.setDateElement((DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.DataElement.DataElementContactComponent t : src.getContact()) tgt.addContact(convertDataElementContactComponent(t)); } @@ -57,8 +63,8 @@ public class DataElement14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -70,8 +76,8 @@ public class DataElement14_50 { return null; org.hl7.fhir.dstu2016may.model.DataElement.DataElementContactComponent tgt = new org.hl7.fhir.dstu2016may.model.DataElement.DataElementContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -86,12 +92,12 @@ public class DataElement14_50 { if (src.hasIdentity()) { tgt.setIdentity(src.getIdentity()); } - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasUriElement()) + tgt.setUriElement((UriType) VersionConvertor_14_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((StringType) VersionConvertor_14_50.convertType(src.getCommentElement())); return tgt; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ImplementationGuide14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ImplementationGuide14_50.java index f4be63718..43b0c6b43 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ImplementationGuide14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ImplementationGuide14_50.java @@ -2,13 +2,16 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.IdType; import org.hl7.fhir.dstu2016may.model.ImplementationGuide.GuidePageKind; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CanonicalType; import org.hl7.fhir.r5.model.DataType; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.ImplementationGuide.GuidePageGeneration; import java.util.List; +import java.util.Collections; public class ImplementationGuide14_50 { @@ -17,35 +20,33 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.dstu2016may.model.ImplementationGuide tgt = new org.hl7.fhir.dstu2016may.model.ImplementationGuide(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.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.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t)); } - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.hasFhirVersion()) for (Enumeration v : src.getFhirVersion()) { tgt.setFhirVersion(v.asStringValue()); @@ -73,26 +74,24 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide tgt = new org.hl7.fhir.r5.model.ImplementationGuide(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideContactComponent t : src.getContact()) tgt.addContact(convertImplementationGuideContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) @@ -123,8 +122,8 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideContactComponent tgt = new org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -136,8 +135,8 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -149,9 +148,8 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasUri()) { - tgt.setUri(src.getUri()); - } + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getUriElement())); if (org.hl7.fhir.dstu2016may.utils.ToolingExtensions.hasExtension(src, VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION)) { tgt.setPackageId(org.hl7.fhir.dstu2016may.utils.ToolingExtensions.readStringExtension(src, VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION)); } @@ -167,9 +165,8 @@ public class ImplementationGuide14_50 { org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideDependencyComponent tgt = new org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideDependencyComponent(); VersionConvertor_14_50.copyElement(src, tgt); tgt.setType(org.hl7.fhir.dstu2016may.model.ImplementationGuide.GuideDependencyType.REFERENCE); - if (src.hasUri()) { - tgt.setUri(src.getUri()); - } + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUriElement())); if (src.hasPackageId()) tgt.addExtension(new org.hl7.fhir.dstu2016may.model.Extension(VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION, new org.hl7.fhir.dstu2016may.model.IdType(src.getPackageId()))); if (src.hasVersion()) @@ -183,9 +180,8 @@ public class ImplementationGuide14_50 { org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_14_50.copyElement(src, tgt); if (tgt.hasType()) { - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getTypeElement())); } if (src.hasProfileElement()) { tgt.setProfile(VersionConvertor_14_50.convertCanonicalToReference(src.getProfileElement())); @@ -198,9 +194,8 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideGlobalComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideGlobalComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasType()) { - tgt.setType(src.getType()); - } + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getTypeElement())); if (src.hasProfile()) { tgt.setProfileElement(VersionConvertor_14_50.convertReferenceToCanonical(src.getProfile())); } @@ -212,14 +207,13 @@ public class ImplementationGuide14_50 { return null; org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuidePackageComponent tgt = new org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuidePackageComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasId()) { - tgt.setId(src.getId()); + if (src.hasIdElement()) { + tgt.setIdElement((IdType) VersionConvertor_14_50.convertType(src.getIdElement())); } - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); return tgt; } @@ -229,10 +223,10 @@ public class ImplementationGuide14_50 { org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionGroupingComponent(); tgt.setId("p" + (context.getGrouping().size() + 1)); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.dstu2016may.model.ImplementationGuide.ImplementationGuidePackageResourceComponent t : src.getResource()) { org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionResourceComponent tn = convertImplementationGuidePackageResourceComponent(t); tn.setGroupingId(tgt.getId()); @@ -255,10 +249,10 @@ public class ImplementationGuide14_50 { tgt.setExample(src.getExampleBooleanType().getValue()); else tgt.setExample(false); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); if (src.hasReference()) tgt.setSource(VersionConvertor_14_50.convertReference(src.getReference())); return tgt; @@ -273,11 +267,11 @@ public class ImplementationGuide14_50 { DataType t = VersionConvertor_14_50.convertType(src.getExampleFor()); tgt.setExample(t instanceof org.hl7.fhir.r5.model.Reference ? new CanonicalType(((org.hl7.fhir.r5.model.Reference) t).getReference()) : t); } else if (src.hasExample()) - tgt.setExample(new org.hl7.fhir.r5.model.BooleanType(src.getExample())); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + tgt.setExample(new org.hl7.fhir.r5.model.BooleanType(src.getExample())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); if (src.hasSourceReference()) tgt.setReference(VersionConvertor_14_50.convertReference(src.getSourceReference())); else if (src.hasSourceUriType()) @@ -292,8 +286,8 @@ public class ImplementationGuide14_50 { VersionConvertor_14_50.copyElement(src, tgt); if (src.hasNameUrlType()) tgt.setSource(src.getNameUrlType().getValue()); - if (src.hasTitle()) { - tgt.setName(src.getTitle()); + if (src.hasTitleElement()) { + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getTitleElement())); } if (src.hasGeneration()) tgt.setKind(convertPageGeneration(src.getGeneration())); @@ -310,8 +304,8 @@ public class ImplementationGuide14_50 { VersionConvertor_14_50.copyElement(src, tgt); if (src.hasSource()) tgt.setName(convertUriToUrl(src.getSourceElement())); - if (src.hasName()) { - tgt.setTitle(src.getName()); + if (src.hasNameElement()) { + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); } if (src.hasKind()) tgt.setGeneration(convertPageGeneration(src.getKind())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/NamingSystem14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/NamingSystem14_50.java index 409ff8e5e..2c31138be 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/NamingSystem14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/NamingSystem14_50.java @@ -1,7 +1,9 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class NamingSystem14_50 { @@ -10,25 +12,23 @@ public class NamingSystem14_50 { return null; org.hl7.fhir.r5.model.NamingSystem tgt = new org.hl7.fhir.r5.model.NamingSystem(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getResponsibleElement())); if (src.hasType()) { tgt.setType(VersionConvertor_14_50.convertCodeableConcept(src.getType())); } @@ -38,8 +38,8 @@ public class NamingSystem14_50 { tgt.addJurisdiction(VersionConvertor_14_50.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_14_50.convertCodeableConceptToUsageContext(t)); - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.dstu2016may.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -51,37 +51,35 @@ public class NamingSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.NamingSystem tgt = new org.hl7.fhir.dstu2016may.model.NamingSystem(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertNamingSystemContactComponent(t)); } - if (src.hasResponsible()) - tgt.setResponsible(src.getResponsible()); + if (src.hasResponsibleElement()) + tgt.setResponsibleElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getResponsibleElement())); if (src.hasType()) { tgt.setType(VersionConvertor_14_50.convertCodeableConcept(src.getType())); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t)); } - if (src.hasUsage()) - tgt.setUsage(src.getUsage()); + if (src.hasUsageElement()) + tgt.setUsageElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getUsageElement())); if (src.hasUniqueId()) { for (org.hl7.fhir.r5.model.NamingSystem.NamingSystemUniqueIdComponent t : src.getUniqueId()) tgt.addUniqueId(convertNamingSystemUniqueIdComponent(t)); } @@ -93,8 +91,8 @@ public class NamingSystem14_50 { return null; org.hl7.fhir.dstu2016may.model.NamingSystem.NamingSystemContactComponent tgt = new org.hl7.fhir.dstu2016may.model.NamingSystem.NamingSystemContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -106,8 +104,8 @@ public class NamingSystem14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -186,11 +184,10 @@ public class NamingSystem14_50 { 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.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getPreferredElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_14_50.convertPeriod(src.getPeriod())); } @@ -205,11 +202,10 @@ public class NamingSystem14_50 { 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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); + if (src.hasPreferredElement()) + tgt.setPreferredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getPreferredElement())); if (src.hasPeriod()) { tgt.setPeriod(VersionConvertor_14_50.convertPeriod(src.getPeriod())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationDefinition14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationDefinition14_50.java index 8e6edacec..6ad81d753 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationDefinition14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationDefinition14_50.java @@ -2,10 +2,12 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertorConstants; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.DataType; import org.hl7.fhir.r5.model.Enumerations; +import java.util.Collections; public class OperationDefinition14_50 { @@ -14,30 +16,29 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.OperationDefinition tgt = new org.hl7.fhir.dstu2016may.model.OperationDefinition(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertOperationDefinitionContactComponent(t)); } - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -47,24 +48,21 @@ public class OperationDefinition14_50 { tgt.setRequirements(src.getPurpose()); if (src.hasAffectsState()) tgt.setIdempotent(!src.getAffectsState()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasComment()) - tgt.setComment(src.getComment()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasCommentElement()) + tgt.setCommentElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCommentElement())); if (src.hasBaseElement()) { tgt.setBase(VersionConvertor_14_50.convertCanonicalToReference(src.getBaseElement())); } - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getSystemElement())); if (src.getType()) if (src.hasResource()) { for (CodeType t : src.getResource()) tgt.addType(t.getValue()); } - if (src.hasInstance()) { - tgt.setInstance(src.getInstance()); - } + if (src.hasInstanceElement()) + tgt.setInstanceElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -76,25 +74,24 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.r5.model.OperationDefinition tgt = new org.hl7.fhir.r5.model.OperationDefinition(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionContactComponent t : src.getContact()) tgt.addContact(convertOperationDefinitionContactComponent(t)); } @@ -108,24 +105,21 @@ public class OperationDefinition14_50 { 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.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasComment()) tgt.setComment(src.getComment()); if (src.hasBase()) { tgt.setBaseElement(VersionConvertor_14_50.convertReferenceToCanonical(src.getBase())); } - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getSystemElement())); if (src.hasType()) { for (org.hl7.fhir.dstu2016may.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getInstanceElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionParameterComponent t : src.getParameter()) tgt.addParameter(convertOperationDefinitionParameterComponent(t)); } @@ -137,8 +131,8 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionContactComponent tgt = new org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -150,8 +144,8 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -196,24 +190,19 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.dstu2016may.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasUse()) { tgt.setUse(convertOperationParameterUse(src.getUse())); } - if (src.hasMin()) { - tgt.setMin(src.getMin()); - } - if (src.hasMax()) { - tgt.setMax(src.getMax()); - } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.dstu2016may.model.IntegerType) VersionConvertor_14_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); if (src.hasType()) { - if (src.hasType()) { - tgt.setType(src.getType().toCode()); - } + tgt.setType(src.getType().toCode()); } if (src.hasSearchType()) { tgt.setSearchType(VersionConvertor_14_50.convertSearchParamType(src.getSearchType())); @@ -235,22 +224,19 @@ public class OperationDefinition14_50 { return null; org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent tgt = new org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasUse()) { tgt.setUse(convertOperationParameterUse(src.getUse())); } - if (src.hasMin()) { - tgt.setMin(src.getMin()); - } - if (src.hasMax()) { - tgt.setMax(src.getMax()); - } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasMinElement()) + tgt.setMinElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_14_50.convertType(src.getMinElement())); + if (src.hasMaxElement()) + tgt.setMaxElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getMaxElement())); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); if (src.hasType()) - tgt.setType(Enumerations.FHIRAllTypes.fromCode(src.getType())); + tgt.setType(Enumerations.FHIRAllTypes.fromCode(src.getType())); if (src.hasSearchType()) { tgt.setSearchType(VersionConvertor_14_50.convertSearchParamType(src.getSearchType())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationOutcome14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationOutcome14_50.java index 0c6a49f6e..935984ad2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationOutcome14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/OperationOutcome14_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class OperationOutcome14_50 { @@ -209,8 +210,8 @@ public class OperationOutcome14_50 { if (src.hasDetails()) { tgt.setDetails(VersionConvertor_14_50.convertCodeableConcept(src.getDetails())); } - if (src.hasDiagnostics()) - tgt.setDiagnostics(src.getDiagnostics()); + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.r5.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } @@ -234,8 +235,8 @@ public class OperationOutcome14_50 { if (src.hasDetails()) { tgt.setDetails(VersionConvertor_14_50.convertCodeableConcept(src.getDetails())); } - if (src.hasDiagnostics()) - tgt.setDiagnostics(src.getDiagnostics()); + if (src.hasDiagnosticsElement()) + tgt.setDiagnosticsElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDiagnosticsElement())); if (src.hasLocation()) { for (org.hl7.fhir.dstu2016may.model.StringType t : src.getLocation()) tgt.addLocation(t.getValue()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Parameters14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Parameters14_50.java index 07b4304ea..ed1413f44 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Parameters14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Parameters14_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class Parameters14_50 { @@ -32,9 +33,8 @@ public class Parameters14_50 { return null; org.hl7.fhir.r5.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.r5.model.Parameters.ParametersParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.convertType(src.getValue())); } @@ -52,9 +52,8 @@ public class Parameters14_50 { return null; org.hl7.fhir.dstu2016may.model.Parameters.ParametersParameterComponent tgt = new org.hl7.fhir.dstu2016may.model.Parameters.ParametersParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.convertType(src.getValue())); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java index fdc628846..f179bdfa7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java @@ -6,6 +6,7 @@ import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.ContactDetail; import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemOperator; import org.hl7.fhir.r5.model.UsageContext; +import java.util.Collections; public class Questionnaire14_50 { @@ -14,20 +15,20 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.r5.model.Questionnaire tgt = new org.hl7.fhir.r5.model.Questionnaire(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2016may.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.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.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addContact(convertQuestionnaireContactComponent(t)); } @@ -35,8 +36,8 @@ public class Questionnaire14_50 { tgt.addJurisdiction(VersionConvertor_14_50.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_14_50.convertCodeableConceptToUsageContext(t)); - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getTitleElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2016may.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_14_50.convertCoding(t)); } @@ -54,20 +55,20 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.dstu2016may.model.Questionnaire tgt = new org.hl7.fhir.dstu2016may.model.Questionnaire(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.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.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (ContactDetail t : src.getContact()) for (org.hl7.fhir.r5.model.ContactPoint t1 : t.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t1)); } @@ -77,8 +78,8 @@ public class Questionnaire14_50 { if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t)); } - if (src.hasTitle()) - tgt.setTitle(src.getTitle()); + if (src.hasTitleElement()) + tgt.setTitleElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getTitleElement())); if (src.hasCode()) { for (org.hl7.fhir.r5.model.Coding t : src.getCode()) tgt.addConcept(VersionConvertor_14_50.convertCoding(t)); } @@ -105,29 +106,29 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getLinkIdElement())); if (src.hasCode()) { for (org.hl7.fhir.r5.model.Coding t : src.getCode()) tgt.addConcept(VersionConvertor_14_50.convertCoding(t)); } - if (src.hasPrefix()) - tgt.setPrefix(src.getPrefix()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasPrefixElement()) + tgt.setPrefixElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPrefixElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getTextElement())); if (src.hasType()) { tgt.setType(convertQuestionnaireItemType(src.getType())); } if (src.hasEnableWhen()) { for (org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t)); } - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasRepeats()) - tgt.setRepeats(src.getRepeats()); - if (src.hasReadOnly()) - tgt.setReadOnly(src.getReadOnly()); - if (src.hasMaxLength()) - tgt.setMaxLength(src.getMaxLength()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getRepeatsElement())); + if (src.hasReadOnlyElement()) + tgt.setReadOnlyElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getReadOnlyElement())); + if (src.hasMaxLengthElement()) + tgt.setMaxLengthElement((org.hl7.fhir.dstu2016may.model.IntegerType) VersionConvertor_14_50.convertType(src.getMaxLengthElement())); if (src.hasAnswerValueSetElement()) { tgt.setOptions(VersionConvertor_14_50.convertCanonicalToReference(src.getAnswerValueSetElement())); } @@ -147,29 +148,29 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemComponent tgt = new org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLinkId()) - tgt.setLinkId(src.getLinkId()); + if (src.hasLinkIdElement()) + tgt.setLinkIdElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getLinkIdElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2016may.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_14_50.convertCoding(t)); } - if (src.hasPrefix()) - tgt.setPrefix(src.getPrefix()); - if (src.hasText()) - tgt.setText(src.getText()); + if (src.hasPrefixElement()) + tgt.setPrefixElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPrefixElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getTextElement())); if (src.hasType()) { tgt.setType(convertQuestionnaireItemType(src.getType())); } if (src.hasEnableWhen()) { for (org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t)); } - if (src.hasRequired()) - tgt.setRequired(src.getRequired()); - if (src.hasRepeats()) - tgt.setRepeats(src.getRepeats()); - if (src.hasReadOnly()) - tgt.setReadOnly(src.getReadOnly()); - if (src.hasMaxLength()) - tgt.setMaxLength(src.getMaxLength()); + if (src.hasRequiredElement()) + tgt.setRequiredElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getRequiredElement())); + if (src.hasRepeatsElement()) + tgt.setRepeatsElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getRepeatsElement())); + if (src.hasReadOnlyElement()) + tgt.setReadOnlyElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getReadOnlyElement())); + if (src.hasMaxLengthElement()) + tgt.setMaxLengthElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_14_50.convertType(src.getMaxLengthElement())); if (src.hasOptions()) { tgt.setAnswerValueSetElement(VersionConvertor_14_50.convertReferenceToCanonical(src.getOptions())); } @@ -190,9 +191,8 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent tgt = new org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasQuestion()) { - tgt.setQuestion(src.getQuestion()); - } + if (src.hasQuestionElement()) + tgt.setQuestionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getQuestionElement())); if (src.hasAnswered()) { tgt.setOperator(QuestionnaireItemOperator.EXISTS); if (src.hasAnsweredElement()) { @@ -210,9 +210,8 @@ public class Questionnaire14_50 { return null; org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemEnableWhenComponent tgt = new org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemEnableWhenComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasQuestion()) { - tgt.setQuestion(src.getQuestion()); - } + if (src.hasQuestionElement()) + tgt.setQuestionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getQuestionElement())); if (src.hasOperator() && src.getOperator() == QuestionnaireItemOperator.EXISTS) tgt.setAnswered(src.getAnswerBooleanType().getValue()); else diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/QuestionnaireResponse14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/QuestionnaireResponse14_50.java index f5aa04527..5d1f92ed4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/QuestionnaireResponse14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/QuestionnaireResponse14_50.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; +import java.util.Collections; public class QuestionnaireResponse14_50 { @@ -28,8 +29,8 @@ public class QuestionnaireResponse14_50 { if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_14_50.convertReference(src.getAuthor())); } - if (src.hasAuthored()) - tgt.setAuthored(src.getAuthored()); + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getAuthoredElement())); if (src.hasSource()) { tgt.setSource(VersionConvertor_14_50.convertReference(src.getSource())); } @@ -62,8 +63,8 @@ public class QuestionnaireResponse14_50 { if (src.hasAuthor()) { tgt.setAuthor(VersionConvertor_14_50.convertReference(src.getAuthor())); } - if (src.hasAuthored()) - tgt.setAuthored(src.getAuthored()); + if (src.hasAuthoredElement()) + tgt.setAuthoredElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getAuthoredElement())); if (src.hasSource()) { tgt.setSource(VersionConvertor_14_50.convertReference(src.getSource())); } @@ -106,10 +107,10 @@ public class QuestionnaireResponse14_50 { return null; org.hl7.fhir.dstu2016may.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.dstu2016may.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_14_50.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.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } @@ -124,10 +125,10 @@ public class QuestionnaireResponse14_50 { return null; org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemComponent tgt = new org.hl7.fhir.r5.model.QuestionnaireResponse.QuestionnaireResponseItemComponent(); VersionConvertor_14_50.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getLinkIdElement())); + if (src.hasTextElement()) + tgt.setTextElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getTextElement())); if (src.hasAnswer()) { for (org.hl7.fhir.dstu2016may.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent t : src.getAnswer()) tgt.addAnswer(convertQuestionnaireResponseItemAnswerComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/SearchParameter14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/SearchParameter14_50.java index ffedb2d22..6e46d94ed 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/SearchParameter14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/SearchParameter14_50.java @@ -3,6 +3,9 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeType; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class SearchParameter14_50 { @@ -11,21 +14,19 @@ public class SearchParameter14_50 { return null; org.hl7.fhir.dstu2016may.model.SearchParameter tgt = new org.hl7.fhir.dstu2016may.model.SearchParameter(); VersionConvertor_14_50.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.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t)); } @@ -36,22 +37,20 @@ public class SearchParameter14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); if (src.hasBase()) { for (CodeType t : src.getBase()) tgt.setBase(t.asStringValue()); } if (src.hasType()) { tgt.setType(VersionConvertor_14_50.convertSearchParamType(src.getType())); } - if (src.hasDescription()) { - tgt.setDescription(src.getDescription()); - } - if (src.hasExpression()) - tgt.setExpression(VersionConvertor_14_50.convertTo2016MayExpression(src.getExpression())); - if (src.hasXpath()) - tgt.setXpath(src.getXpath()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getExpressionElement())); + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getXpathElement())); if (src.hasXpathUsage()) { tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); } @@ -66,21 +65,19 @@ public class SearchParameter14_50 { return null; org.hl7.fhir.r5.model.SearchParameter tgt = new org.hl7.fhir.r5.model.SearchParameter(); VersionConvertor_14_50.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.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.SearchParameter.SearchParameterContactComponent t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t)); } @@ -90,22 +87,19 @@ public class SearchParameter14_50 { tgt.addUseContext(VersionConvertor_14_50.convertCodeableConceptToUsageContext(t)); if (src.hasRequirements()) tgt.setPurpose(src.getRequirements()); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasBase()) { - tgt.addBase(src.getBase()); - } + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasBaseElement()) + tgt.setBase(Collections.singletonList((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getBaseElement()))); if (src.hasType()) { tgt.setType(VersionConvertor_14_50.convertSearchParamType(src.getType())); } - if (src.hasDescription()) { + if (src.hasDescription()) tgt.setDescription(src.getDescription()); - } - if (src.hasExpression()) - tgt.setExpression(VersionConvertor_14_50.convertToR4Expression(src.getExpression())); - if (src.hasXpath()) - tgt.setXpath(src.getXpath()); + if (src.hasExpressionElement()) + tgt.setExpressionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getExpressionElement())); + if (src.hasXpathElement()) + tgt.setXpathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getXpathElement())); if (src.hasXpathUsage()) { tgt.setXpathUsage(convertXPathUsageType(src.getXpathUsage())); } @@ -120,8 +114,8 @@ public class SearchParameter14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -133,8 +127,8 @@ public class SearchParameter14_50 { return null; org.hl7.fhir.dstu2016may.model.SearchParameter.SearchParameterContactComponent tgt = new org.hl7.fhir.dstu2016may.model.SearchParameter.SearchParameterContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureDefinition14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureDefinition14_50.java index 6f2cc246a..7aa5636c2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureDefinition14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureDefinition14_50.java @@ -1,10 +1,12 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; +import org.hl7.fhir.dstu2016may.model.StringType; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.ElementDefinition; import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule; import org.hl7.fhir.utilities.Utilities; +import java.util.Collections; public class StructureDefinition14_50 { @@ -48,32 +50,31 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureDefinition tgt = new org.hl7.fhir.dstu2016may.model.StructureDefinition(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.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.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasTitleElement()) + tgt.setDisplayElement((StringType) VersionConvertor_14_50.convertType(src.getTitleElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.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.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -81,8 +82,8 @@ public class StructureDefinition14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.hasKeyword()) { for (org.hl7.fhir.r5.model.Coding t : src.getKeyword()) tgt.addCode(VersionConvertor_14_50.convertCoding(t)); } @@ -94,16 +95,15 @@ public class StructureDefinition14_50 { if (src.hasKind()) { tgt.setKind(convertStructureDefinitionKind(src.getKind())); } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getAbstractElement())); for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent t : src.getContext()) { if (!tgt.hasContextType()) tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression())); tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression()); } - if (src.hasBaseDefinition()) - tgt.setBaseDefinition(src.getBaseDefinition()); + if (src.hasBaseDefinitionElement()) + tgt.setBaseDefinitionElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getBaseDefinitionElement())); if (src.hasType() && src.getDerivation() == org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule.CONSTRAINT) tgt.setBaseType(src.getType()); if (src.hasDerivation()) { @@ -122,30 +122,29 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.r5.model.StructureDefinition tgt = new org.hl7.fhir.r5.model.StructureDefinition(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2016may.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasDisplayElement()) + tgt.setTitleElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.StructureDefinition.StructureDefinitionContactComponent t : src.getContact()) tgt.addContact(convertStructureDefinitionContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) @@ -167,9 +166,8 @@ public class StructureDefinition14_50 { if (src.hasKind()) { tgt.setKind(convertStructureDefinitionKind(src.getKind(), src.getName())); } - if (src.hasAbstract()) { - tgt.setAbstract(src.getAbstract()); - } + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getAbstractElement())); for (org.hl7.fhir.dstu2016may.model.StringType t : src.getContext()) { org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext(); if (src.hasContextType()) { @@ -181,8 +179,8 @@ public class StructureDefinition14_50 { tgt.setType(src.getBaseType()); else tgt.setType(src.getId()); - if (src.hasBaseDefinition()) - tgt.setBaseDefinition(src.getBaseDefinition()); + if (src.hasBaseDefinitionElement()) + tgt.setBaseDefinitionElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getBaseDefinitionElement())); if (src.hasDerivation()) { tgt.setDerivation(convertTypeDerivationRule(src.getDerivation())); } @@ -213,8 +211,8 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -226,8 +224,8 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureDefinition.StructureDefinitionContactComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureDefinition.StructureDefinitionContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -298,15 +296,14 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasIdentity()) { - tgt.setIdentity(src.getIdentity()); - } - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComments()) - tgt.setComment(src.getComments()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasCommentsElement()) + tgt.setCommentElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getCommentsElement())); return tgt; } @@ -315,15 +312,14 @@ public class StructureDefinition14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureDefinition.StructureDefinitionMappingComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureDefinition.StructureDefinitionMappingComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasIdentity()) { - tgt.setIdentity(src.getIdentity()); - } - if (src.hasUri()) - tgt.setUri(src.getUri()); - if (src.hasName()) - tgt.setName(src.getName()); - if (src.hasComment()) - tgt.setComments(src.getComment()); + if (src.hasIdentityElement()) + tgt.setIdentityElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getIdentityElement())); + if (src.hasUriElement()) + tgt.setUriElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUriElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasCommentElement()) + tgt.setCommentsElement((StringType) VersionConvertor_14_50.convertType(src.getCommentElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java index d62e1dd2c..b0ad9c3f8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java @@ -6,6 +6,9 @@ import org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType; import org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapListMode; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Enumeration; +import org.hl7.fhir.r5.model.StringType; + +import java.util.Collections; public class StructureMap14_50 { @@ -14,29 +17,27 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap tgt = new org.hl7.fhir.r5.model.StructureMap(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.convertConformanceResourceStatus(src.getStatus())); } if (src.hasIdentifier()) { for (org.hl7.fhir.dstu2016may.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContactComponent t : src.getContact()) tgt.addContact(convertStructureMapContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) @@ -64,31 +65,29 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap tgt = new org.hl7.fhir.dstu2016may.model.StructureMap(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.convertConformanceResourceStatus(src.getStatus())); } if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasExperimental()) - tgt.setExperimental(src.getExperimental()); - if (src.hasPublisher()) - tgt.setPublisher(src.getPublisher()); + if (src.hasExperimentalElement()) + tgt.setExperimentalElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertStructureMapContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { @@ -96,8 +95,8 @@ public class StructureMap14_50 { } if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.hasStructure()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent t : src.getStructure()) tgt.addStructure(convertStructureMapStructureComponent(t)); } @@ -115,8 +114,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -128,8 +127,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContactComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -167,14 +166,13 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasExtends()) - tgt.setExtends(src.getExtends()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasExtendsElement()) + tgt.setExtendsElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getExtendsElement())); tgt.setTypeMode(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); if (src.hasInput()) { for (org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupInputComponent t : src.getInput()) tgt.addInput(convertStructureMapGroupInputComponent(t)); } @@ -189,15 +187,14 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasExtends()) - tgt.setExtends(src.getExtends()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasExtendsElement()) + tgt.setExtendsElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getExtendsElement())); if (!src.getTypeMode().equals(org.hl7.fhir.r5.model.StructureMap.StructureMapGroupTypeMode.NONE)) throw new FHIRException("Unable to downgrade structure map with group.typeMode other than 'None': " + src.getTypeMode().getDisplay()); - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); if (src.hasInput()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent t : src.getInput()) tgt.addInput(convertStructureMapGroupInputComponent(t)); } @@ -212,16 +209,15 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupInputComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupInputComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getTypeElement())); if (src.hasMode()) { tgt.setMode(convertStructureMapInputMode(src.getMode())); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -230,16 +226,15 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupInputComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } - if (src.hasType()) - tgt.setType(src.getType()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); + if (src.hasTypeElement()) + tgt.setTypeElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getTypeElement())); if (src.hasMode()) { tgt.setMode(convertStructureMapInputMode(src.getMode())); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -248,9 +243,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasSource()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleSourceComponent t : src.getSource()) tgt.addSource(convertStructureMapGroupRuleSourceComponent(t)); } @@ -263,8 +257,8 @@ public class StructureMap14_50 { if (src.hasDependent()) { for (org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent t : src.getDependent()) tgt.addDependent(convertStructureMapGroupRuleDependentComponent(t)); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -273,9 +267,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasSource()) { for (org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleSourceComponent t : src.getSource()) tgt.addSource(convertStructureMapGroupRuleSourceComponent(t)); } @@ -288,8 +281,8 @@ public class StructureMap14_50 { if (src.hasDependent()) { for (org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleDependentComponent t : src.getDependent()) tgt.addDependent(convertStructureMapGroupRuleDependentComponent(t)); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -298,9 +291,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleDependentComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleDependentComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasVariable()) { for (org.hl7.fhir.r5.model.StringType t : src.getVariable()) tgt.addVariable(t.asStringValue()); } @@ -312,9 +304,8 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleDependentComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasVariable()) { for (org.hl7.fhir.dstu2016may.model.StringType t : src.getVariable()) tgt.addVariable(t.asStringValue()); } @@ -327,19 +318,18 @@ public class StructureMap14_50 { org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleSourceComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleSourceComponent(); VersionConvertor_14_50.copyElement(src, tgt); tgt.setContextType(StructureMapContextType.TYPE); - if (src.hasContext()) { - tgt.setContext(src.getContext()); - } - if (src.hasElement()) - tgt.setElement(src.getElement()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getContextElement())); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getElementElement())); if (src.hasListMode()) tgt.setListMode(convertStructureMapSourceListMode(src.getListMode())); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); - if (src.hasCondition()) - tgt.setCondition(src.getCondition()); - if (src.hasCheck()) - tgt.setCheck(src.getCheck()); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getVariableElement())); + if (src.hasConditionElement()) + tgt.setConditionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getConditionElement())); + if (src.hasCheckElement()) + tgt.setCheckElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCheckElement())); return tgt; } @@ -352,17 +342,17 @@ public class StructureMap14_50 { tgt.setMin(src.getRequired() ? 1 : 0); } if (src.getContextType().equals(StructureMap.StructureMapContextType.TYPE)) - tgt.setType(src.getContext()); - if (src.hasElement()) - tgt.setElement(src.getElement()); + tgt.setContextElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getContextElement())); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getElementElement())); if (src.hasListMode()) tgt.setListMode(convertStructureMapSourceListMode(src.getListMode())); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); - if (src.hasCondition()) - tgt.setCondition(src.getCondition()); - if (src.hasCheck()) - tgt.setCheck(src.getCheck()); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getVariableElement())); + if (src.hasConditionElement()) + tgt.setConditionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getConditionElement())); + if (src.hasCheckElement()) + tgt.setCheckElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getCheckElement())); return tgt; } @@ -371,19 +361,19 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleTargetComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupRuleTargetComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getContextElement())); if (src.hasContextType()) tgt.setContextType(convertStructureMapContextType(src.getContextType())); - if (src.hasElement()) - tgt.setElement(src.getElement()); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getElementElement())); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getVariableElement())); if (src.hasListMode()) { for (Enumeration t : src.getListMode()) tgt.addListMode(convertStructureMapTargetListMode(t.getValue())); } - if (src.hasListRuleId()) - tgt.setListRuleId(src.getListRuleId()); + if (src.hasListRuleIdElement()) + tgt.setListRuleIdElement((org.hl7.fhir.dstu2016may.model.IdType) VersionConvertor_14_50.convertType(src.getListRuleIdElement())); if (src.hasTransform()) tgt.setTransform(convertStructureMapTransform(src.getTransform())); if (src.hasParameter()) { @@ -397,19 +387,19 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleTargetComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapGroupRuleTargetComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasContext()) - tgt.setContext(src.getContext()); + if (src.hasContextElement()) + tgt.setContextElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getContextElement())); if (src.hasContextType()) tgt.setContextType(convertStructureMapContextType(src.getContextType())); - if (src.hasElement()) - tgt.setElement(src.getElement()); - if (src.hasVariable()) - tgt.setVariable(src.getVariable()); + if (src.hasElementElement()) + tgt.setElementElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getElementElement())); + if (src.hasVariableElement()) + tgt.setVariableElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getVariableElement())); if (src.hasListMode()) { for (org.hl7.fhir.dstu2016may.model.Enumeration t : src.getListMode()) VersionConvertor_14_50.copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue()))); } - if (src.hasListRuleId()) - tgt.setListRuleId(src.getListRuleId()); + if (src.hasListRuleIdElement()) + tgt.setListRuleIdElement((org.hl7.fhir.r5.model.IdType) VersionConvertor_14_50.convertType(src.getListRuleIdElement())); if (src.hasTransform()) tgt.setTransform(convertStructureMapTransform(src.getTransform())); if (src.hasParameter()) { @@ -497,14 +487,13 @@ public class StructureMap14_50 { return null; org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapStructureComponent tgt = new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapStructureComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasMode()) { tgt.setMode(convertStructureMapStructureMode(src.getMode())); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } @@ -513,14 +502,13 @@ public class StructureMap14_50 { return null; org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent tgt = new org.hl7.fhir.r5.model.StructureMap.StructureMapStructureComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasUrl()) { - tgt.setUrl(src.getUrl()); - } + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasMode()) { tgt.setMode(convertStructureMapStructureMode(src.getMode())); } - if (src.hasDocumentation()) - tgt.setDocumentation(src.getDocumentation()); + if (src.hasDocumentationElement()) + tgt.setDocumentationElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDocumentationElement())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ValueSet14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ValueSet14_50.java index 63cc558d1..613b50b6d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ValueSet14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ValueSet14_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv14_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.BooleanType; +import java.util.Collections; public class ValueSet14_50 { @@ -11,11 +12,10 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -27,11 +27,10 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasCode()) { - tgt.setCode(src.getCode()); - } - if (src.hasDisplay()) - tgt.setDisplay(src.getDisplay()); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); if (src.hasDesignation()) { for (org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceDesignationComponent t : src.getDesignation()) tgt.addDesignation(convertConceptReferenceDesignationComponent(t)); } @@ -43,14 +42,13 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptReferenceDesignationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_14_50.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -59,14 +57,13 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceDesignationComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceDesignationComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasLanguage()) - tgt.setLanguage(src.getLanguage()); + if (src.hasLanguageElement()) + tgt.setLanguageElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getLanguageElement())); if (src.hasUse()) { tgt.setUse(VersionConvertor_14_50.convertCoding(src.getUse())); } - if (src.hasValue()) { - tgt.setValue(src.getValue()); - } + if (src.hasValueElement()) + tgt.setValueElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -75,11 +72,10 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.dstu2016may.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -94,11 +90,10 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasSystem()) { - tgt.setSystem(src.getSystem()); - } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); + if (src.hasSystemElement()) + tgt.setSystemElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); if (src.hasConcept()) { for (org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent t : src.getConcept()) tgt.addConcept(convertConceptReferenceComponent(t)); } @@ -113,15 +108,13 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setProperty(src.getProperty()); - } + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.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.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -130,15 +123,13 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ConceptSetFilterComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ConceptSetFilterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasProperty()) { - tgt.setProperty(src.getProperty()); - } + if (src.hasPropertyElement()) + tgt.setPropertyElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getValueElement())); return tgt; } @@ -189,34 +180,34 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet tgt = new org.hl7.fhir.r5.model.ValueSet(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) tgt.addIdentifier(VersionConvertor_14_50.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.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetContactComponent t : src.getContact()) tgt.addContact(convertValueSetContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.hasDescription()) tgt.setDescription(src.getDescription()); for (org.hl7.fhir.dstu2016may.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_14_50.isJurisdiction(t)) tgt.addJurisdiction(VersionConvertor_14_50.convertCodeableConcept(t)); else tgt.addUseContext(VersionConvertor_14_50.convertCodeableConceptToUsageContext(t)); - if (src.hasImmutable()) - tgt.setImmutable(src.getImmutable()); + if (src.hasImmutableElement()) + tgt.setImmutableElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getImmutableElement())); if (src.hasRequirements()) tgt.setPurpose(src.getRequirements()); if (src.hasCopyright()) @@ -239,42 +230,42 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet tgt = new org.hl7.fhir.dstu2016may.model.ValueSet(); VersionConvertor_14_50.copyDomainResource(src, tgt); - if (src.hasUrl()) - tgt.setUrl(src.getUrl()); + if (src.hasUrlElement()) + tgt.setUrlElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getUrlElement())); if (src.hasIdentifier()) { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.setIdentifier(VersionConvertor_14_50.convertIdentifier(t)); } - if (src.hasVersion()) - tgt.setVersion(src.getVersion()); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasStatus()) { tgt.setStatus(VersionConvertor_14_50.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.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getExperimentalElement())); + if (src.hasPublisherElement()) + tgt.setPublisherElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getPublisherElement())); if (src.hasContact()) { for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertValueSetContactComponent(t)); } - if (src.hasDate()) - tgt.setDate(src.getDate()); + if (src.hasDateElement()) + tgt.setDateElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getDateElement())); if (src.getCompose().hasLockedDate()) tgt.setLockedDate(src.getCompose().getLockedDate()); - if (src.hasDescription()) - tgt.setDescription(src.getDescription()); + if (src.hasDescriptionElement()) + tgt.setDescriptionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDescriptionElement())); for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t.getValueCodeableConcept())); if (src.hasJurisdiction()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getJurisdiction()) tgt.addUseContext(VersionConvertor_14_50.convertCodeableConcept(t)); } - if (src.hasImmutable()) - tgt.setImmutable(src.getImmutable()); + if (src.hasImmutableElement()) + tgt.setImmutableElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getImmutableElement())); if (src.hasPurpose()) tgt.setRequirements(src.getPurpose()); - if (src.hasCopyright()) - tgt.setCopyright(src.getCopyright()); + if (src.hasCopyrightElement()) + tgt.setCopyrightElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getCopyrightElement())); if (src.hasExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible")) tgt.setExtensible(((BooleanType) src.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/valueset-extensible").getValue()).booleanValue()); if (src.hasCompose()) { @@ -322,8 +313,8 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetContactComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetContactComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -335,8 +326,8 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ContactDetail tgt = new org.hl7.fhir.r5.model.ContactDetail(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) - tgt.setName(src.getName()); + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasTelecom()) { for (org.hl7.fhir.dstu2016may.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(VersionConvertor_14_50.convertContactPoint(t)); } @@ -348,16 +339,14 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasIdentifier()) { - tgt.setIdentifier(src.getIdentifier()); - } - if (src.hasTimestamp()) { - tgt.setTimestamp(src.getTimestamp()); - } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); - if (src.hasOffset()) - tgt.setOffset(src.getOffset()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_14_50.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_14_50.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.r5.model.IntegerType) VersionConvertor_14_50.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -372,16 +361,14 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasIdentifier()) { - tgt.setIdentifier(src.getIdentifier()); - } - if (src.hasTimestamp()) { - tgt.setTimestamp(src.getTimestamp()); - } - if (src.hasTotal()) - tgt.setTotal(src.getTotal()); - if (src.hasOffset()) - tgt.setOffset(src.getOffset()); + if (src.hasIdentifierElement()) + tgt.setIdentifierElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getIdentifierElement())); + if (src.hasTimestampElement()) + tgt.setTimestampElement((org.hl7.fhir.dstu2016may.model.DateTimeType) VersionConvertor_14_50.convertType(src.getTimestampElement())); + if (src.hasTotalElement()) + tgt.setTotalElement((org.hl7.fhir.dstu2016may.model.IntegerType) VersionConvertor_14_50.convertType(src.getTotalElement())); + if (src.hasOffsetElement()) + tgt.setOffsetElement((org.hl7.fhir.dstu2016may.model.IntegerType) VersionConvertor_14_50.convertType(src.getOffsetElement())); if (src.hasParameter()) { for (org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent t : src.getParameter()) tgt.addParameter(convertValueSetExpansionParameterComponent(t)); } @@ -396,16 +383,16 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_14_50.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.r5.model.UriType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getAbstractElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); if (src.hasContains()) { for (org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionContainsComponent t : src.getContains()) tgt.addContains(convertValueSetExpansionContainsComponent(t)); } @@ -417,16 +404,16 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionContainsComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionContainsComponent(); VersionConvertor_14_50.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.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getSystemElement())); + if (src.hasAbstractElement()) + tgt.setAbstractElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getAbstractElement())); + if (src.hasVersionElement()) + tgt.setVersionElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getVersionElement())); + if (src.hasCodeElement()) + tgt.setCodeElement((org.hl7.fhir.dstu2016may.model.CodeType) VersionConvertor_14_50.convertType(src.getCodeElement())); + if (src.hasDisplayElement()) + tgt.setDisplayElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getDisplayElement())); if (src.hasContains()) { for (org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent t : src.getContains()) tgt.addContains(convertValueSetExpansionContainsComponent(t)); } @@ -438,9 +425,8 @@ public class ValueSet14_50 { return null; org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.convertType(src.getValue())); } @@ -452,9 +438,8 @@ public class ValueSet14_50 { return null; org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionParameterComponent tgt = new org.hl7.fhir.dstu2016may.model.ValueSet.ValueSetExpansionParameterComponent(); VersionConvertor_14_50.copyElement(src, tgt); - if (src.hasName()) { - tgt.setName(src.getName()); - } + if (src.hasNameElement()) + tgt.setNameElement((org.hl7.fhir.dstu2016may.model.StringType) VersionConvertor_14_50.convertType(src.getNameElement())); if (src.hasValue()) { tgt.setValue(VersionConvertor_14_50.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 7712e7e4c..964f91658 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java @@ -92,7 +92,7 @@ public class Parser { // VERSION_FILES.forEach(version -> { - String version = "14_40"; + String version = "14_50"; List filenames = listAllJavaFilesInDirectory(new File("").getAbsolutePath() + "/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/"); System.out.println("Checking the following files:"); Collections.sort(filenames);