Add TriggerDefinition

Author: alexanderkiel

modules/fhir-structure/java/blaze/fhir/spec/type/Annotation.java

@@ -43,19 +43,19 @@ public final class Annotation extends AbstractElement implements Complex, Extens
 
     private static final Annotation EMPTY = new Annotation(ExtensionData.EMPTY, null, null, null);
 
-    private final Base author;
+    private final Element author;
     private final DateTime time;
     private final Markdown text;
 
-    private Annotation(ExtensionData extensionData, Base author, DateTime time, Markdown text) {
+    private Annotation(ExtensionData extensionData, Element author, DateTime time, Markdown text) {
         super(extensionData);
         this.author = author;
         this.time = time;
         this.text = text;
     }
 
     public static Annotation create(IPersistentMap m) {
-        return new Annotation(ExtensionData.fromMap(m), (Base) m.valAt(AUTHOR), (DateTime) m.valAt(TIME),
+        return new Annotation(ExtensionData.fromMap(m), (Element) m.valAt(AUTHOR), (DateTime) m.valAt(TIME),
                 (Markdown) m.valAt(TEXT));
     }
 
@@ -101,7 +101,7 @@ public Iterator<Entry<Object, Object>> iterator() {
 
     @Override
     public Annotation assoc(Object key, Object val) {
-        if (key == AUTHOR) return new Annotation(extensionData, (Base) val, time, text);
+        if (key == AUTHOR) return new Annotation(extensionData, (Element) val, time, text);
         if (key == TIME) return new Annotation(extensionData, author, (DateTime) val, text);
         if (key == TEXT) return new Annotation(extensionData, author, time, (Markdown) val);
         if (key == EXTENSION) return new Annotation(extensionData.withExtension(val), author, time, text);

modules/fhir-structure/java/blaze/fhir/spec/type/Dosage.java

@@ -87,7 +87,7 @@ public final class Dosage extends AbstractBackboneElement implements Complex, Ex
     private final List<CodeableConcept> additionalInstruction;
     private final String patientInstruction;
     private final Timing timing;
-    private final Base asNeeded;
+    private final Element asNeeded;
     private final CodeableConcept site;
     private final CodeableConcept route;
     private final CodeableConcept method;
@@ -97,9 +97,10 @@ public final class Dosage extends AbstractBackboneElement implements Complex, Ex
     private final Quantity maxDosePerLifetime;
 
     private Dosage(ExtensionData extensionData, List<Extension> modifierExtension, Integer sequence, String text,
-                   List<CodeableConcept> additionalInstruction, String patientInstruction, Timing timing, Base asNeeded,
-                   CodeableConcept site, CodeableConcept route, CodeableConcept method, List<DoseAndRate> doseAndRate,
-                   Ratio maxDosePerPeriod, Quantity maxDosePerAdministration, Quantity maxDosePerLifetime) {
+                   List<CodeableConcept> additionalInstruction, String patientInstruction, Timing timing,
+                   Element asNeeded, CodeableConcept site, CodeableConcept route, CodeableConcept method,
+                   List<DoseAndRate> doseAndRate, Ratio maxDosePerPeriod, Quantity maxDosePerAdministration,
+                   Quantity maxDosePerLifetime) {
         super(extensionData, modifierExtension);
         this.sequence = sequence;
         this.text = text;
@@ -119,7 +120,7 @@ private Dosage(ExtensionData extensionData, List<Extension> modifierExtension, I
     public static Dosage create(IPersistentMap m) {
         return new Dosage(ExtensionData.fromMap(m), Base.listFrom(m, MODIFIER_EXTENSION), (Integer) m.valAt(SEQUENCE),
                 (String) m.valAt(TEXT), Base.listFrom(m, ADDITIONAL_INSTRUCTION), (String) m.valAt(PATIENT_INSTRUCTION),
-                (Timing) m.valAt(TIMING), (Base) m.valAt(AS_NEEDED), (CodeableConcept) m.valAt(SITE),
+                (Timing) m.valAt(TIMING), (Element) m.valAt(AS_NEEDED), (CodeableConcept) m.valAt(SITE),
                 (CodeableConcept) m.valAt(ROUTE), (CodeableConcept) m.valAt(METHOD), Base.listFrom(m, DOSE_AND_RATE),
                 (Ratio) m.valAt(MAX_DOSE_PER_PERIOD), (Quantity) m.valAt(MAX_DOSE_PER_ADMINISTRATION),
                 (Quantity) m.valAt(MAX_DOSE_PER_LIFETIME));
@@ -243,7 +244,7 @@ public Dosage assoc(Object key, Object val) {
         if (key == TIMING)
             return new Dosage(extensionData, modifierExtension, sequence, text, additionalInstruction, patientInstruction, (Timing) val, asNeeded, site, route, method, doseAndRate, maxDosePerPeriod, maxDosePerAdministration, maxDosePerLifetime);
         if (key == AS_NEEDED)
-            return new Dosage(extensionData, modifierExtension, sequence, text, additionalInstruction, patientInstruction, timing, (Base) val, site, route, method, doseAndRate, maxDosePerPeriod, maxDosePerAdministration, maxDosePerLifetime);
+            return new Dosage(extensionData, modifierExtension, sequence, text, additionalInstruction, patientInstruction, timing, (Element) val, site, route, method, doseAndRate, maxDosePerPeriod, maxDosePerAdministration, maxDosePerLifetime);
         if (key == SITE)
             return new Dosage(extensionData, modifierExtension, sequence, text, additionalInstruction, patientInstruction, timing, asNeeded, (CodeableConcept) val, route, method, doseAndRate, maxDosePerPeriod, maxDosePerAdministration, maxDosePerLifetime);
         if (key == ROUTE)
@@ -498,19 +499,19 @@ public static class DoseAndRate extends AbstractElement implements Complex {
         private static final DoseAndRate EMPTY = new DoseAndRate(ExtensionData.EMPTY, null, null, null);
 
         private final CodeableConcept type;
-        private final Base dose;
-        private final Base rate;
+        private final Element dose;
+        private final Element rate;
 
-        private DoseAndRate(ExtensionData extensionData, CodeableConcept type, Base dose, Base rate) {
+        private DoseAndRate(ExtensionData extensionData, CodeableConcept type, Element dose, Element rate) {
             super(extensionData);
             this.type = type;
             this.dose = dose;
             this.rate = rate;
         }
 
         public static DoseAndRate create(IPersistentMap m) {
-            return new DoseAndRate(ExtensionData.fromMap(m), (CodeableConcept) m.valAt(TYPE), (Base) m.valAt(DOSE),
-                    (Base) m.valAt(RATE));
+            return new DoseAndRate(ExtensionData.fromMap(m), (CodeableConcept) m.valAt(TYPE), (Element) m.valAt(DOSE),
+                    (Element) m.valAt(RATE));
         }
 
         public CodeableConcept type() {
@@ -556,8 +557,8 @@ public Iterator<Entry<Object, Object>> iterator() {
         @Override
         public DoseAndRate assoc(Object key, Object val) {
             if (key == TYPE) return new DoseAndRate(extensionData, (CodeableConcept) val, dose, rate);
-            if (key == DOSE) return new DoseAndRate(extensionData, type, (Base) val, rate);
-            if (key == RATE) return new DoseAndRate(extensionData, type, dose, (Base) val);
+            if (key == DOSE) return new DoseAndRate(extensionData, type, (Element) val, rate);
+            if (key == RATE) return new DoseAndRate(extensionData, type, dose, (Element) val);
             if (key == EXTENSION) return new DoseAndRate(extensionData.withExtension(val), type, dose, rate);
             if (key == ID) return new DoseAndRate(extensionData.withId(val), type, dose, rate);
             return this;

modules/fhir-structure/java/blaze/fhir/spec/type/Timing.java

@@ -283,7 +283,7 @@ public static class Repeat extends AbstractElement implements Complex {
         private static final Repeat EMPTY = new Repeat(ExtensionData.EMPTY, null, null, null, null, null, null, null,
                 null, null, null, null, PersistentVector.EMPTY, PersistentVector.EMPTY, PersistentVector.EMPTY, null);
 
-        private final Base bounds;
+        private final Element bounds;
         private final PositiveInt count;
         private final PositiveInt countMax;
         private final Decimal duration;
@@ -299,7 +299,7 @@ public static class Repeat extends AbstractElement implements Complex {
         private final List<Code> when;
         private final UnsignedInt offset;
 
-        private Repeat(ExtensionData extensionData, Base bounds, PositiveInt count, PositiveInt countMax,
+        private Repeat(ExtensionData extensionData, Element bounds, PositiveInt count, PositiveInt countMax,
                        Decimal duration, Decimal durationMax, Code durationUnit, PositiveInt frequency,
                        PositiveInt frequencyMax, Decimal period, Decimal periodMax, Code periodUnit,
                        List<Code> dayOfWeek, List<Time> timeOfDay, List<Code> when, UnsignedInt offset) {
@@ -327,7 +327,7 @@ public static Repeat create(IPersistentMap m) {
                 throw new IllegalArgumentException("Expecting bounds to be either a Duration, Range or Period but was a `" +
                         bounds.getClass().getSimpleName() + "`.");
             }
-            return new Repeat(ExtensionData.fromMap(m), (Base) bounds, (PositiveInt) m.valAt(COUNT),
+            return new Repeat(ExtensionData.fromMap(m), (Element) bounds, (PositiveInt) m.valAt(COUNT),
                     (PositiveInt) m.valAt(COUNT_MAX), (Decimal) m.valAt(DURATION), (Decimal) m.valAt(DURATION_MAX),
                     (Code) m.valAt(DURATION_UNIT), (PositiveInt) m.valAt(FREQUENCY), (PositiveInt) m.valAt(FREQUENCY_MAX),
                     (Decimal) m.valAt(PERIOD), (Decimal) m.valAt(PERIOD_MAX), (Code) m.valAt(PERIOD_UNIT),
@@ -395,7 +395,7 @@ public Iterator<Entry<Object, Object>> iterator() {
 
         @Override
         public Repeat assoc(Object key, Object val) {
-            if (key == BOUNDS) return new Repeat(extensionData, (Base) val, count, countMax, duration, durationMax,
+            if (key == BOUNDS) return new Repeat(extensionData, (Element) val, count, countMax, duration, durationMax,
                     durationUnit, frequency, frequencyMax, period, periodMax, periodUnit, dayOfWeek, timeOfDay, when,
                     offset);
             if (key == COUNT) return new Repeat(extensionData, bounds, (PositiveInt) val, countMax, duration,