Fixing class cast exceptions. However build is still failing.
This commit is contained in:
parent
9feec949f3
commit
dc0559c3e7
|
@ -178,8 +178,8 @@ public class ConceptMap10_50 {
|
|||
if (src.hasPropertyElement()) {
|
||||
tgt.setElementElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_50.convertType(src.getPropertyElement()));
|
||||
}
|
||||
if (src.hasSystemElement()) {
|
||||
tgt.setCodeSystemElement((org.hl7.fhir.dstu2.model.UriType) VersionConvertor_10_50.convertType(src.getSystemElement()));
|
||||
if (src.hasSystem()) {
|
||||
tgt.setCodeSystem(src.getSystem());
|
||||
}
|
||||
if (src.hasValueElement()) {
|
||||
tgt.setCodeElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_50.convertType(src.getValueElement()));
|
||||
|
@ -195,8 +195,8 @@ public class ConceptMap10_50 {
|
|||
if (src.hasElementElement()) {
|
||||
tgt.setPropertyElement((UriType) VersionConvertor_10_50.convertType(src.getElementElement()));
|
||||
}
|
||||
if (src.hasCodeSystemElement()) {
|
||||
tgt.setSystemElement((CanonicalType) VersionConvertor_10_50.convertType(src.getCodeSystemElement()));
|
||||
if (src.hasCodeSystem()) {
|
||||
tgt.setSystem(src.getCodeSystem());
|
||||
}
|
||||
if (src.hasCodeElement()) {
|
||||
tgt.setValueElement((StringType) VersionConvertor_10_50.convertType(src.getCodeElement()));
|
||||
|
|
|
@ -332,8 +332,8 @@ public class Conformance10_50 {
|
|||
if (src.hasProtocol()) {
|
||||
tgt.setProtocol(VersionConvertor_10_50.convertCoding(src.getProtocol()));
|
||||
}
|
||||
if (src.hasAddressElement()) {
|
||||
tgt.setAddressElement((UrlType) VersionConvertor_10_50.convertType(src.getAddressElement()));
|
||||
if (src.hasAddress()) {
|
||||
tgt.setAddress(src.getAddress());
|
||||
}
|
||||
return tgt;
|
||||
}
|
||||
|
@ -346,8 +346,8 @@ public class Conformance10_50 {
|
|||
if (src.hasProtocol()) {
|
||||
tgt.setProtocol(VersionConvertor_10_50.convertCoding(src.getProtocol()));
|
||||
}
|
||||
if (src.hasAddressElement()) {
|
||||
tgt.setAddressElement((UriType) VersionConvertor_10_50.convertType(src.getAddressElement()));
|
||||
if (src.hasAddress()) {
|
||||
tgt.setAddress(src.getAddress());
|
||||
}
|
||||
return tgt;
|
||||
}
|
||||
|
|
|
@ -32,8 +32,8 @@ public class SearchParameter10_50 {
|
|||
if (src.hasContact()) {
|
||||
for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t));
|
||||
}
|
||||
if (src.hasPurposeElement()) {
|
||||
tgt.setRequirementsElement((StringType) VersionConvertor_10_50.convertType(src.getPurposeElement()));
|
||||
if (src.hasPurpose()) {
|
||||
tgt.setRequirements(src.getPurpose());
|
||||
}
|
||||
if (src.hasCodeElement())
|
||||
tgt.setCodeElement((org.hl7.fhir.dstu2.model.CodeType) VersionConvertor_10_50.convertType(src.getCodeElement()));
|
||||
|
@ -43,8 +43,8 @@ public class SearchParameter10_50 {
|
|||
if (src.hasType()) {
|
||||
tgt.setType(VersionConvertor_10_50.convertSearchParamType(src.getType()));
|
||||
}
|
||||
if (src.hasDescriptionElement())
|
||||
tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
if (src.hasExpression()) {
|
||||
org.hl7.fhir.dstu2.utils.ToolingExtensions.setStringExtension(tgt, ToolingExtensions.EXT_EXPRESSION, src.getExpression());
|
||||
}
|
||||
|
@ -80,8 +80,8 @@ public class SearchParameter10_50 {
|
|||
if (src.hasContact()) {
|
||||
for (org.hl7.fhir.dstu2.model.SearchParameter.SearchParameterContactComponent t : src.getContact()) tgt.addContact(convertSearchParameterContactComponent(t));
|
||||
}
|
||||
if (src.hasRequirementsElement()) {
|
||||
tgt.setPurposeElement((MarkdownType) VersionConvertor_10_50.convertType(src.getRequirementsElement()));
|
||||
if (src.hasRequirements()) {
|
||||
tgt.setPurpose(src.getRequirements());
|
||||
}
|
||||
if (src.hasCodeElement())
|
||||
tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_10_50.convertType(src.getCodeElement()));
|
||||
|
@ -90,8 +90,8 @@ public class SearchParameter10_50 {
|
|||
if (src.hasType()) {
|
||||
tgt.setType(VersionConvertor_10_50.convertSearchParamType(src.getType()));
|
||||
}
|
||||
if (src.hasDescriptionElement())
|
||||
tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
tgt.setExpression(ToolingExtensions.readStringExtension(src, ToolingExtensions.EXT_EXPRESSION));
|
||||
if (src.hasXpathElement())
|
||||
tgt.setXpathElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_10_50.convertType(src.getXpathElement()));
|
||||
|
|
|
@ -79,8 +79,8 @@ public class StructureDefinition10_50 {
|
|||
}
|
||||
if (src.hasDateElement())
|
||||
tgt.setDateElement((org.hl7.fhir.dstu2.model.DateTimeType) VersionConvertor_10_50.convertType(src.getDateElement()));
|
||||
if (src.hasDescriptionElement())
|
||||
tgt.setDescriptionElement((org.hl7.fhir.dstu2.model.StringType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
for (org.hl7.fhir.r5.model.UsageContext t : src.getUseContext()) if (t.hasValueCodeableConcept())
|
||||
tgt.addUseContext(VersionConvertor_10_50.convertCodeableConcept(t.getValueCodeableConcept()));
|
||||
if (src.hasJurisdiction()) {
|
||||
|
@ -159,8 +159,8 @@ public class StructureDefinition10_50 {
|
|||
}
|
||||
if (src.hasDateElement())
|
||||
tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_10_50.convertType(src.getDateElement()));
|
||||
if (src.hasDescriptionElement())
|
||||
tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_50.isJurisdiction(t))
|
||||
tgt.addJurisdiction(VersionConvertor_10_50.convertCodeableConcept(t));
|
||||
else
|
||||
|
@ -168,8 +168,8 @@ public class StructureDefinition10_50 {
|
|||
if (src.hasRequirements()) {
|
||||
tgt.setPurpose(src.getRequirements());
|
||||
}
|
||||
if (src.hasCopyrightElement())
|
||||
tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_10_50.convertType(src.getCopyrightElement()));
|
||||
if (src.hasCopyright())
|
||||
tgt.setCopyright(src.getCopyright());
|
||||
if (src.hasCode()) {
|
||||
for (org.hl7.fhir.dstu2.model.Coding t : src.getCode()) tgt.addKeyword(VersionConvertor_10_50.convertCoding(t));
|
||||
}
|
||||
|
@ -191,16 +191,16 @@ public class StructureDefinition10_50 {
|
|||
}
|
||||
ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
|
||||
}
|
||||
if (src.hasConstrainedTypeElement())
|
||||
tgt.setTypeElement((UriType) VersionConvertor_10_50.convertType(src.getConstrainedTypeElement()));
|
||||
if (src.hasConstrainedType())
|
||||
tgt.setType(src.getConstrainedType());
|
||||
else if (src.getSnapshot().hasElement())
|
||||
tgt.setType(src.getSnapshot().getElement().get(0).getPath());
|
||||
else if (src.getDifferential().hasElement() && !src.getDifferential().getElement().get(0).getPath().contains("."))
|
||||
tgt.setType(src.getDifferential().getElement().get(0).getPath());
|
||||
else
|
||||
tgt.setType(src.getDifferential().getElement().get(0).getPath().substring(0, src.getDifferential().getElement().get(0).getPath().indexOf(".")));
|
||||
if (src.hasBaseElement()) {
|
||||
tgt.setBaseDefinitionElement((CanonicalType) VersionConvertor_10_50.convertType(src.getBaseElement()));
|
||||
if (src.hasBase()) {
|
||||
tgt.setBaseDefinition(src.getBase());
|
||||
}
|
||||
tgt.setDerivation(src.hasConstrainedType() ? org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule.CONSTRAINT : org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule.SPECIALIZATION);
|
||||
if (src.hasSnapshot()) {
|
||||
|
|
|
@ -256,8 +256,8 @@ public class ValueSet10_50 {
|
|||
}
|
||||
if (src.hasDateElement())
|
||||
tgt.setDateElement((org.hl7.fhir.r5.model.DateTimeType) VersionConvertor_10_50.convertType(src.getDateElement()));
|
||||
if (src.hasDescriptionElement())
|
||||
tgt.setDescriptionElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_50.isJurisdiction(t))
|
||||
tgt.addJurisdiction(VersionConvertor_10_50.convertCodeableConcept(t));
|
||||
else
|
||||
|
@ -267,8 +267,8 @@ public class ValueSet10_50 {
|
|||
if (src.hasRequirements()) {
|
||||
tgt.setPurpose(src.getRequirements());
|
||||
}
|
||||
if (src.hasCopyrightElement())
|
||||
tgt.setCopyrightElement((org.hl7.fhir.r5.model.MarkdownType) VersionConvertor_10_50.convertType(src.getCopyrightElement()));
|
||||
if (src.hasCopyright())
|
||||
tgt.setCopyright(src.getCopyright());
|
||||
if (src.hasExtensible())
|
||||
tgt.addExtension("http://hl7.org/fhir/StructureDefinition/valueset-extensible", new BooleanType(src.getExtensible()));
|
||||
if (src.hasCompose()) {
|
||||
|
@ -307,8 +307,8 @@ public class ValueSet10_50 {
|
|||
}
|
||||
if (src.hasDateElement())
|
||||
tgtcs.setDateElement((DateTimeType) VersionConvertor_10_50.convertType(src.getDateElement()));
|
||||
if (src.hasDescriptionElement()) {
|
||||
tgtcs.setDescriptionElement((MarkdownType) VersionConvertor_10_50.convertType(src.getDescriptionElement()));
|
||||
if (src.hasDescription()) {
|
||||
tgtcs.setDescription(src.getDescription());
|
||||
}
|
||||
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getUseContext()) if (VersionConvertor_10_50.isJurisdiction(t))
|
||||
tgtcs.addJurisdiction(VersionConvertor_10_50.convertCodeableConcept(t));
|
||||
|
|
|
@ -50,8 +50,8 @@ public class CodeSystem14_50 {
|
|||
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.hasValueSet())
|
||||
tgt.setValueSet(src.getValueSet());
|
||||
if (src.hasCompositionalElement())
|
||||
tgt.setCompositionalElement((org.hl7.fhir.dstu2016may.model.BooleanType) VersionConvertor_14_50.convertType(src.getCompositionalElement()));
|
||||
if (src.hasVersionNeededElement())
|
||||
|
@ -110,8 +110,8 @@ public class CodeSystem14_50 {
|
|||
tgt.setCopyright(src.getCopyright());
|
||||
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.hasValueSet())
|
||||
tgt.setValueSet(src.getValueSet());
|
||||
if (src.hasCompositionalElement())
|
||||
tgt.setCompositionalElement((org.hl7.fhir.r5.model.BooleanType) VersionConvertor_14_50.convertType(src.getCompositionalElement()));
|
||||
if (src.hasVersionNeededElement())
|
||||
|
@ -119,8 +119,8 @@ public class CodeSystem14_50 {
|
|||
if (src.hasContent()) {
|
||||
tgt.setContent(convertCodeSystemContentMode(src.getContent()));
|
||||
}
|
||||
if (src.hasCountElement())
|
||||
tgt.setCountElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getCountElement()));
|
||||
if (src.hasCount())
|
||||
tgt.setCount(src.getCount());
|
||||
if (src.hasFilter()) {
|
||||
for (org.hl7.fhir.dstu2016may.model.CodeSystem.CodeSystemFilterComponent t : src.getFilter()) tgt.addFilter(convertCodeSystemFilterComponent(t));
|
||||
}
|
||||
|
|
|
@ -208,8 +208,8 @@ public class ConceptMap14_50 {
|
|||
if (src.hasElementElement()) {
|
||||
tgt.setPropertyElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_14_50.convertType(src.getElementElement()));
|
||||
}
|
||||
if (src.hasSystemElement())
|
||||
tgt.setSystemElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getSystemElement()));
|
||||
if (src.hasSystem())
|
||||
tgt.setSystem(src.getSystem());
|
||||
if (src.hasCodeElement()) {
|
||||
tgt.setValueElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_14_50.convertType(src.getCodeElement()));
|
||||
}
|
||||
|
|
|
@ -241,8 +241,8 @@ public class Conformance14_50 {
|
|||
if (src.hasDescription()) {
|
||||
tgt.setDescription(src.getDescription());
|
||||
}
|
||||
if (src.hasUrlElement())
|
||||
tgt.setUrlElement((UrlType) VersionConvertor_14_50.convertType(src.getUrlElement()));
|
||||
if (src.hasUrl())
|
||||
tgt.setUrl(src.getUrl());
|
||||
return tgt;
|
||||
}
|
||||
|
||||
|
@ -301,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.hasReliableCacheElement())
|
||||
tgt.setReliableCacheElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_14_50.convertType(src.getReliableCacheElement()));
|
||||
if (src.hasReliableCache())
|
||||
tgt.setReliableCache(src.getReliableCache());
|
||||
if (src.hasDocumentation())
|
||||
tgt.setDocumentation(src.getDocumentation());
|
||||
for (org.hl7.fhir.dstu2016may.model.Conformance.ConformanceMessagingEventComponent t : src.getEvent()) {
|
||||
|
@ -350,8 +350,8 @@ public class Conformance14_50 {
|
|||
if (src.hasProtocol()) {
|
||||
tgt.setProtocol(VersionConvertor_14_50.convertCoding(src.getProtocol()));
|
||||
}
|
||||
if (src.hasAddressElement()) {
|
||||
tgt.setAddressElement((UrlType) VersionConvertor_14_50.convertType(src.getAddressElement()));
|
||||
if (src.hasAddress()) {
|
||||
tgt.setAddress(src.getAddress());
|
||||
}
|
||||
return tgt;
|
||||
}
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
package org.hl7.fhir.convertors.conv14_50;
|
||||
|
||||
import org.hl7.fhir.convertors.VersionConvertor_10_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.CanonicalType;
|
||||
import org.hl7.fhir.r5.model.ElementDefinition;
|
||||
import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule;
|
||||
import org.hl7.fhir.utilities.Utilities;
|
||||
|
@ -102,8 +104,8 @@ public class StructureDefinition14_50 {
|
|||
tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
|
||||
tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
|
||||
}
|
||||
if (src.hasBaseDefinitionElement())
|
||||
tgt.setBaseDefinitionElement((org.hl7.fhir.dstu2016may.model.UriType) VersionConvertor_14_50.convertType(src.getBaseDefinitionElement()));
|
||||
if (src.hasBaseDefinition())
|
||||
tgt.setBaseDefinition(src.getBaseDefinition());
|
||||
if (src.hasType() && src.getDerivation() == org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule.CONSTRAINT)
|
||||
tgt.setBaseType(src.getType());
|
||||
if (src.hasDerivation()) {
|
||||
|
@ -179,8 +181,8 @@ public class StructureDefinition14_50 {
|
|||
tgt.setType(src.getBaseType());
|
||||
else
|
||||
tgt.setType(src.getId());
|
||||
if (src.hasBaseDefinitionElement())
|
||||
tgt.setBaseDefinitionElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_14_50.convertType(src.getBaseDefinitionElement()));
|
||||
if (src.hasBaseDefinition())
|
||||
tgt.setBaseDefinition(src.getBaseDefinition());
|
||||
if (src.hasDerivation()) {
|
||||
tgt.setDerivation(convertTypeDerivationRule(src.getDerivation()));
|
||||
}
|
||||
|
|
|
@ -193,8 +193,8 @@ public class CapabilityStatement30_50 {
|
|||
VersionConvertor_30_50.copyElement(src, tgt);
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
if (src.hasUrlElement())
|
||||
tgt.setUrlElement((org.hl7.fhir.r5.model.UrlType) VersionConvertor_30_50.convertType(src.getUrlElement()));
|
||||
if (src.hasUrl())
|
||||
tgt.setUrl(src.getUrl());
|
||||
return tgt;
|
||||
}
|
||||
|
||||
|
@ -205,8 +205,8 @@ public class CapabilityStatement30_50 {
|
|||
VersionConvertor_30_50.copyElement(src, tgt);
|
||||
if (src.hasDescription())
|
||||
tgt.setDescription(src.getDescription());
|
||||
if (src.hasUrlElement())
|
||||
tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement()));
|
||||
if (src.hasUrl())
|
||||
tgt.setUrl(src.getUrl());
|
||||
return tgt;
|
||||
}
|
||||
|
||||
|
@ -248,8 +248,8 @@ public class CapabilityStatement30_50 {
|
|||
if (src.hasEndpoint()) {
|
||||
for (org.hl7.fhir.r5.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertCapabilityStatementMessagingEndpointComponent(t));
|
||||
}
|
||||
if (src.hasReliableCacheElement())
|
||||
tgt.setReliableCacheElement((org.hl7.fhir.dstu3.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getReliableCacheElement()));
|
||||
if (src.hasReliableCache())
|
||||
tgt.setReliableCache(src.getReliableCache());
|
||||
if (src.hasDocumentation())
|
||||
tgt.setDocumentation(src.getDocumentation());
|
||||
if (src.hasSupportedMessage()) {
|
||||
|
@ -285,8 +285,8 @@ public class CapabilityStatement30_50 {
|
|||
if (src.hasEndpoint()) {
|
||||
for (org.hl7.fhir.dstu3.model.CapabilityStatement.CapabilityStatementMessagingEndpointComponent t : src.getEndpoint()) tgt.addEndpoint(convertCapabilityStatementMessagingEndpointComponent(t));
|
||||
}
|
||||
if (src.hasReliableCacheElement())
|
||||
tgt.setReliableCacheElement((org.hl7.fhir.r5.model.UnsignedIntType) VersionConvertor_30_50.convertType(src.getReliableCacheElement()));
|
||||
if (src.hasReliableCache())
|
||||
tgt.setReliableCache(src.getReliableCache());
|
||||
if (src.hasDocumentation())
|
||||
tgt.setDocumentation(src.getDocumentation());
|
||||
if (src.hasSupportedMessage()) {
|
||||
|
|
|
@ -172,8 +172,8 @@ public class ConceptMap30_50 {
|
|||
tgt.setCodeElement((org.hl7.fhir.r5.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement()));
|
||||
if (src.hasDisplayElement())
|
||||
tgt.setDisplayElement((org.hl7.fhir.r5.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement()));
|
||||
if (src.hasUrlElement())
|
||||
tgt.setUrlElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getUrlElement()));
|
||||
if (src.hasUrl())
|
||||
tgt.setUrl(src.getUrl());
|
||||
return tgt;
|
||||
}
|
||||
|
||||
|
@ -188,8 +188,8 @@ public class ConceptMap30_50 {
|
|||
tgt.setCodeElement((org.hl7.fhir.dstu3.model.CodeType) VersionConvertor_30_50.convertType(src.getCodeElement()));
|
||||
if (src.hasDisplayElement())
|
||||
tgt.setDisplayElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getDisplayElement()));
|
||||
if (src.hasUrlElement())
|
||||
tgt.setUrlElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getUrlElement()));
|
||||
if (src.hasUrl())
|
||||
tgt.setUrl(src.getUrl());
|
||||
return tgt;
|
||||
}
|
||||
|
||||
|
@ -259,8 +259,8 @@ public class ConceptMap30_50 {
|
|||
VersionConvertor_30_50.copyElement(src, tgt);
|
||||
if (src.hasPropertyElement())
|
||||
tgt.setPropertyElement((org.hl7.fhir.r5.model.UriType) VersionConvertor_30_50.convertType(src.getPropertyElement()));
|
||||
if (src.hasSystemElement())
|
||||
tgt.setSystemElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getSystemElement()));
|
||||
if (src.hasSystem())
|
||||
tgt.setSystem(src.getSystem());
|
||||
if (src.hasCodeElement())
|
||||
tgt.setValueElement((StringType) VersionConvertor_30_50.convertType(src.getCodeElement()));
|
||||
if (src.hasDisplayElement())
|
||||
|
@ -275,8 +275,8 @@ public class ConceptMap30_50 {
|
|||
VersionConvertor_30_50.copyElement(src, tgt);
|
||||
if (src.hasPropertyElement())
|
||||
tgt.setPropertyElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getPropertyElement()));
|
||||
if (src.hasSystemElement())
|
||||
tgt.setSystemElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getSystemElement()));
|
||||
if (src.hasSystem())
|
||||
tgt.setSystem(src.getSystem());
|
||||
if (src.hasValueElement())
|
||||
tgt.setCodeElement((org.hl7.fhir.dstu3.model.StringType) VersionConvertor_30_50.convertType(src.getValueElement()));
|
||||
if (src.hasDisplayElement())
|
||||
|
|
|
@ -2,6 +2,9 @@ package org.hl7.fhir.r5.model;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public class BaseDateTimeTypeTest {
|
||||
|
@ -33,6 +36,8 @@ public class BaseDateTimeTypeTest {
|
|||
|
||||
@Test
|
||||
public void equalsUsingFhirPathRulesOther() {
|
||||
|
||||
|
||||
// Exact same - Same timezone
|
||||
assertTrue( compareDateTimes("2001-01-02T11:22:33.444Z", "2001-01-02T11:22:33.444Z"));
|
||||
// Exact same - Different timezone
|
||||
|
|
|
@ -3,10 +3,7 @@ package org.hl7.fhir.r5.test;
|
|||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
|
||||
|
@ -150,6 +147,7 @@ public class FHIRPathTests {
|
|||
@SuppressWarnings("deprecation")
|
||||
@Test
|
||||
public void test() throws FileNotFoundException, IOException, FHIRException, org.hl7.fhir.exceptions.FHIRException, UcumException {
|
||||
|
||||
if (fp == null)
|
||||
fp = new FHIRPathEngine(TestingUtilities.context());
|
||||
fp.setHostServices(new FHIRPathTestEvaluationServices());
|
||||
|
|
Loading…
Reference in New Issue