honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tests and changes for DateTime conversion

This commit is contained in:
dotasek 2022-03-15 12:58:59 -04:00
parent 209a5e777b
commit 02968b9b7a
4 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/primitivetypes14_30/DateTime14_30.java
View File

@ -5,15 +5,13 @@ import org.hl7.fhir.exceptions.FHIRException;
public class DateTime14_30 { public class DateTime14_30 {
public static org.hl7.fhir.dstu3.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.dstu3.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.dstu3.model.DateTimeType tgt = new org.hl7.fhir.dstu3.model.DateTimeType(); org.hl7.fhir.dstu3.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.dstu3.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.dstu3.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt); ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt);
return tgt; return tgt;
} }
public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.dstu3.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.dstu3.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.dstu2016may.model.DateTimeType tgt = new org.hl7.fhir.dstu2016may.model.DateTimeType(); org.hl7.fhir.dstu2016may.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.dstu2016may.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.dstu2016may.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt); ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt);
return tgt; return tgt;
} }

6
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/primitivetypes14_40/DateTime14_40.java
View File

@ -5,15 +5,13 @@ import org.hl7.fhir.exceptions.FHIRException;
public class DateTime14_40 { public class DateTime14_40 {
public static org.hl7.fhir.r4.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.r4.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.r4.model.DateTimeType tgt = new org.hl7.fhir.r4.model.DateTimeType(); org.hl7.fhir.r4.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.r4.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.r4.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt); ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt);
return tgt; return tgt;
} }
public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.r4.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.r4.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.dstu2016may.model.DateTimeType tgt = new org.hl7.fhir.dstu2016may.model.DateTimeType(); org.hl7.fhir.dstu2016may.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.dstu2016may.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.dstu2016may.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt); ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt);
return tgt; return tgt;
} }

6
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/primitivetypes14_50/DateTime14_50.java
View File

@ -5,15 +5,13 @@ import org.hl7.fhir.exceptions.FHIRException;
public class DateTime14_50 { public class DateTime14_50 {
public static org.hl7.fhir.r5.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.r5.model.DateTimeType convertDateTime(org.hl7.fhir.dstu2016may.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.r5.model.DateTimeType tgt = new org.hl7.fhir.r5.model.DateTimeType(); org.hl7.fhir.r5.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.r5.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.r5.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt); ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt);
return tgt; return tgt;
} }
public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.r5.model.DateTimeType src) throws FHIRException { public static org.hl7.fhir.dstu2016may.model.DateTimeType convertDateTime(org.hl7.fhir.r5.model.DateTimeType src) throws FHIRException {
org.hl7.fhir.dstu2016may.model.DateTimeType tgt = new org.hl7.fhir.dstu2016may.model.DateTimeType(); org.hl7.fhir.dstu2016may.model.DateTimeType tgt = src.hasValue() ? new org.hl7.fhir.dstu2016may.model.DateTimeType(src.getValueAsString()) : new org.hl7.fhir.dstu2016may.model.DateTimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt); ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt);
return tgt; return tgt;
} }

40
org.hl7.fhir.convertors/src/test/java/org/hl7/fhir/convertors/VersionConvertorPrimitiveTypeTests.java
View File

@ -99,8 +99,46 @@ public class VersionConvertorPrimitiveTypeTests {
getDateTimeArgs(VersionConvertorFactory_10_50.class, getDateTimeArgs(VersionConvertorFactory_10_50.class,
org.hl7.fhir.dstu2.model.DateTimeType.class, org.hl7.fhir.dstu2.model.Type.class, org.hl7.fhir.dstu2.model.DateTimeType.class, org.hl7.fhir.dstu2.model.Type.class,
org.hl7.fhir.r5.model.DateType.class, org.hl7.fhir.r5.model.DataType.class, org.hl7.fhir.r5.model.DateType.class, org.hl7.fhir.r5.model.DataType.class,
DEFAULT_DATE_PRECISION_STRINGS) DEFAULT_DATE_PRECISION_STRINGS),
//DateTime
getDateTimeArgs(VersionConvertorFactory_10_30.class,
org.hl7.fhir.dstu2.model.DateTimeType.class, org.hl7.fhir.dstu2.model.Type.class,
org.hl7.fhir.dstu3.model.DateTimeType.class, org.hl7.fhir.dstu3.model.Type.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_10_40.class,
org.hl7.fhir.dstu2.model.DateTimeType.class, org.hl7.fhir.dstu2.model.Type.class,
org.hl7.fhir.r4.model.DateTimeType.class, org.hl7.fhir.r4.model.Type.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_10_50.class,
org.hl7.fhir.dstu2.model.DateTimeType.class, org.hl7.fhir.dstu2.model.Type.class,
org.hl7.fhir.r5.model.DateTimeType.class, org.hl7.fhir.r5.model.DataType.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_14_30.class,
org.hl7.fhir.dstu2016may.model.DateTimeType.class, org.hl7.fhir.dstu2016may.model.Type.class,
org.hl7.fhir.dstu3.model.DateTimeType.class, org.hl7.fhir.dstu3.model.Type.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_14_40.class,
org.hl7.fhir.dstu2016may.model.DateTimeType.class, org.hl7.fhir.dstu2016may.model.Type.class,
org.hl7.fhir.r4.model.DateTimeType.class, org.hl7.fhir.r4.model.Type.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_14_50.class,
org.hl7.fhir.dstu2016may.model.DateTimeType.class, org.hl7.fhir.dstu2016may.model.Type.class,
org.hl7.fhir.r5.model.DateTimeType.class, org.hl7.fhir.r5.model.DataType.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_30_40.class,
org.hl7.fhir.dstu3.model.DateTimeType.class, org.hl7.fhir.dstu3.model.Type.class,
org.hl7.fhir.r4.model.DateTimeType.class, org.hl7.fhir.r4.model.Type.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_30_50.class,
org.hl7.fhir.dstu3.model.DateTimeType.class, org.hl7.fhir.dstu3.model.Type.class,
org.hl7.fhir.r5.model.DateTimeType.class, org.hl7.fhir.r5.model.DataType.class,
MILLISECOND_DATE_PRECISION_STRINGS),
getDateTimeArgs(VersionConvertorFactory_40_50.class,
org.hl7.fhir.r4.model.DateTimeType.class, org.hl7.fhir.r4.model.Type.class,
org.hl7.fhir.r5.model.DateTimeType.class, org.hl7.fhir.r5.model.DataType.class,
MILLISECOND_DATE_PRECISION_STRINGS)
).flatMap(i -> i); ).flatMap(i -> i);
} }