diff --git a/src/main/java/com/b2international/fhir/conv/OperationConvertor_40_50.java b/src/main/java/com/b2international/fhir/conv/OperationConvertor_40_50.java index f79bb68..e7b9928 100644 --- a/src/main/java/com/b2international/fhir/conv/OperationConvertor_40_50.java +++ b/src/main/java/com/b2international/fhir/conv/OperationConvertor_40_50.java @@ -15,6 +15,7 @@ */ package com.b2international.fhir.conv; +import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_40_50; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50; import org.hl7.fhir.exceptions.FHIRFormatError; @@ -26,24 +27,26 @@ */ public class OperationConvertor_40_50 { + private static final BaseAdvisor_40_50 IGNORE_NULLS = new BaseAdvisor_40_50(false); + @SuppressWarnings("unchecked") public static final T convertType(org.hl7.fhir.r4.model.Type type) { - return (T) VersionConvertorFactory_40_50.convertType(type); + return (T) VersionConvertorFactory_40_50.convertType(type, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertType(org.hl7.fhir.r5.model.DataType type) { - return (T) VersionConvertorFactory_40_50.convertType(type); + return (T) VersionConvertorFactory_40_50.convertType(type, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertResource(org.hl7.fhir.r4.model.Resource resource) { - return (T) VersionConvertorFactory_40_50.convertResource(resource); + return (T) VersionConvertorFactory_40_50.convertResource(resource, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertResource(org.hl7.fhir.r5.model.Resource resource) { - return (T) VersionConvertorFactory_40_50.convertResource(resource); + return (T) VersionConvertorFactory_40_50.convertResource(resource, IGNORE_NULLS); } ////////////// diff --git a/src/main/java/com/b2international/fhir/conv/OperationConvertor_43_50.java b/src/main/java/com/b2international/fhir/conv/OperationConvertor_43_50.java index 1019ffb..ebb31cc 100644 --- a/src/main/java/com/b2international/fhir/conv/OperationConvertor_43_50.java +++ b/src/main/java/com/b2international/fhir/conv/OperationConvertor_43_50.java @@ -15,6 +15,7 @@ */ package com.b2international.fhir.conv; +import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_43_50; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_43_50; import org.hl7.fhir.exceptions.FHIRFormatError; @@ -26,24 +27,26 @@ */ public class OperationConvertor_43_50 { + private static final BaseAdvisor_43_50 IGNORE_NULLS = new BaseAdvisor_43_50(false); + @SuppressWarnings("unchecked") public static final T convertType(org.hl7.fhir.r4b.model.DataType type) { - return (T) VersionConvertorFactory_43_50.convertType(type); + return (T) VersionConvertorFactory_43_50.convertType(type, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertType(org.hl7.fhir.r5.model.DataType type) { - return (T) VersionConvertorFactory_43_50.convertType(type); + return (T) VersionConvertorFactory_43_50.convertType(type, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertResource(org.hl7.fhir.r4b.model.Resource resource) { - return (T) VersionConvertorFactory_43_50.convertResource(resource); + return (T) VersionConvertorFactory_43_50.convertResource(resource, IGNORE_NULLS); } @SuppressWarnings("unchecked") public static final T convertResource(org.hl7.fhir.r5.model.Resource resource) { - return (T) VersionConvertorFactory_43_50.convertResource(resource); + return (T) VersionConvertorFactory_43_50.convertResource(resource, IGNORE_NULLS); } //////////////