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

Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core

This commit is contained in:
James Agnew 2019-09-15 08:30:21 -04:00
parent 9d203b111c 2489588d55
commit a684fffcf3
308 changed files with 1364 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -294,3 +294,4 @@ local.properties
/org.hl7.fhir.r4b
/org.hl7.fhir.r5/src/test/resources/gen/gen.xml
/org.hl7.fhir.r5/src/test/resources/graphql/*.out
/org.hl7.fhir.validation/src/test/resources/comparison/output

2
org.hl7.fhir.convertors/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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())

88
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())
@ -237,57 +237,47 @@ public class SearchParameter extends VersionConvertor_40_50 {
case EB: return org.hl7.fhir.r4.model.SearchParameter.SearchComparator.EB;
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;
}
}
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;
}
return tgt;
}
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())

2
org.hl7.fhir.dstu2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2016may/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r4/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r5/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

12
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/CapabilityStatementUtilities.java
View File

@ -117,9 +117,11 @@ public class CapabilityStatementUtilities {
this.context = context;
this.folder = folder;
this.keygen = keygen;
String f = Utilities.path(folder, "comparison.zip");
download("http://fhir.org/archive/comparison.zip", f);
unzip(f, folder);
if (!new File(Utilities.path(folder, "conparison-zip-marker.bin")).exists()) {
String f = Utilities.path(folder, "comparison.zip");
download("https://www.fhir.org/archive/comparison.zip", f);
unzip(f, folder);
}
}
/**
@ -440,7 +442,7 @@ public class CapabilityStatementUtilities {
union.setProfile(sdL.getUrl());
} else if (folder != null) {
try {
ProfileComparer pc = new ProfileComparer(context, keygen);
ProfileComparer pc = new ProfileComparer(context, keygen, folder);
pc.setId("api-ep."+type);
pc.setTitle("Comparison - "+selfName+" vs "+otherName);
pc.setLeftName(selfName+": "+sdL.present());
@ -449,7 +451,7 @@ public class CapabilityStatementUtilities {
pc.setRightLink(sdR.getUserString("path"));
pc.compareProfiles(sdL, sdR);
System.out.println("Generate Comparison between "+pc.getLeftName()+" and "+pc.getRightName());
pc.generate(folder);
pc.generate();
for (ProfileComparison cmp : pc.getComparisons()) {
new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(folder, cmp.getSubset().fhirType()+"-"+cmp.getSubset().getId()+".xml")), cmp.getSubset());

117
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileComparer.java
View File

@ -1,5 +1,7 @@
package org.hl7.fhir.r5.conformance;
import java.io.BufferedOutputStream;
/*-
* #%L
* org.hl7.fhir.r5
@ -22,7 +24,11 @@ package org.hl7.fhir.r5.conformance;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
@ -32,7 +38,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.hl7.fhir.exceptions.DefinitionException;
import org.hl7.fhir.exceptions.FHIRException;
@ -100,16 +107,98 @@ public class ProfileComparer implements ProfileKnowledgeProvider {
private IWorkerContext context;
private KeyGenerator keygen;
private String folder;
public ProfileComparer(IWorkerContext context, KeyGenerator keygen) {
public ProfileComparer(IWorkerContext context, KeyGenerator keygen, String folder) throws IOException {
super();
this.context = context;
this.keygen = keygen;
this.folder = folder;
if (!new File(Utilities.path(folder, "conparison-zip-marker.bin")).exists()) {
String f = Utilities.path(folder, "comparison.zip");
download("https://www.fhir.org/archive/comparison.zip", f);
unzip(f, folder);
}
}
public ProfileComparer(IWorkerContext context) {
private void download(String address, String filename) throws IOException {
System.out.print("Download "+address+" to "+filename);
URL url = new URL(address);
URLConnection c = url.openConnection();
InputStream s = c.getInputStream();
FileOutputStream f = new FileOutputStream(filename);
transfer(s, f, 1024);
f.close();
System.out.println(" ... "+new File(filename).length()+" bytes");
}
public static void transfer(InputStream in, OutputStream out, int buffer) throws IOException {
byte[] read = new byte[buffer]; // Your buffer size.
while (0 < (buffer = in.read(read)))
out.write(read, 0, buffer);
}
/**
* Size of the buffer to read/write data
*/
private static final int BUFFER_SIZE = 4096;
/**
* Extracts a zip file specified by the zipFilePath to a directory specified by
* destDirectory (will be created if does not exists)
* @param zipFilePath
* @param destDirectory
* @throws IOException
*/
public void unzip(String zipFilePath, String destDirectory) throws IOException {
File destDir = new File(destDirectory);
if (!destDir.exists()) {
destDir.mkdir();
}
ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath));
ZipEntry entry = zipIn.getNextEntry();
// iterates over entries in the zip file
while (entry != null) {
String filePath = destDirectory + File.separator + entry.getName();
if (!entry.isDirectory()) {
// if the entry is a file, extracts it
extractFile(zipIn, filePath);
} else {
// if the entry is a directory, make the directory
File dir = new File(filePath);
dir.mkdir();
}
zipIn.closeEntry();
entry = zipIn.getNextEntry();
}
zipIn.close();
}
/**
* Extracts a zip entry (file entry)
* @param zipIn
* @param filePath
* @throws IOException
*/
private void extractFile(ZipInputStream zipIn, String filePath) throws IOException {
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath));
byte[] bytesIn = new byte[BUFFER_SIZE];
int read = 0;
while ((read = zipIn.read(bytesIn)) != -1) {
bos.write(bytesIn, 0, read);
}
bos.close();
}
public ProfileComparer(IWorkerContext context, String folder) throws IOException {
super();
this.context = context;
this.folder = folder;
if (!new File(Utilities.path(folder, "conparison-zip-marker.bin")).exists()) {
String f = Utilities.path(folder, "comparison.zip");
download("https://www.fhir.org/archive/comparison.zip", f);
unzip(f, folder);
}
}
private static final int BOTH_NULL = 0;
@ -1431,9 +1520,9 @@ public class ProfileComparer implements ProfileKnowledgeProvider {
}
public String generate(String dest) throws IOException {
public String generate() throws IOException {
for (ValueSet vs : valuesets) {
vs.setUserData("path", dest+"/"+getId()+"-vs-"+vs.getId()+".html");
vs.setUserData("path", folder+"/"+getId()+"-vs-"+vs.getId()+".html");
}
// ok, all compared; now produce the output
// first page we produce is simply the index
@ -1442,8 +1531,8 @@ public class ProfileComparer implements ProfileKnowledgeProvider {
vars.put("left", genPCLink(getLeftName(), getLeftLink()));
vars.put("right", genPCLink(getRightName(), getRightLink()));
vars.put("table", genPCTable());
vars.put("valuesets", genValueSets(dest+"/"+getId()+"-vs"));
producePage(summaryTemplate(), Utilities.path(dest, getId()+".html"), vars);
vars.put("valuesets", genValueSets(folder+"/"+getId()+"-vs"));
producePage(summaryTemplate(), Utilities.path(folder, getId()+".html"), vars);
System.out.println(" .. profiles");
// then we produce a comparison page for each pair
@ -1453,15 +1542,15 @@ public class ProfileComparer implements ProfileKnowledgeProvider {
vars.put("left", genPCLink(getLeftName(), getLeftLink()));
vars.put("right", genPCLink(getRightName(), getRightLink()));
vars.put("messages", genCmpMessages(cmp));
vars.put("subset", genCompModel(cmp.getSubset(), "intersection", getId()+"."+cmp.getId(), "", dest));
vars.put("superset", genCompModel(cmp.getSuperset(), "union", getId()+"."+cmp.getId(), "", dest));
producePage(singleTemplate(), Utilities.path(dest, getId()+"."+cmp.getId()+".html"), vars);
vars.put("subset", genCompModel(cmp.getSubset(), "intersection", getId()+"."+cmp.getId(), "", folder));
vars.put("superset", genCompModel(cmp.getSuperset(), "union", getId()+"."+cmp.getId(), "", folder));
producePage(singleTemplate(), Utilities.path(folder, getId()+"."+cmp.getId()+".html"), vars);
}
// // and also individual pages for each pair outcome
// // then we produce value set pages for each value set
//
// // TODO Auto-generated method stub
return Utilities.path(dest, getId()+".html");
return Utilities.path(folder, getId()+".html");
}
@ -1480,13 +1569,11 @@ public class ProfileComparer implements ProfileKnowledgeProvider {
}
private String summaryTemplate() throws IOException {
return TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\source\\template-comparison-set.html");
// return cachedFetch("04a9d69a-47f2-4250-8645-bf5d880a8eaa-1.fhir-template", "http://build.fhir.org/template-comparison-set.html.template");
return TextFile.fileToString(Utilities.path(folder, "template-comparison-set.html"));
}
private String singleTemplate() throws IOException {
return TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\source\\template-comparison.html");
// return cachedFetch("04a9d69a-47f2-4250-8645-bf5d880a8eaa-1.fhir-template", "http://build.fhir.org/template-comparison-set.html.template");
return TextFile.fileToString(Utilities.path(folder, "template-comparison.html"));
}
private String cachedFetch(String id, String source) throws IOException {

13
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseDateTimeType.java
View File

@ -872,16 +872,23 @@ public abstract class BaseDateTimeType extends PrimitiveType<Date> {
FastDateFormat df = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS");
String ms = df.format(this.getValue());
String os = df.format(theOther.getValue());
if (!sub(ms, cp.stringLength()).equals(sub(os, cp.stringLength())))
if (!sub(ms, cp.stringLength()).equals(sub(os, cp.stringLength()))) {
System.out.println(" ms = "+ms+", os = "+os+", return false");
return false;
if (mp != op)
}
if (mp != op) {
System.out.println(" ms = "+ms+", os = "+os+", return null");
return null;
}
if (this.myPrecision == TemporalPrecisionEnum.MILLI || theOther.myPrecision == TemporalPrecisionEnum.MILLI) {
float mf = Float.parseFloat(ms.substring(17));
float of = Float.parseFloat(os.substring(17));
if (mf != of)
if (mf != of) {
System.out.println(" ms = "+ms+", os = "+os+", return false");
return false;
}
}
System.out.println(" ms = "+ms+", os = "+os+", return true");
return true;
}

11
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/model/BaseDateTimeTypeTest.java
View File

@ -52,8 +52,8 @@ public class BaseDateTimeTypeTest {
// FHIRPath tests:
assertNull( compareDateTimes("1974-12-25", "1974-12-25T12:34:00+10:00"));
assertNull( compareDateTimes("1974-12-25T12:34:00+10:00", "1974-12-25"));
assertFalse(compareDateTimes("1974-12-25", "1974-12-25T12:34:00-10:00"));
assertFalse(compareDateTimes("1974-12-25T12:34:00-10:00", "1974-12-25"));
assertFalse(compareDateTimes("1974-12-25", "1974-12-23T12:34:00+10:00")); // false because they can't be the same date irrespective of precision
assertFalse(compareDateTimes("1974-12-23T12:34:00+10:00", "1974-12-25"));
assertNull( compareDateTimes("1974-12-25", "1974-12-25T12:34:00Z"));
assertNull( compareDateTimes("1974-12-25T12:34:00Z", "1974-12-25"));
assertFalse(compareDateTimes("2012-04-15", "2012-04-16"));
@ -79,9 +79,10 @@ public class BaseDateTimeTypeTest {
}
private Boolean compareDateTimes(String theLeft, String theRight) {
DateTimeType leftDt = new DateTimeType(theLeft);
DateTimeType rightDt = new DateTimeType(theRight);
return leftDt.equalsUsingFhirPathRules(rightDt);
System.out.println("Compare "+theLeft+" to "+theRight);
DateTimeType leftDt = new DateTimeType(theLeft);
DateTimeType rightDt = new DateTimeType(theRight);
return leftDt.equalsUsingFhirPathRules(rightDt);
}
}

2
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/LiquidEngineTests.java
View File

@ -76,7 +76,7 @@ public class LiquidEngineTests implements ILiquidEngineIcludeResolver {
private Resource loadResource() throws IOException, FHIRFormatError {
String name = test.get("focus").getAsString();
if (!resources.containsKey(name)) {
String fn = TestingUtilities.resourceNameToFile(name.replace("/", "-")+".xml");
String fn = TestingUtilities.resourceNameToFile((name.replace("/", "-")+".xml").toLowerCase());
resources.put(name, new XmlParser().parse(new FileInputStream(fn)));
}
return resources.get(test.get("focus").getAsString());

2
org.hl7.fhir.r5/src/test/resources/fhirpath/tests-fhir-r4.xml
View File

@ -231,7 +231,7 @@
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate = @1974-12-25</expression><output type="boolean">true</output></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @1974-12-25T12:34:00</expression></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @1974-12-25T12:34:00-10:00</expression><output type="boolean">true</output></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @1974-12-23T12:34:00-10:00</expression><output type="boolean">true</output></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @1974-12-25T12:34:00+10:00</expression></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @1974-12-25T12:34:00Z</expression></test>
<test name="testLiteralDate" inputfile="patient-example.xml"><expression>Patient.birthDate != @T12:14:15</expression><output type="boolean">true</output></test>

41
org.hl7.fhir.r5/src/test/resources/snapshot-generation/t23a-input.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="t23"/>
<url value="urn:uuid:2e28117d-bb6f-4d8e-9ccd-5472535cc2d6"/>
<name value="t23"/>
<status value="draft"/>
<description value="fixture for #23: Test Slicing - unsorted differential"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Patient"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Patient"/>
<derivation value="constraint"/>
<differential>
<element>
<path value="Patient"/>
</element>
<element>
<path value="Patient.contact"/>
<slicing>
<discriminator>
<type value="value"/>
<path value="gender"/>
</discriminator>
<rules value="open"/>
</slicing>
</element>
<element>
<path value="Patient.contact"/>
<sliceName value="males"/>
</element>
<element>
<path value="Patient.contact.gender"/>
<fixedCode value="male"/>
</element>
<element>
<path value="Patient.contact.telecom"/>
<min value="1"/>
</element>
</differential>
</StructureDefinition>

2
org.hl7.fhir.utilities/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>4.0.15-SNAPSHOT</version>
<version>4.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java
View File

@ -296,12 +296,12 @@ public class Validator {
if (resLeft != null && resRight != null) {
if (resLeft instanceof StructureDefinition && resRight instanceof StructureDefinition) {
System.out.println("Comparing StructureDefinitions "+left+" to "+right);
ProfileComparer pc = new ProfileComparer(validator.getContext());
ProfileComparer pc = new ProfileComparer(validator.getContext(), dest);
StructureDefinition sdL = (StructureDefinition) resLeft;
StructureDefinition sdR = (StructureDefinition) resRight;
pc.compareProfiles(sdL, sdR);
System.out.println("Generating output to "+dest+"...");
File htmlFile = new File(pc.generate(dest));
File htmlFile = new File(pc.generate());
Desktop.getDesktop().browse(htmlFile.toURI());
System.out.println("Done");
} else if (resLeft instanceof CapabilityStatement && resRight instanceof CapabilityStatement) {

4
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java
View File

@ -34,7 +34,7 @@ public class ProfileComparisonTests {
// ok now set up the comparison
StructureDefinition sdL = ve.getContext().fetchResource(StructureDefinition.class, left);
ProfileComparer pc = new ProfileComparer(ve.getContext(), new KeyGenerator("http://fhir.org/temp/"+UUID.randomUUID().toString().toLowerCase()));
ProfileComparer pc = new ProfileComparer(ve.getContext(), new KeyGenerator("http://fhir.org/temp/"+UUID.randomUUID().toString().toLowerCase()), dest);
if (sdL == null) {
System.out.println("Unable to locate left profile " +left);
} else {
@ -47,7 +47,7 @@ public class ProfileComparisonTests {
System.out.println("Generating output...");
File htmlFile = null;
try {
htmlFile = new File(pc.generate(dest));
htmlFile = new File(pc.generate());
} catch (Exception e) {
e.printStackTrace();
throw e;

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/administration-module-person.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/administration.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 628 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/cc0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 367 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinical.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 510 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-components-diagram.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-integrating-decision-support-conversation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-integrating-decision-support-radiology-request.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-integrating-decision-support-service-scenario.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-integrating-decision-support-simple-request.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/clinicalreasoning-knowledge-artifact-components.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/compare-to-r3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 735 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/conformance.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 848 B

0
org.hl7.fhir.validation/src/test/resources/comparison/output/conparison-zip-marker.bin Normal file
View File

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/diagnostics.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 700 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/external.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 B

947
org.hl7.fhir.validation/src/test/resources/comparison/output/fhir.css Normal file
View File

@ -0,0 +1,947 @@
body {
background-color: rgb(243, 243, 243);
margin: 0px;
padding: 0px;
height: 100%;
font-size: 1em;
}
body.book {
margin: 20px;
padding: 20px;
background-color: #fff;
}
blockquote.stu-note {
margin: 5px;
padding:10px;
background-color: #fff2ff;
border-left-color: #ffa0ff;
}
.watermark
{
background-image: url(watermark.png);
background-position: center center;
s-background-size: 100%; /* CSS3 only, but not really necessary if you make a large enough image */
background-attachment: fixed;
position: absolute;
width: 100%;
height: 100%;
margin: 0;
z-index: 10;
}
i.inherited {
font-size: 10px;
opacity: 0.5;
}
p, li {
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
margin: 0 0 20px 0;
font-weight: normal;
}
a.cf {
color: red;
}
a.dict {
color: Purple;
}
td {
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
}
tr {
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
text-align: left;
}
table.colstu {
width: 100%;
}
table.colstu td {
border: 1px grey solid;
border-spacing: 0;
padding: 5px;
border-collapse: collapse;
background-color: #fff5e6;
}
table.colsd {
width: 100%;
}
table.colsd td {
border: 1px grey solid;
border-spacing: 0;
padding: 5px;
border-collapse: collapse;
background-color: #efefef;
}
table.colsn {
width: 100%;
}
table.colsn td {
border: 1px grey solid;
border-spacing: 0;
padding: 5px;
border-collapse: collapse;
background-color: #e6ffe6;
}
table.colse {
width: 100%;
}
table.colse td {
border: 1px grey solid;
border-spacing: 0;
padding: 5px;
border-collapse: collapse;
background-color: #e6e6e6;
}
table.colsi {
width: 100%;
}
table.colsi td {
border: 1px grey solid;
border-spacing: 0;
padding: 5px;
border-collapse: collapse;
background-color: #ffffe6;
}
table.list td {
border-top: 1px silver solid;
border-spacing: 0;
}
table.bare td {
border-spacing: 0;
}
ul.dict li {
font-size: 11px;
line-height: 1.2em;
font-family: verdana;
font-weight: normal;
padding: 3px;
}
table.dict td {
padding:3px 7px 2px 7px;
font-size: 11px;
line-height: 1.2em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
}
table.dict p {
font-size: 11px;
}
table.dict td.structure {
padding:3px 7px 2px 7px;
font-size: 12px;
line-height: 1.2em;
font-family: verdana;
font-weight: bold;
padding: 3px;
vertical-align: top;
border-bottom: 1px silver solid;
background: #EFEFEF
}
table {
margin-bottom: 10px;
border-collapse:collapse;
}
table.codes{
margin-bottom: 10px;
border: 1px black solid;
}
table.codes td {
border:1px solid silver;
padding:3px 7px 2px 7px;
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
}
table.grid{
margin-bottom: 10px;
border: 1px black solid;
margin-right: auto;
}
table.grid th {
border:1px solid silver;
padding:3px 7px 2px 7px;
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
font-weight: bold;
padding: 3px;
vertical-align: top;
}
table.grid td {
border:1px solid silver;
padding:3px 7px 2px 7px;
font-size: 12px;
line-height: 1.4em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
}
ul {
margin: 10px 0;
padding: 0 0 0 25px;
}
.dense li {
margin: 0 0 0 0;
}
li {
margin: 0 0 5px 0;
}
h1 {
font-size: 16px;
margin: 0 0 4px 0;
font-family: verdana;
border-bottom: 1px solid #7e7e7e;
padding-bottom: 2px;
}
h2 {
font-family: verdana;
line-height: 1.2em;
font-size: 14px;
margin: 0 0 3px 0;
margin-top: 15px;
border-bottom: 1px solid #dcdcdc;
padding-bottom: 2px;
}
h3 {
font-family: verdana;
line-height: 1.2em;
font-size: 12px;
margin: 0 0 3px 0;
margin-top: 10px;
}
h4 {
font-family: verdana;
line-height: 1.2em;
font-size: 11px;
margin: 0 0 3px 0;
margin-top: 10px;
}
div.content {
background-color: #fff;
margin-left: 180px;
padding: 5px;
border-left: 1px solid #dcdcdc;
}
div.use {
border: 1px solid #dcdcdc;
background: #EEEEEE ;
padding: 5px;
}
div.mapping {
border: 1px solid #dcdcdc;
background: #e4dbf9 ;
padding: 5px;
margin-bottom: 10px;
font-size: 0.75em;
width: 800px;
}
div.example {
border: 1px solid #dcdcdc;
background: #FFECDD ;
padding: 5px;
margin-bottom: 10px;
font-size: 0.75em;
width: 670px;
}
div.sidebar h2{
border-bottom: 1px solid #dcdcdc;
padding-bottom: 2px;
padding-top: 0px;
margin-top: 0px;
font-weight: normal;
margin-left: 8px;
margin-bottom: 0px;
font-size: 12px;
}
div.sidebar p {
padding-bottom: 0px;
padding-top: 10px;
font-weight: normal;
margin-left: 8px;
font-size: 12px;
margin-bottom: 8px;
}
div.sidebar ul {
list-style: none;
padding: 0px;
margin-left: 6px;
font-size: 11px;
line-height: 2.125em;
}
div.sidebar li {
margin: 0px 0px 0px 6px;
padding: 0px;
font-size: 11px;
line-height: 2.125m;
}
div.sidebar {
position: fixed;
width: 180px;
left: 0px;
top: 0;
bottom: 0;
overflow-y : auto;
}
pre.spec {
border: 1px solid #dcdcdc;
font-size: 11px;
background: #FFFFE0 ;
padding: 5px;
width: 650px;
}
pre.json {
border: 1px solid #dcdcdc;
font-size: 11px;
background: #EFFFEF ;
padding: 5px;
width: 650px;
}
pre.rdf {
border: 1px solid #dcdcdc;
font-size: 11px;
background: #fdedff ;
padding: 5px;
width: 650px;
}
pre.fhirpath {
border: 1px solid #dcdcdc;
font-size: 11px;
background: #ffeafb ;
padding: 5px;
width: 650px;
}
pre.graphql {
border: 1px solid #dcdcdc;
font-size: 11px;
background: #f7e6ff ;
padding: 5px;
width: 650px;
}
pre.xml {
font-family: 'Courier New';
font-size: 9pt;
padding: 2px;
background: #F0FFFF ;
width: 650px;
}
p.example {
background: #fff2e6 ;
padding: 5px;
border: 1px solid #dcdcdc;
}
a.xmltag {
color: Navy;
}
a.xmltag :visited {
color: Navy;
}
a.xmltag :hover {
color: Blue;
}
span.xmltag {
color: Navy;
}
span.xmltagred {
color: Maroon;
}
span.xmlcomment {
color: Grey;
}
span.xmlattr {
color: Maroon;
}
span.xmlattrvalue {
color: DarkGreen;
}
pre a {
color: darkgreen;
text-decoration: none;
border: 0;
}
@media all
{
.page-break { display:none; }
}
@media print
{
.page-break { display:block; page-break-before:always; }
}
ul.navtop
{
list-style: none outside none;
display: block;
font-family: sans serif;
margin: 0 0 8px 0;
padding:0px;
}
li.selected
{
white-space: nowrap;
display: inline-block;
background-color: white;
border-right: 1px solid #adcbb9;
margin: 0px;
padding: 0px;
}
li.spacerleft
{
white-space: nowrap;
display: inline-block;
background-color: white;
border-bottom: 1px solid #adcbb9;
border-right: 1px solid #adcbb9;
margin: 0px;
padding: 0px;
}
li.spacerright
{
white-space: nowrap;
display: inline-block;
background-color: white;
border-bottom: 1px solid #adcbb9;
margin: 0px;
padding: 0px;
width: 160px;
}
li.nselected
{
white-space: nowrap;
display: inline-block;
background-color: #eeeeee;
border-right: 1px solid #adcbb9;
margin: 0px;
border-bottom: 1px solid #adcbb9;
padding: 0px;
background-image: url(strip.png);
background-repeat: x-repeat;
}
li.wiki
{
white-space: nowrap;
display: inline-block;
background-color: #fff;
margin: 0px;
border-bottom: 1px solid #adcbb9;
padding: 0px;
}
div.navtop
{
margin: 0px;
padding: 0px;
}
ul.navtop a
{
margin: 0px;
padding: 0px;
color: black;
font-size: 10px;
}
ul.navtop span
{
display: inline-block;
margin: 0px;
padding: 3px 3px 3px 3px;
font-size: 10px;
}
span.forprint
{
display: none;
}
p.status
{
color: navy;
border: 1px solid navy;
background-color: Mistyrose;
}
div.sidebar p.note
{
color: maroon;
font-size: 10px;
padding-top: 0px;
padding-bottom: 0px;
}
div.itoc
{
margin: 4px;
padding: 4px;
float: right;
z-index: 10;
width: 150px;
background-color: #fffbe6;
border: 1px solid navy;
}
div.itoc p
{
font-size: 10px;
font-weight: bold;
margin: 5px;
padding: 0px;
}
div.itoc p.link
{
font-size: 10px;
padding-left: 8px;
margin: 0px;
}
span.sectioncount {
color: silver;
x-position: absolute;
x-right: 0;
x-margin-right: 30px;
}
@font-face {
font-family: 'OpenSansCondensedLight';
src: url('OpenSans-CondLight-webfont.eot');
src: url('OpenSans-CondLight-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-CondLight-webfont.woff') format('woff'),
url('OpenSans-CondLight-webfont.ttf') format('truetype'),
url('OpenSans-CondLight-webfont.svg#open_sanscondensed_light') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansCondensedBold';
src: url('OpenSans-CondBold-webfont.eot');
src: url('OpenSans-CondBold-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-CondBold-webfont.woff') format('woff'),
url('OpenSans-CondBold-webfont.ttf') format('truetype'),
url('OpenSans-CondBold-webfont.svg#open_sans_condensedbold') format('svg');
font-weight: normal;
font-style: normal;
}
.diagram-class-title {
font-size: 1em;
text-anchor: middle;
font-family: OpenSansCondensedLight;
font-weight: regular;
}
.diagram-resource {
font-family: OpenSansCondensedBold;
font-weight: bold;
}
.diagram-class-title-link {
font-size: .9em;
text-anchor: middle;
font-family: OpenSansCondensedLight;
font-weight: regular;
}
.diagram-class-reference {
fill: navy;
}
.diagram-class-detail {
font-size: .8em;
text-anchor: left;
font-family: OpenSansCondensedLight;
font-weight: regular;
}
.diagram-class-linkage {
font-size: .9em;
text-anchor: middle;
font-family: OpenSansCondensedLight;
font-weight: regular;
opacity: 1;
}
.hierarchy {
border: 0px;
padding:0px 4px 0px 4px;
font-size: 11px;
font-family: verdana;
vertical-align: top;
}
tr.hierarchy {
border: 1px #F0F0F0 solid;
padding:0px 4px 0px 4px;
font-size: 11px;
font-family: verdana;
vertical-align: top;
}
img.hierarchy {
border: 0px;
padding:0px;
vertical-align: top;
background-color: white;
}
.linecounter {
counter-reset: listing
}
code {
counter-increment: listing;
}
.linecounter i:before {
content: counter(listing) ". "; color: black;
}
.linecounter i {
float: left;
clear: both;
min-width: 2.5em;
}
.linecounter code:before {
content: counter(listing) ". ";
color: black;
display: inline-block;
min-width: 2.5em;
}
div.warning {
background-color: #FFE6E6;
border: 1px silver solid;
padding: 5px;
}
span.warning {
background-color: #FFE6E6;
border: 1px silver solid;
padding: 1px;
}
tr.diff-title td {
font-weight: bold;
background-color: #eeeeee;
}
tr.diff-item td.diff-left {
font-weight: bold;
vertical-align: top;
}
tr.diff-new-item td.diff-left {
font-weight: bold;
vertical-align: top;
}
tr.diff-del-item td.diff-left {
font-weight: bold;
vertical-align: top;
}
tr.diff-new {
background-color: #f4fff4;
}
tr.diff-new-item {
background-color: #f4fff4;
}
tr.diff-changed-item {
background-color: #eaf8ff;
}
tr.diff-del {
background-color: #fff4f4;
}
tr.diff-del-item {
background-color: #fff4f4;
}
.self-link-parent a.self-link {
visibility:hidden;
}
.self-link-parent:hover a.self-link {
visibility:visible;
}
tr.frm-group {
border-right: 1px solid black;
border-left: 1px solid black;
border-top: 1px solid black;
border-bottom: 0px none black;
font-weight: bold;
}
tr.frm-group-n {
border: 1px solid black;
font-weight: bold;
}
tr.frm-contents {
border-right: 1px solid black;
border-left: 1px solid black;
padding-bottom: 3px;
border-bottom: 1px solid black;
}
td.frm-category {
border-left: 1px solid #eeeeee;
font-weight: bold;
text-align: center;
}
td.frm-group {
background: #f4f4f4;
font-weight: bold;
}
td.frm-null {
background: #f4f4f4;
}
td.frm-set {
border-left: 1px solid #eeeeee;
}
.rotate {
text-align: center;
vertical-align: middle;
width: 1.5em;
}
.rotate div {
-moz-transform: rotate(-90.0deg); /* FF3.5+ */
-o-transform: rotate(-90.0deg); /* Opera 10.5 */
-webkit-transform: rotate(-90.0deg); /* Saf3.1+, Chrome */
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0.083); /* IE6,IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0.083)"; /* IE8 */
margin-left: -10em;
margin-right: -10em;
}
.gsc-control-cse .gsc-table-result {
font-family : inherit;
}
.gsc-control-cse .gsc-input-box {
height : inherit;
}
input.gsc-input,
.gsc-input-box,
.gsc-input-box-hover,
.gsc-input-box-focus,
.gsc-search-button, input.gsc-search-button-v2 {
box-sizing : content-box;
line-height : normal;
margin-top : 0px;
}
div.informative-content {
border: 1px grey solid;
background-color: #ffffe6;
padding: 10px;
}
div.draft-content {
border: 1px grey solid;
background-color: #efefef;
padding: 10px;
}
div.trial-content {
border: 1px grey solid;
background-color: #fff5e6;
padding: 10px;
}
td.draft-content {
background-color: #efefef;
}
tr.draft-content {
background-color: #efefef;
}
a.normative-flag {
border: 1px grey solid;
background-color: #e6ffe6;
padding-left: 3px;
padding-right: 3px;
color: black;
font-weight: bold
}
a.informative-flag {
border: 1px grey solid;
background-color: #ffffe6;
padding-left: 3px;
padding-right: 3px;
color: black;
font-weight: bold
}
a.draft-flag {
border: 1px grey solid;
background-color: #efefef;
padding-left: 3px;
padding-right: 3px;
color: black;
font-weight: bold
}
a.trial-use-flag {
border: 1px grey solid;
background-color: #fff5e6;
padding-left: 3px;
padding-right: 3px;
color: black;
font-weight: bold
}
a.deprecated-flag {
border: 1px grey solid;
background-color: #ffcccc;
padding-left: 3px;
padding-right: 3px;
color: black;
font-weight: bold
}
table.lmap {
margin-bottom: 10px;
border: 1px black solid;
margin-right: auto;
}
table.lmap th {
border:1px solid silver;
padding:3px 7px 2px 7px;
font-size: 10px;
line-height: 1.4em;
font-family: verdana;
font-weight: bold;
padding: 3px;
vertical-align: top;
}
table.lmap td {
border:1px solid silver;
padding:3px 7px 2px 7px;
font-size: 10px;
line-height: 1.4em;
font-family: verdana;
font-weight: normal;
padding: 3px;
vertical-align: top;
}
ol.fmmlist {
counter-reset: number 0;
}
ol.fmmlist li {
list-style: none;
counter-increment: number;
}
ol.fmmlist li::before {
content: "FMM " counter(number);
position: relative;
left:-25px
}

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/financial.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 859 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/foundation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 447 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/header-tabs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/help.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1015 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/help16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 714 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/hl7logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-dictionary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 613 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-directory.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 640 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-error.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 587 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-fhir-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-include.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-list.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-page.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-resource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 635 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-toc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 734 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon-warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_bundle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 631 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_choice.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_datatype.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 585 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_element.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 232 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_extension.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_extension_complex.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_extension_simple.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 331 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_fixed.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_modifier_extension_complex.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 786 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_modifier_extension_simple.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 363 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page_n.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page_n_c.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page_n_i.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page_n_o.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_page_n_p.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_primitive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_profile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 843 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_reference.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_resource.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 598 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_reuse.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 785 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_slice.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 692 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_slice_item.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 565 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/icon_text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 567 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/implsupport.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 B

BIN
org.hl7.fhir.validation/src/test/resources/comparison/output/index.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

Some files were not shown because too many files have changed in this diff Show More