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

improve handling of extensions on coded values in version conversions

This commit is contained in:
Grahame Grieve 2019-09-15 09:58:43 +10:00
parent a2ab96dc47
commit bf07cecfab
21 changed files with 149 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java
View File

@ -937,7 +937,7 @@ public class VersionConvertor_10_30 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName()) {
if (slicePaths.contains(src.getPath()))
tgt.setSliceName(src.getName());
@ -1009,7 +1009,7 @@ public class VersionConvertor_10_30 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
else
@ -1156,7 +1156,7 @@ public class VersionConvertor_10_30 {
else
tgt.setProfile(t.getValue());
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
return tgt;
}
@ -1172,7 +1172,7 @@ public class VersionConvertor_10_30 {
} else if (src.hasProfile())
tgt.addProfile(src.getProfile());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
return tgt;
}
@ -3574,7 +3574,7 @@ public class VersionConvertor_10_30 {
org.hl7.fhir.dstu3.model.Composition.CompositionAttesterComponent tgt = new org.hl7.fhir.dstu3.model.Composition.CompositionAttesterComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.Composition.CompositionAttestationMode> t : src.getMode())
tgt.addMode(convertCompositionAttestationMode(t.getValue()));
copyElement(t, tgt.addModeElement().setValue(convertCompositionAttestationMode(t.getValue())));
tgt.setTime(src.getTime());
tgt.setParty(convertReference(src.getParty()));
return tgt;
@ -3586,7 +3586,7 @@ public class VersionConvertor_10_30 {
org.hl7.fhir.dstu2.model.Composition.CompositionAttesterComponent tgt = new org.hl7.fhir.dstu2.model.Composition.CompositionAttesterComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.Composition.CompositionAttestationMode> t : src.getMode())
tgt.addMode(convertCompositionAttestationMode(t.getValue()));
copyElement(t, tgt.addModeElement().setValue(convertCompositionAttestationMode(t.getValue())));
tgt.setTime(src.getTime());
tgt.setParty(convertReference(src.getParty()));
return tgt;
@ -6973,7 +6973,7 @@ public class VersionConvertor_10_30 {
org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());
@ -6986,7 +6986,7 @@ public class VersionConvertor_10_30 {
org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());

10
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
View File

@ -1005,7 +1005,7 @@ public class VersionConvertor_10_40 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName()) {
if (slicePaths.contains(src.getPath()))
tgt.setSliceName(src.getName());
@ -1085,7 +1085,7 @@ public class VersionConvertor_10_40 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
else
@ -1268,7 +1268,7 @@ public class VersionConvertor_10_40 {
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r4.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregationElement().setValue(a));
}
}
@ -6996,7 +6996,7 @@ public class VersionConvertor_10_40 {
org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());
@ -7009,7 +7009,7 @@ public class VersionConvertor_10_40 {
org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());

10
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
View File

@ -1005,7 +1005,7 @@ public class VersionConvertor_10_50 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName()) {
if (slicePaths.contains(src.getPath()))
tgt.setSliceName(src.getName());
@ -1085,7 +1085,7 @@ public class VersionConvertor_10_50 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
else
@ -1268,7 +1268,7 @@ public class VersionConvertor_10_50 {
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r5.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
}
@ -6996,7 +6996,7 @@ public class VersionConvertor_10_50 {
org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu2.model.Enumeration<org.hl7.fhir.dstu2.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());
@ -7009,7 +7009,7 @@ public class VersionConvertor_10_50 {
org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu2.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
tgt.setAllDay(src.getAllDay());
tgt.setAvailableStartTime(src.getAvailableStartTime());
tgt.setAvailableEndTime(src.getAvailableEndTime());

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java
View File

@ -1199,7 +1199,7 @@ public class VersionConvertor_14_30 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName())
tgt.setSliceName(src.getName());
if (src.hasLabel())
@ -1260,7 +1260,7 @@ public class VersionConvertor_14_30 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
if (src.hasLabel())
@ -1432,7 +1432,7 @@ public class VersionConvertor_14_30 {
tgt.setProfile(t.getValue().toString());
}
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
return tgt;
}
@ -1460,7 +1460,7 @@ public class VersionConvertor_14_30 {
} else
tgt.addProfile(src.getProfile());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
return tgt;
}

10
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
View File

@ -1244,7 +1244,7 @@ public class VersionConvertor_14_40 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName())
tgt.setSliceName(src.getName());
if (src.hasLabel())
@ -1311,7 +1311,7 @@ public class VersionConvertor_14_40 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
if (src.hasLabel())
@ -1522,7 +1522,7 @@ public class VersionConvertor_14_40 {
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r4.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -1560,7 +1560,7 @@ public class VersionConvertor_14_40 {
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.dstu2016may.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -6212,7 +6212,7 @@ public class VersionConvertor_14_40 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())

10
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
View File

@ -1244,7 +1244,7 @@ public class VersionConvertor_14_50 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasName())
tgt.setSliceName(src.getName());
if (src.hasLabel())
@ -1311,7 +1311,7 @@ public class VersionConvertor_14_50 {
copyElement(src, tgt);
tgt.setPath(src.getPath());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setName(src.getSliceName());
if (src.hasLabel())
@ -1523,7 +1523,7 @@ public class VersionConvertor_14_50 {
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r5.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -1558,7 +1558,7 @@ public class VersionConvertor_14_50 {
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.dstu2016may.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregationElement().setValue(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -6210,7 +6210,7 @@ public class VersionConvertor_14_50 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.dstu2016may.model.Enumeration<org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())

46
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
View File

@ -1455,7 +1455,7 @@ public class VersionConvertor_30_40 {
if (src.hasPath())
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceName(src.getSliceName());
if (src.hasLabel())
@ -1533,7 +1533,7 @@ public class VersionConvertor_30_40 {
if (src.hasPath())
tgt.setPath(src.getPath());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceName(src.getSliceName());
if (src.hasLabel())
@ -1777,7 +1777,7 @@ public class VersionConvertor_30_40 {
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r4.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -2347,11 +2347,11 @@ public class VersionConvertor_30_40 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.dstu3.model.TimeType t : src.getTimeOfDay())
tgt.addTimeOfDay(t.getValue());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffset(src.getOffset());
return tgt;
@ -2385,11 +2385,11 @@ public class VersionConvertor_30_40 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.r4.model.TimeType t : src.getTimeOfDay())
tgt.addTimeOfDay(t.getValue());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffset(src.getOffset());
return tgt;
@ -3394,7 +3394,7 @@ public class VersionConvertor_30_40 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())
@ -3432,7 +3432,7 @@ public class VersionConvertor_30_40 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())
@ -4986,7 +4986,7 @@ public class VersionConvertor_30_40 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.dstu3.model.StringType t : src.getSearchInclude())
tgt.addSearchInclude(t.getValue());
for (org.hl7.fhir.dstu3.model.StringType t : src.getSearchRevInclude())
@ -5036,7 +5036,7 @@ public class VersionConvertor_30_40 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.r4.model.StringType t : src.getSearchInclude())
tgt.addSearchInclude(t.getValue());
for (org.hl7.fhir.r4.model.StringType t : src.getSearchRevInclude())
@ -7050,7 +7050,7 @@ public class VersionConvertor_30_40 {
if (src.hasDescription())
tgt.setDescription(src.getDescription());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValue(src.getValue());
return tgt;
@ -7066,7 +7066,7 @@ public class VersionConvertor_30_40 {
if (src.hasDescription())
tgt.setDescription(src.getDescription());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValue(src.getValue());
return tgt;
@ -12338,7 +12338,7 @@ public class VersionConvertor_30_40 {
org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -12354,7 +12354,7 @@ public class VersionConvertor_30_40 {
org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -16661,7 +16661,7 @@ public class VersionConvertor_30_40 {
org.hl7.fhir.r4.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.r4.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -16677,7 +16677,7 @@ public class VersionConvertor_30_40 {
org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -18276,9 +18276,9 @@ public class VersionConvertor_30_40 {
for (org.hl7.fhir.dstu3.model.CodeType t : src.getTarget())
tgt.addTarget(t.getValue());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.addModifier(convertSearchModifierCode(t.getValue()));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.dstu3.model.StringType t : src.getChain())
tgt.addChain(t.getValue());
for (org.hl7.fhir.dstu3.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -18332,9 +18332,9 @@ public class VersionConvertor_30_40 {
for (org.hl7.fhir.r4.model.CodeType t : src.getTarget())
tgt.addTarget(t.getValue());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.addModifier(convertSearchModifierCode(t.getValue()));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.r4.model.StringType t : src.getChain())
tgt.addChain(t.getValue());
for (org.hl7.fhir.r4.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -19760,7 +19760,7 @@ public class VersionConvertor_30_40 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())
@ -19784,7 +19784,7 @@ public class VersionConvertor_30_40 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())

46
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
View File

@ -1424,7 +1424,7 @@ public class VersionConvertor_30_50 {
if (src.hasPath())
tgt.setPath(src.getPath());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceName(src.getSliceName());
if (src.hasLabel())
@ -1502,7 +1502,7 @@ public class VersionConvertor_30_50 {
if (src.hasPath())
tgt.setPath(src.getPath());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceName(src.getSliceName());
if (src.hasLabel())
@ -1753,7 +1753,7 @@ public class VersionConvertor_30_50 {
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.ElementDefinition.AggregationMode> t : src.getAggregation()) {
org.hl7.fhir.r5.model.ElementDefinition.AggregationMode a = convertAggregationMode(t.getValue());
if (!tgt.hasAggregation(a))
tgt.addAggregation(a);
copyElement(t, tgt.addAggregation(a));
}
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
@ -2323,11 +2323,11 @@ public class VersionConvertor_30_50 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.dstu3.model.TimeType t : src.getTimeOfDay())
tgt.addTimeOfDay(t.getValue());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffset(src.getOffset());
return tgt;
@ -2361,11 +2361,11 @@ public class VersionConvertor_30_50 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.r5.model.TimeType t : src.getTimeOfDay())
tgt.addTimeOfDay(t.getValue());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffset(src.getOffset());
return tgt;
@ -3394,7 +3394,7 @@ public class VersionConvertor_30_50 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())
@ -3432,7 +3432,7 @@ public class VersionConvertor_30_50 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())
@ -4986,7 +4986,7 @@ public class VersionConvertor_30_50 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.dstu3.model.StringType t : src.getSearchInclude())
tgt.addSearchInclude(t.getValue());
for (org.hl7.fhir.dstu3.model.StringType t : src.getSearchRevInclude())
@ -5036,7 +5036,7 @@ public class VersionConvertor_30_50 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.r5.model.StringType t : src.getSearchInclude())
tgt.addSearchInclude(t.getValue());
for (org.hl7.fhir.r5.model.StringType t : src.getSearchRevInclude())
@ -7050,7 +7050,7 @@ public class VersionConvertor_30_50 {
if (src.hasDescription())
tgt.setDescription(src.getDescription());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValue(src.getValue());
return tgt;
@ -7066,7 +7066,7 @@ public class VersionConvertor_30_50 {
if (src.hasDescription())
tgt.setDescription(src.getDescription());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValue(src.getValue());
return tgt;
@ -12279,7 +12279,7 @@ public class VersionConvertor_30_50 {
org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -12295,7 +12295,7 @@ public class VersionConvertor_30_50 {
org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.dstu3.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -16602,7 +16602,7 @@ public class VersionConvertor_30_50 {
org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -16618,7 +16618,7 @@ public class VersionConvertor_30_50 {
org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.dstu3.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDay(src.getAllDay());
if (src.hasAvailableStartTime())
@ -17614,9 +17614,9 @@ public class VersionConvertor_30_50 {
for (org.hl7.fhir.dstu3.model.CodeType t : src.getTarget())
tgt.addTarget(t.getValue());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.addModifier(convertSearchModifierCode(t.getValue()));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.dstu3.model.StringType t : src.getChain())
tgt.addChain(t.getValue());
for (org.hl7.fhir.dstu3.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -17670,9 +17670,9 @@ public class VersionConvertor_30_50 {
for (org.hl7.fhir.r5.model.CodeType t : src.getTarget())
tgt.addTarget(t.getValue());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.addModifier(convertSearchModifierCode(t.getValue()));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.r5.model.StringType t : src.getChain())
tgt.addChain(t.getValue());
for (org.hl7.fhir.r5.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -19098,7 +19098,7 @@ public class VersionConvertor_30_50 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.dstu3.model.Enumeration<org.hl7.fhir.dstu3.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())
@ -19122,7 +19122,7 @@ public class VersionConvertor_30_50 {
if (src.hasVariable())
tgt.setVariable(src.getVariable());
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleId(src.getListRuleId());
if (src.hasTransform())

16
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
View File

@ -2106,11 +2106,11 @@ public class VersionConvertor_40_50 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.r4.model.TimeType t : src.getTimeOfDay())
tgt.getTimeOfDay().add(convertTime(t));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffsetElement(convertUnsignedInt(src.getOffsetElement()));
return tgt;
@ -2144,11 +2144,11 @@ public class VersionConvertor_40_50 {
if (src.hasPeriodUnit())
tgt.setPeriodUnit(convertUnitsOfTime(src.getPeriodUnit()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Timing.DayOfWeek> t : src.getDayOfWeek())
tgt.addDayOfWeek(convertDayOfWeek(t.getValue()));
copyElement(t, tgt.addDayOfWeekElement().setValue(convertDayOfWeek(t.getValue())));
for (org.hl7.fhir.r5.model.TimeType t : src.getTimeOfDay())
tgt.getTimeOfDay().add(convertTime(t));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Timing.EventTiming> t : src.getWhen())
tgt.addWhen(convertEventTiming(t.getValue()));
copyElement(t, tgt.addWhenElement().setValue(convertEventTiming(t.getValue())));
if (src.hasOffset())
tgt.setOffsetElement(convertUnsignedInt(src.getOffsetElement()));
return tgt;
@ -2382,7 +2382,7 @@ public class VersionConvertor_40_50 {
if (src.hasPath())
tgt.setPathElement(convertString(src.getPathElement()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceNameElement(convertString(src.getSliceNameElement()));
if (src.hasSliceIsConstraining())
@ -2458,7 +2458,7 @@ public class VersionConvertor_40_50 {
if (src.hasPath())
tgt.setPathElement(convertString(src.getPathElement()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.PropertyRepresentation> t : src.getRepresentation())
tgt.addRepresentation(convertPropertyRepresentation(t.getValue()));
copyElement(t, tgt.addRepresentationElement().setValue(convertPropertyRepresentation(t.getValue())));
if (src.hasSliceName())
tgt.setSliceNameElement(convertString(src.getSliceNameElement()));
if (src.hasSliceIsConstraining())
@ -2696,7 +2696,7 @@ public class VersionConvertor_40_50 {
for (org.hl7.fhir.r4.model.CanonicalType t : src.getTargetProfile())
tgt.getTargetProfile().add(convertCanonical(t));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
return tgt;
@ -2714,7 +2714,7 @@ public class VersionConvertor_40_50 {
for (org.hl7.fhir.r5.model.CanonicalType t : src.getTargetProfile())
tgt.getTargetProfile().add(convertCanonical(t));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ElementDefinition.AggregationMode> t : src.getAggregation())
tgt.addAggregation(convertAggregationMode(t.getValue()));
copyElement(t, tgt.addAggregationElement().setValue(convertAggregationMode(t.getValue())));
if (src.hasVersioning())
tgt.setVersioning(convertReferenceVersionRules(src.getVersioning()));
return tgt;

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance.java
View File

@ -74,7 +74,7 @@ public class AllergyIntolerance extends VersionConvertor_40_50 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())
@ -114,7 +114,7 @@ public class AllergyIntolerance extends VersionConvertor_40_50 {
if (src.hasType())
tgt.setType(convertAllergyIntoleranceType(src.getType()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.AllergyIntolerance.AllergyIntoleranceCategory> t : src.getCategory())
tgt.addCategory(convertAllergyIntoleranceCategory(t.getValue()));
copyElement(t, tgt.addCategoryElement().setValue(convertAllergyIntoleranceCategory(t.getValue())));
if (src.hasCriticality())
tgt.setCriticality(convertAllergyIntoleranceCriticality(src.getCriticality()));
if (src.hasCode())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement.java
View File

@ -384,7 +384,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.r4.model.StringType t : src.getSearchInclude())
tgt.getSearchInclude().add(convertString(t));
for (org.hl7.fhir.r4.model.StringType t : src.getSearchRevInclude())
@ -426,7 +426,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 {
if (src.hasConditionalDelete())
tgt.setConditionalDelete(convertConditionalDeleteStatus(src.getConditionalDelete()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CapabilityStatement.ReferenceHandlingPolicy> t : src.getReferencePolicy())
tgt.addReferencePolicy(convertReferenceHandlingPolicy(t.getValue()));
copyElement(t, tgt.addReferencePolicyElement().setValue(convertReferenceHandlingPolicy(t.getValue())));
for (org.hl7.fhir.r5.model.StringType t : src.getSearchInclude())
tgt.getSearchInclude().add(convertString(t));
for (org.hl7.fhir.r5.model.StringType t : src.getSearchRevInclude())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem.java
View File

@ -240,7 +240,7 @@ public class CodeSystem extends VersionConvertor_40_50 {
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValueElement(convertString(src.getValueElement()));
return tgt;
@ -256,7 +256,7 @@ public class CodeSystem extends VersionConvertor_40_50 {
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CodeSystem.FilterOperator> t : src.getOperator())
tgt.addOperator(convertFilterOperator(t.getValue()));
copyElement(t, tgt.addOperatorElement().setValue(convertFilterOperator(t.getValue())));
if (src.hasValue())
tgt.setValueElement(convertString(src.getValueElement()));
return tgt;

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest.java
View File

@ -72,7 +72,7 @@ public class CoverageEligibilityRequest extends VersionConvertor_40_50 {
if (src.hasPriority())
tgt.setPriority(convertCodeableConcept(src.getPriority()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CoverageEligibilityRequest.EligibilityRequestPurpose> t : src.getPurpose())
tgt.addPurpose(convertEligibilityRequestPurpose(t.getValue()));
copyElement(t, tgt.addPurposeElement().setValue(convertEligibilityRequestPurpose(t.getValue())));
if (src.hasPatient())
tgt.setPatient(convertReference(src.getPatient()));
if (src.hasServiced())
@ -108,7 +108,7 @@ public class CoverageEligibilityRequest extends VersionConvertor_40_50 {
if (src.hasPriority())
tgt.setPriority(convertCodeableConcept(src.getPriority()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CoverageEligibilityRequest.EligibilityRequestPurpose> t : src.getPurpose())
tgt.addPurpose(convertEligibilityRequestPurpose(t.getValue()));
copyElement(t, tgt.addPurposeElement().setValue(convertEligibilityRequestPurpose(t.getValue())));
if (src.hasPatient())
tgt.setPatient(convertReference(src.getPatient()));
if (src.hasServiced())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse.java
View File

@ -70,7 +70,7 @@ public class CoverageEligibilityResponse extends VersionConvertor_40_50 {
if (src.hasStatus())
tgt.setStatus(convertEligibilityResponseStatus(src.getStatus()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose> t : src.getPurpose())
tgt.addPurpose(convertEligibilityResponsePurpose(t.getValue()));
copyElement(t, tgt.addPurposeElement().setValue(convertEligibilityResponsePurpose(t.getValue())));
if (src.hasPatient())
tgt.setPatient(convertReference(src.getPatient()));
if (src.hasServiced())
@ -108,7 +108,7 @@ public class CoverageEligibilityResponse extends VersionConvertor_40_50 {
if (src.hasStatus())
tgt.setStatus(convertEligibilityResponseStatus(src.getStatus()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose> t : src.getPurpose())
tgt.addPurpose(convertEligibilityResponsePurpose(t.getValue()));
copyElement(t, tgt.addPurposeElement().setValue(convertEligibilityResponsePurpose(t.getValue())));
if (src.hasPatient())
tgt.setPatient(convertReference(src.getPatient()));
if (src.hasServiced())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService.java
View File

@ -202,7 +202,7 @@ public class HealthcareService extends VersionConvertor_40_50 {
org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r5.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasAvailableStartTime())
@ -218,7 +218,7 @@ public class HealthcareService extends VersionConvertor_40_50 {
org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent tgt = new org.hl7.fhir.r4.model.HealthcareService.HealthcareServiceAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.HealthcareService.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasAvailableStartTime())

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide.java
View File

@ -96,7 +96,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 {
if (src.hasLicense())
tgt.setLicense(convertSPDXLicense(src.getLicense()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Enumerations.FHIRVersion> t : src.getFhirVersion())
tgt.addFhirVersion(Enumerations.convertFHIRVersion(t.getValue()));
copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue())));
for (org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDependsOnComponent t : src.getDependsOn())
tgt.addDependsOn(convertImplementationGuideDependsOnComponent(t));
for (org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideGlobalComponent t : src.getGlobal())
@ -144,7 +144,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 {
if (src.hasLicense())
tgt.setLicense(convertSPDXLicense(src.getLicense()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Enumerations.FHIRVersion> t : src.getFhirVersion())
tgt.addFhirVersion(Enumerations.convertFHIRVersion(t.getValue()));
copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue())));
for (org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent t : src.getDependsOn())
tgt.addDependsOn(convertImplementationGuideDependsOnComponent(t));
for (org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideGlobalComponent t : src.getGlobal())
@ -984,7 +984,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 {
if (src.hasReference())
tgt.setReference(convertReference(src.getReference()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Enumerations.FHIRVersion> t : src.getFhirVersion())
tgt.addFhirVersion(Enumerations.convertFHIRVersion(t.getValue()));
copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue())));
if (src.hasName())
tgt.setNameElement(convertString(src.getNameElement()));
if (src.hasDescription())
@ -1004,7 +1004,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 {
if (src.hasReference())
tgt.setReference(convertReference(src.getReference()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Enumerations.FHIRVersion> t : src.getFhirVersion())
tgt.addFhirVersion(Enumerations.convertFHIRVersion(t.getValue()));
copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue())));
if (src.hasName())
tgt.setNameElement(convertString(src.getNameElement()));
if (src.hasDescription())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location.java
View File

@ -220,7 +220,7 @@ public class Location extends VersionConvertor_40_50 {
org.hl7.fhir.r5.model.Location.LocationHoursOfOperationComponent tgt = new org.hl7.fhir.r5.model.Location.LocationHoursOfOperationComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.Location.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasOpeningTime())
@ -236,7 +236,7 @@ public class Location extends VersionConvertor_40_50 {
org.hl7.fhir.r4.model.Location.LocationHoursOfOperationComponent tgt = new org.hl7.fhir.r4.model.Location.LocationHoursOfOperationComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.Location.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasOpeningTime())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition.java
View File

@ -72,7 +72,7 @@ public class ObservationDefinition extends VersionConvertor_40_50 {
for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier())
tgt.addIdentifier(convertIdentifier(t));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.ObservationDefinition.ObservationDataType> t : src.getPermittedDataType())
tgt.addPermittedDataType(convertObservationDataType(t.getValue()));
copyElement(t, tgt.addPermittedDataTypeElement().setValue(convertObservationDataType(t.getValue())));
if (src.hasMultipleResultsAllowed())
tgt.setMultipleResultsAllowedElement(convertBoolean(src.getMultipleResultsAllowedElement()));
if (src.hasMethod())
@ -106,7 +106,7 @@ public class ObservationDefinition extends VersionConvertor_40_50 {
for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier())
tgt.addIdentifier(convertIdentifier(t));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.ObservationDefinition.ObservationDataType> t : src.getPermittedDataType())
tgt.addPermittedDataType(convertObservationDataType(t.getValue()));
copyElement(t, tgt.addPermittedDataTypeElement().setValue(convertObservationDataType(t.getValue())));
if (src.hasMultipleResultsAllowed())
tgt.setMultipleResultsAllowedElement(convertBoolean(src.getMultipleResultsAllowedElement()));
if (src.hasMethod())

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole.java
View File

@ -138,7 +138,7 @@ public class PractitionerRole extends VersionConvertor_40_50 {
org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.r5.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasAvailableStartTime())
@ -154,7 +154,7 @@ public class PractitionerRole extends VersionConvertor_40_50 {
org.hl7.fhir.r4.model.PractitionerRole.PractitionerRoleAvailableTimeComponent tgt = new org.hl7.fhir.r4.model.PractitionerRole.PractitionerRoleAvailableTimeComponent();
copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.PractitionerRole.DaysOfWeek> t : src.getDaysOfWeek())
tgt.addDaysOfWeek(convertDaysOfWeek(t.getValue()));
copyElement(t, tgt.addDaysOfWeekElement().setValue(convertDaysOfWeek(t.getValue())));
if (src.hasAllDay())
tgt.setAllDayElement(convertBoolean(src.getAllDayElement()));
if (src.hasAvailableStartTime())

86
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter.java
View File

@ -110,9 +110,9 @@ public class SearchParameter extends VersionConvertor_40_50 {
if (src.hasMultipleAnd())
tgt.setMultipleAndElement(convertBoolean(src.getMultipleAndElement()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.getModifier().add(convertSearchModifierCode(t));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.r4.model.StringType t : src.getChain())
tgt.getChain().add(convertString(t));
for (org.hl7.fhir.r4.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -170,9 +170,9 @@ public class SearchParameter extends VersionConvertor_40_50 {
if (src.hasMultipleAnd())
tgt.setMultipleAndElement(convertBoolean(src.getMultipleAndElement()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchComparator> t : src.getComparator())
tgt.addComparator(convertSearchComparator(t.getValue()));
copyElement(t, tgt.addComparatorElement().setValue(convertSearchComparator(t.getValue())));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode> t : src.getModifier())
tgt.getModifier().add(convertSearchModifierCode(t));
copyElement(t, tgt.addModifierElement().setValue(convertSearchModifierCode(t.getValue())));
for (org.hl7.fhir.r5.model.StringType t : src.getChain())
tgt.getChain().add(convertString(t));
for (org.hl7.fhir.r5.model.SearchParameter.SearchParameterComponentComponent t : src.getComponent())
@ -238,56 +238,46 @@ public class SearchParameter extends VersionConvertor_40_50 {
case AP: return org.hl7.fhir.r4.model.SearchParameter.SearchComparator.AP;
default: return org.hl7.fhir.r4.model.SearchParameter.SearchComparator.NULL;
}
}
public static org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode> convertSearchModifierCode(org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode> src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode> tgt = new org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode>(new org.hl7.fhir.r5.model.SearchParameter.SearchModifierCodeEnumFactory());
copyEnumeration(src, tgt);
if (src.hasValue()) {
switch (src.getValue()) {
case MISSING: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.MISSING); break;
case EXACT: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.EXACT); break;
case CONTAINS: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.CONTAINS); break;
case NOT: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NOT); break;
case TEXT: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.TEXT); break;
case IN: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.IN); break;
case NOTIN: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NOTIN); break;
case BELOW: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.BELOW); break;
case ABOVE: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.ABOVE); break;
case TYPE: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.TYPE); break;
case IDENTIFIER: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.IDENTIFIER); break;
case OFTYPE: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.OFTYPE); break;
default: tgt.setValue(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NULL); break;
}
}
return tgt;
}
public static org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode> convertSearchModifierCode(org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode> src) throws FHIRException {
public static org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode convertSearchModifierCode(org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode> tgt = new org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode>(new org.hl7.fhir.r4.model.SearchParameter.SearchModifierCodeEnumFactory());
copyEnumeration(src, tgt);
if (src.hasValue()) {
switch (src.getValue()) {
case MISSING: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.MISSING); break;
case EXACT: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.EXACT); break;
case CONTAINS: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.CONTAINS); break;
case NOT: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NOT); break;
case TEXT: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.TEXT); break;
case IN: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.IN); break;
case NOTIN: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NOTIN); break;
case BELOW: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.BELOW); break;
case ABOVE: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.ABOVE); break;
case TYPE: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.TYPE); break;
case IDENTIFIER: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.IDENTIFIER); break;
case OFTYPE: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.OFTYPE); break;
default: tgt.setValue( org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NULL); break;
switch (src) {
case MISSING: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.MISSING;
case EXACT: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.EXACT;
case CONTAINS: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.CONTAINS;
case NOT: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NOT;
case TEXT: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.TEXT;
case IN: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.IN;
case NOTIN: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NOTIN;
case BELOW: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.BELOW;
case ABOVE: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.ABOVE;
case TYPE: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.TYPE;
case IDENTIFIER: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.IDENTIFIER;
case OFTYPE: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.OFTYPE;
default: return org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode.NULL;
}
}
return tgt;
public static org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode convertSearchModifierCode(org.hl7.fhir.r5.model.SearchParameter.SearchModifierCode src) throws FHIRException {
if (src == null)
return null;
switch (src) {
case MISSING: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.MISSING;
case EXACT: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.EXACT;
case CONTAINS: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.CONTAINS;
case NOT: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NOT;
case TEXT: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.TEXT;
case IN: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.IN;
case NOTIN: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NOTIN;
case BELOW: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.BELOW;
case ABOVE: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.ABOVE;
case TYPE: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.TYPE;
case IDENTIFIER: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.IDENTIFIER;
case OFTYPE: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.OFTYPE;
default: return org.hl7.fhir.r4.model.SearchParameter.SearchModifierCode.NULL;
}
}
public static org.hl7.fhir.r5.model.SearchParameter.SearchParameterComponentComponent convertSearchParameterComponentComponent(org.hl7.fhir.r4.model.SearchParameter.SearchParameterComponentComponent src) throws FHIRException {

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap.java
View File

@ -458,7 +458,7 @@ public class StructureMap extends VersionConvertor_40_50 {
if (src.hasVariable())
tgt.setVariableElement(convertId(src.getVariableElement()));
for (org.hl7.fhir.r4.model.Enumeration<org.hl7.fhir.r4.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleIdElement(convertId(src.getListRuleIdElement()));
if (src.hasTransform())
@ -482,7 +482,7 @@ public class StructureMap extends VersionConvertor_40_50 {
if (src.hasVariable())
tgt.setVariableElement(convertId(src.getVariableElement()));
for (org.hl7.fhir.r5.model.Enumeration<org.hl7.fhir.r5.model.StructureMap.StructureMapTargetListMode> t : src.getListMode())
tgt.addListMode(convertStructureMapTargetListMode(t.getValue()));
copyElement(t, tgt.addListModeElement().setValue(convertStructureMapTargetListMode(t.getValue())));
if (src.hasListRuleId())
tgt.setListRuleIdElement(convertId(src.getListRuleIdElement()));
if (src.hasTransform())