Regenerate R4B code

org.hl7.fhir.core.generator/.classpath

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
+<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="src" path="src"/>
-		<attributes>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.r5"/>
-			<attribute name="module" value="true"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.utilities"/>
-		</attributes>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.r4"/>
-	</classpathentry>
+	<classpathentry kind="src" path="/org.hl7.fhir.convertors"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.r5"/>
+		<attributes>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.utilities"/>
+			<attribute name="module" value="true"/>
-	<classpathentry kind="lib" path="C:/Users/graha/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-base/5.4.0/hapi-fhir-base-5.4.0.jar"/>
+		</attributes>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.r4"/>
+	</classpathentry>
-	<classpathentry kind="src" path="/org.hl7.fhir.convertors"/>
+	<classpathentry kind="lib" path="/Users/grahamegrieve/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-base/5.4.0/hapi-fhir-base-5.4.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin"/>
-</classpath>
+</classpath>

org.hl7.fhir.core.generator/configuration/configuration.ini

@@ -51,4 +51,49 @@ ValueSet.compose.include.concept.designation = ConceptReferenceDesignation
 CodeSystem.concept.designation = ConceptDefinitionDesignation
 
 [no-enum]
-http://hl7.org/fhir/ValueSet/resource-types=true
+http://hl7.org/fhir/ValueSet/resource-types=true
+
+[R4B.CanonicalResources]
+ActivityDefinition=yesyes
+CapabilityStatement=yes
+Citation=yes
+CodeSystem=yes
+CompartmentDefinition=yes
+ConceptMap=yes
+EventDefinition=yes
+;Evidence=yes
+;EvidenceReport=yes
+;EvidenceVariable=yes
+ExampleScenario=yes
+GraphDefinition=yes
+ImplementationGuide=yes
+Library=yes
+Measure=yes
+MessageDefinition=yes
+NamingSystem=yes
+OperationDefinition=yes
+PlanDefinition=yes
+Questionnaire=yes
+ResearchDefinition=yes
+ResearchElementDefinition=yes
+SearchParameter=yes
+StructureDefinition=yes
+StructureMap=yes
+;SubscriptionTopic=yes
+TerminologyCapabilities=yes
+TestScript=yes
+ValueSet=yes
+
+[R4B.NullImplementation]
+CapabilityStatement=identifier[]:Identifier
+GraphDefinition=copyright:String|MarkdownType,identifier[]:Identifier,title:String|StringType
+CompartmentDefinition=copyright:String|MarkdownType,identifier[]:Identifier,title:String|StringType,jurisdiction[]:CodeableConcept
+;ConceptMap=identifier[]:Identifier
+TerminologyCapabilities=identifier[]:Identifier
+;TestScript=identifier[]:Identifier
+SearchParameter=copyright:String|MarkdownType,identifier[]:Identifier,title:String|StringType
+NamingSystem=purpose:String|MarkdownType,copyright:String|MarkdownType,url:String|UriType,experimental:boolean|BooleanType,version:String|StringType,identifier[]:Identifier,title:String|StringType
+OperationDefinition=copyright:String|MarkdownType,identifier[]:Identifier
+ImplementationGuide=purpose:String|MarkdownType,identifier[]:Identifier
+ExampleScenario=description:String|MarkdownType,title:String|StringType
+

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java

@@ -18,6 +18,7 @@ import org.hl7.fhir.r5.model.Enumerations.BindingStrength;
 import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum;
 import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind;
 import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent;
+import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
 

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java

@@ -45,7 +45,9 @@ import org.hl7.fhir.r5.model.Enumerations.BindingStrength;
 import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind;
 import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent;
+import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.VersionUtilities;
 
 
 public class JavaBaseGenerator extends OutputStreamWriter {
@@ -287,7 +289,14 @@ public class JavaBaseGenerator extends OutputStreamWriter {
   }
   
   
-  protected ElementDefinition matchingInheritedElement(List<ElementDefinition> children, ElementDefinition m) {
+  protected ElementDefinition matchingInheritedElement(List<ElementDefinition> children, ElementDefinition m, String name) {
+    if (VersionUtilities.isR4BVer(version)) {
+      if (m.getPath().endsWith(".identifier") && Utilities.charCount(m.getPath(), '.') == 1 && !Utilities.noString(config.getIni().getStringProperty("R4B.CanonicalResources", name))) {
+        ElementDefinition inh = new ElementDefinition();
+        inh.setMax("*");
+        return inh;
+      }
+    }
     if (children == null) {
       return null;
     }

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserJsonGenerator.java

@@ -158,7 +158,7 @@ public class JavaParserJsonGenerator extends JavaBaseGenerator {
     parser.append("  protected void "+pn+"Properties(JsonObject json, "+stn+" res) throws IOException, FHIRFormatError {\r\n");
     parser.append("    parse"+ti.getAncestorName()+"Properties(json, res);\r\n");
     for (ElementDefinition e : ti.getChildren()) {
-      genElementParser(analysis, ti, e, bUseOwner, matchingInheritedElement(ti.getInheritedChildren(), e));
+      genElementParser(analysis, ti, e, bUseOwner, matchingInheritedElement(ti.getInheritedChildren(), e, analysis.getName()));
     }
     parser.append("  }\r\n\r\n");
   }
@@ -349,7 +349,7 @@ public class JavaParserJsonGenerator extends JavaBaseGenerator {
     composer.append("  protected void compose"+tn+"Properties("+stn+" element) throws IOException {\r\n");
     composer.append("    compose"+ti.getAncestorName()+"Properties(element);\r\n");
     for (ElementDefinition e : ti.getChildren()) {
-      genElementComposer(analysis, analysis.getRootType(), e, matchingInheritedElement(ti.getInheritedChildren(), e));
+      genElementComposer(analysis, analysis.getRootType(), e, matchingInheritedElement(ti.getInheritedChildren(), e, analysis.getName()));
     }
     composer.append("  }\r\n\r\n");
   }

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserRdfGenerator.java

@@ -117,7 +117,7 @@ public class JavaParserRdfGenerator extends JavaBaseGenerator {
       composer.append("    decorateCodeableConcept(t, element);\r\n");
 
     for (ElementDefinition ed : ti.getChildren()) {
-      genElement(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(), ed));
+      genElement(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(), ed, analysis.getName()));
     }
     composer.append("  }\r\n\r\n");    
   }

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserXmlGenerator.java

@@ -157,7 +157,7 @@ public class JavaParserXmlGenerator extends JavaBaseGenerator {
     boolean first = true;
     for (ElementDefinition ed : ti.getChildren()) {
       if (!ed.hasRepresentation(PropertyRepresentation.XMLATTR)) {
-        genElement(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(), ed), first);
+        genElement(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(), ed, analysis.getName()), first);
         first = false;
       }
     }
@@ -307,7 +307,7 @@ public class JavaParserXmlGenerator extends JavaBaseGenerator {
     
     for (ElementDefinition ed : ti.getChildren()) {
       if (!ed.hasRepresentation(PropertyRepresentation.XMLATTR)) {
-        genElementCompose(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(),  ed));
+        genElementCompose(analysis, ti, ed, matchingInheritedElement(ti.getInheritedChildren(),  ed, analysis.getName()));
       }
     }
     composer.append("  }\r\n\r\n");    

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java

@@ -66,6 +66,7 @@ import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent;
 import org.hl7.fhir.r5.utils.TypesUtilities;
 import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.VersionUtilities;
 
 
 /*
@@ -157,7 +158,11 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
 		jdoc("", replaceTitle(analysis.getName(), analysis.getStructure().getDescription()));
 		TypeInfo ti = analysis.getRootType();
 		boolean hasChildren = ti.getChildren().size() > 0;
-		String hierarchy = analysis.getAncestor() != null ? "extends "+analysis.getAncestor().getName() : "";
+		String superName = analysis.getAncestor() == null ? null : analysis.getAncestor().getName();
+		if (VersionUtilities.isR4BVer(version) && !Utilities.noString(config.getIni().getStringProperty("R4B.CanonicalResources", analysis.getName()))) {
+		  superName = "CanonicalResource"; 
+		}
+    String hierarchy = analysis.getAncestor() != null ? "extends "+superName : "";
 		
     if (clss == JavaGenClass.Resource) {
       if (!analysis.isAbstract()) {
@@ -168,8 +173,12 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
       hierarchy = hierarchy + " implements ICompositeType";
     }
     
-    if (config.getIni().hasProperty("hierarchy", analysis.getName()) && analysis.getAncestor() != null) {
+    if (config.getIni().hasProperty("hierarchy", analysis.getName()) ) {
-      hierarchy = config.getIni().getStringProperty("hierarchy", analysis.getName()).replace("{{super}}", analysis.getAncestor().getName());
+      String h = config.getIni().getStringProperty("hierarchy", analysis.getName());
+      if (analysis.getAncestor() != null) {
+        h = h.replace("{{super}}", superName);
+      }
+      hierarchy = h;
     }
 				
     write("public "+(analysis.isAbstract()? "abstract " : "")+"class "+analysis.getClassName()+" "+hierarchy.trim()+" {\r\n");
@@ -209,7 +218,7 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
 	      if (analysis.isInterface()) {
           generateAbstractAccessors(analysis, ti, e, "    ");
 	      } else {
-		      generateAccessors(analysis, ti, e, "    ", matchingInheritedElement(ti.getInheritedChildren(), e));
+		      generateAccessors(analysis, ti, e, "    ", matchingInheritedElement(ti.getInheritedChildren(), e, analysis.getName()));
 	      }
 		  }
 		  if (!analysis.isInterface() && ti.getInheritedChildren() != null) {
@@ -250,7 +259,7 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
 		  write("    return ResourceType."+analysis.getName()+";\r\n");
 		  write("   }\r\n");
 		  write("\r\n"); 
-		} else if (analysis.isAbstract() && analysis.getAncestor() != null && Utilities.noString(analysis.getAncestor().getName())) {
+		} else if (analysis.isAbstract() && analysis.getAncestor() != null && Utilities.noString(superName)) {
       write("\r\n"); 
       write("  @Override\r\n"); 
       write("  public String getIdBase() {\r\n"); 
@@ -262,7 +271,7 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
       write("    setId(value);\r\n");
       write("  }\r\n");
 		  write("  public abstract ResourceType getResourceType();\r\n");
-		} else if (analysis.isAbstract() && analysis.getAncestor() != null && Utilities.noString(analysis.getAncestor().getName())) {
+		} else if (analysis.isAbstract() && analysis.getAncestor() != null && Utilities.noString(superName)) {
       write("  @Override\r\n"); 
       write("  public String getIdBase() {\r\n"); 
       write("    return getId();\r\n"); 
@@ -329,6 +338,110 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
 		  }
 		}
 
+		if (VersionUtilities.isR4BVer(version)) {
+		  String extras = config.getIni().getStringProperty("R4B.NullImplementation", analysis.getName());
+		  if (!Utilities.noString(extras)) {
+		    for (String n : extras.split("\\,")) {
+		      String t = n.substring(n.indexOf(":")+1);
+		      n = n.substring(0, n.indexOf(":"));
+		      if (n.endsWith("[]")) {
+		        n = Utilities.capitalize(n.substring(0, n.length()-2));
+		        write("      @Override\r\n");
+		        write("      public List<"+t+"> get"+n+"() {\r\n");
+		        write("        return new ArrayList<>();\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public CanonicalResource set"+n+"(List<"+t+"> the"+n+") {\r\n");
+		        write("        return this;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public boolean has"+n+"() {\r\n");
+		        write("        return false;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public "+t+" add"+n+"() {\r\n");
+		        write("	        return null;\r\n");
+		        write("	      }\r\n");
+		        write("	      \r\n");
+		        write("      @Override\r\n");
+		        write("      public CanonicalResource add"+n+"("+t+" t) {\r\n");
+		        write("        return null;\r\n");
+		        write("	      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public "+t+" get"+n+"FirstRep() {\r\n");
+		        write("        return new "+t+"();\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		      } else if (t.contains("|")) {
+		        n = Utilities.capitalize(n);
+		        String t1 = t.substring(0, t.indexOf("|"));
+		        String t2 = t.substring(t.indexOf("|")+1);
+		        write("      @Override\r\n");
+		        write("      public "+t1+" get"+n+"() {\r\n");
+		        if ("boolean".equals(t1)) {
+		          write("        return false;\r\n");
+		        } else {
+		          write("        return new "+t1+"();\r\n");
+		        }
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public "+t2+" get"+n+"Element() {\r\n");
+		        write("        return new "+t2+"();\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public CanonicalResource set"+n+"("+t1+" the"+n+") {\r\n");
+		        write("        return this;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public CanonicalResource set"+n+"Element("+t2+" the"+n+") {\r\n");
+		        write("        return this;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public boolean has"+n+"() {\r\n");
+		        write("        return false;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      @Override\r\n");
+		        write("      public boolean has"+n+"Element() {\r\n");
+		        write("        return false;\r\n");
+		        write("      }\r\n");
+		        write("      \r\n");
+		        write("      \r\n");		    
+          } else {
+            n = Utilities.capitalize(n);
+            write("      @Override\r\n");
+            write("      public "+t+" get"+n+"() {\r\n");
+            write("        return new "+t+"();\r\n");
+            write("      }\r\n");
+            write("      \r\n");
+            write("      @Override\r\n");
+            write("      public CanonicalResource set"+n+"("+t+" the"+n+") {\r\n");
+            write("        return this;\r\n");
+            write("      }\r\n");
+            write("      \r\n");
+            write("      @Override\r\n");
+            write("      public boolean has"+n+"() {\r\n");
+            write("        return false;\r\n");
+            write("      }\r\n");
+            write("      \r\n");
+            write("      @Override\r\n");
+            write("      public boolean has"+n+"Element() {\r\n");
+            write("        return false;\r\n");
+            write("      }\r\n");
+            write("      \r\n");
+            write("      \r\n");        
+		      }		    
+		    }		  
+		  }
+		}
 		if (config.getAdornments().containsKey(analysis.getClassName())) {
       write("// Manual code (from Configuration.txt):\r\n");
 		  write(config.getAdornments().get(analysis.getClassName())+"\r\n");
@@ -745,7 +858,7 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
     write(indent+"    switch (hash) {\r\n");
     for (ElementDefinition e : children) {
       if (!isInterface) { 
-        ElementDefinition inh = inheritedChildren == null ? null : matchingInheritedElement(inheritedChildren, e);
+        ElementDefinition inh = inheritedChildren == null ? null : matchingInheritedElement(inheritedChildren, e, analysis.getName());
         String tn = e.getUserString("java.type");
         if (!e.typeSummary().equals("xhtml")) {
           genPropMaker(indent, e, tn, e.getName(), inh);

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java

@@ -83,19 +83,19 @@ public class JavaCoreGenerator {
     
     System.out.println("Generate Model");   
     System.out.println(" .. Constants");
-    JavaConstantsGenerator cgen = new JavaConstantsGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "model", "Constants.java")), master, config, date, npm.version(), jid);
+    JavaConstantsGenerator cgen = new JavaConstantsGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", "Constants.java")), master, config, date, npm.version(), jid);
     cgen.generate();
     cgen.close();
     System.out.println(" .. Enumerations");
-    JavaEnumerationsGenerator egen = new JavaEnumerationsGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "model", "Enumerations.java")), master, config, date, npm.version(), jid);
+    JavaEnumerationsGenerator egen = new JavaEnumerationsGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", "Enumerations.java")), master, config, date, npm.version(), jid);
     egen.generate();
     egen.close();
     
-    JavaFactoryGenerator fgen = new JavaFactoryGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "model", "ResourceFactory.java")), master, config, date, npm.version(), jid);
+    JavaFactoryGenerator fgen = new JavaFactoryGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", "ResourceFactory.java")), master, config, date, npm.version(), jid);
-    JavaTypeGenerator tgen = new JavaTypeGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "model", "ResourceType.java")), master, config, date, npm.version(), jid);
+    JavaTypeGenerator tgen = new JavaTypeGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", "ResourceType.java")), master, config, date, npm.version(), jid);
-    JavaParserJsonGenerator jgen = new JavaParserJsonGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "formats", "JsonParser.java")), master, config, date, npm.version(), jid);
+    JavaParserJsonGenerator jgen = new JavaParserJsonGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "formats", "JsonParser.java")), master, config, date, npm.version(), jid);
-    JavaParserXmlGenerator xgen = new JavaParserXmlGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "formats", "XmlParser.java")), master, config, date, npm.version(), jid);
+    JavaParserXmlGenerator xgen = new JavaParserXmlGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "formats", "XmlParser.java")), master, config, date, npm.version(), jid);
-    JavaParserRdfGenerator rgen = new JavaParserRdfGenerator(new FileOutputStream(Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "formats", "RdfParser.java")), master, config, date, npm.version(), jid);
+    JavaParserRdfGenerator rgen = new JavaParserRdfGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "formats", "RdfParser.java")), master, config, date, npm.version(), jid);
     
     if (VersionUtilities.isR4BVer(version)) {
       StructureDefinition sd = master.getStructures().get("http://hl7.org/fhir/StructureDefinition/Element");
@@ -161,7 +161,7 @@ public class JavaCoreGenerator {
     Analyser jca = new Analyser(master, config, version);
     Analysis analysis = jca.analyse(sd);
     
-    String fn = Utilities.path(dest, "src", "org", "hl7", "fhir", jid, "model", name+".java");
+    String fn = Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", name+".java");
     JavaResourceGenerator gen = new JavaResourceGenerator(new FileOutputStream(fn), master, config, date, npm.version(), jid);
     gen.generate(analysis); 
     gen.close();

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/JsonParser.java

@@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.formats;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Wed, Dec 29, 2021 07:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 
 
@@ -8178,7 +8178,7 @@ public class JsonParser extends JsonParserBase {
     if (json.has("_url"))
       parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
     if (json.has("identifier"))
-      res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
+      res.addIdentifier(parseIdentifier(getJObject(json, "identifier")));
     if (json.has("version"))
       res.setVersionElement(parseString(json.get("version").getAsString()));
     if (json.has("_version"))
@@ -27442,7 +27442,7 @@ public class JsonParser extends JsonParserBase {
     if (json.has("_url"))
       parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
     if (json.has("identifier"))
-      res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
+      res.addIdentifier(parseIdentifier(getJObject(json, "identifier")));
     if (json.has("version"))
       res.setVersionElement(parseString(json.get("version").getAsString()));
     if (json.has("_version"))
@@ -59067,7 +59067,7 @@ public class JsonParser extends JsonParserBase {
         composeUriExtras("url", element.getUrlElement(), false);
       }
       if (element.hasIdentifier()) {
-        composeIdentifier("identifier", element.getIdentifier());
+        composeIdentifier("identifier", element.getIdentifierFirstRep());
       }
       if (element.hasVersionElement()) {
         composeStringCore("version", element.getVersionElement(), false);

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java

@@ -31,7 +31,7 @@ package org.hl7.fhir.r4b.formats;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Wed, Dec 29, 2021 07:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 
 
@@ -21757,7 +21757,7 @@ public class RdfParser extends RdfParserBase {
       composeUri(t, "TestScript", "url", element.getUrlElement(), -1);
     }
     if (element.hasIdentifier()) {
-      composeIdentifier(t, "TestScript", "identifier", element.getIdentifier(), -1);
+      composeIdentifier(t, "TestScript", "identifier", element.getIdentifierFirstRep(), -1);
     }
     if (element.hasVersionElement()) {
       composeString(t, "TestScript", "version", element.getVersionElement(), -1);

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/XmlParser.java

@@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.formats;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Wed, Dec 29, 2021 07:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 
 
@@ -7336,7 +7336,7 @@ public class XmlParser extends XmlParserBase {
     if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
       res.setUrlElement(parseUri(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
-      res.setIdentifier(parseIdentifier(xpp));
+      res.addIdentifier(parseIdentifier(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
       res.setVersionElement(parseString(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
@@ -23746,7 +23746,7 @@ public class XmlParser extends XmlParserBase {
     if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
       res.setUrlElement(parseUri(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
-      res.setIdentifier(parseIdentifier(xpp));
+      res.addIdentifier(parseIdentifier(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
       res.setVersionElement(parseString(xpp));
     } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
@@ -50344,7 +50344,7 @@ public class XmlParser extends XmlParserBase {
       composeUri("url", element.getUrlElement());
     }
     if (element.hasIdentifier()) {
-      composeIdentifier("identifier", element.getIdentifier());
+      composeIdentifier("identifier", element.getIdentifierFirstRep());
     }
     if (element.hasVersionElement()) {
       composeString("version", element.getVersionElement());

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Account.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ActivityDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,7 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
  * This resource allows for the definition of some activity to be performed, independent of a particular patient, practitioner, or other performance context.
  */
 @ResourceDef(name="ActivityDefinition", profile="http://hl7.org/fhir/StructureDefinition/ActivityDefinition")
-public class ActivityDefinition extends DomainResource {
+public class ActivityDefinition extends CanonicalResource {
 
     public enum RequestResourceType {
         /**

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Address.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdministrableProductDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AdverseEvent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Age.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AllergyIntolerance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Annotation.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Appointment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AppointmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Attachment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/AuditEvent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BackboneElement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Basic.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Binary.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BiologicallyDerivedProduct.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/BodyStructure.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Bundle.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CapabilityStatement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -8717,39 +8717,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
     return ResourceType.CapabilityStatement;
    }
 
-  @Override
-  public List<Identifier> getIdentifier() {
-    return new ArrayList<>();
-  }
-
-  @Override
-  public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
-    return this;
-  }
-
-  @Override
-  public boolean hasIdentifier() {
-    return false;
-  }
-
-  @Override
-  public Identifier addIdentifier() {
-    return null;
-  }
-
-  @Override
-  public CanonicalResource addIdentifier(Identifier t) {
-    return null;
-  }
-
-  @Override
-  public Identifier getIdentifierFirstRep() {
-    return null;
-  }
-
-// Manual code (from Configuration.txt):
-
-// end addition
  /**
    * Search parameter: <b>fhirversion</b>
    * <p>
@@ -9662,5 +9629,39 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
 
+      @Override
+      public List<Identifier> getIdentifier() {
+        return new ArrayList<>();
+      }
+      
+      @Override
+      public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasIdentifier() {
+        return false;
+      }
+      
+      @Override
+      public Identifier addIdentifier() {
+	        return null;
+	      }
+	      
+      @Override
+      public CanonicalResource addIdentifier(Identifier t) {
+        return null;
+	      }
+      
+      @Override
+      public Identifier getIdentifierFirstRep() {
+        return new Identifier();
+      }
+      
+// Manual code (from Configuration.txt):
+
+// end addition
+
 }
 

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CarePlan.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CareTeam.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CatalogEntry.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItem.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ChargeItemDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Citation.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,7 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
  * The Citation Resource enables reference to any knowledge artifact for purposes of identification and attribution. The Citation Resource supports existing reference structures and developing publication practices such as versioning, expressing complex contributorship roles, and referencing computable resources.
  */
 @ResourceDef(name="Citation", profile="http://hl7.org/fhir/StructureDefinition/Citation")
-public class Citation extends DomainResource {
+public class Citation extends CanonicalResource {
 
     @Block()
     public static class CitationClassificationComponent extends BackboneElement implements IBaseBackboneElement {

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Claim.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClaimResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalImpression.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ClinicalUseDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeSystem.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeableConcept.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CodeableReference.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Coding.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Communication.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CommunicationRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CompartmentDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Wed, Dec 29, 2021 07:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -2177,130 +2177,132 @@ public class CompartmentDefinition extends CanonicalResource {
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
 
+      @Override
+      public String getCopyright() {
+        return new String();
+      }
+      
+      @Override
+      public MarkdownType getCopyrightElement() {
+        return new MarkdownType();
+      }
+      
+      @Override
+      public CanonicalResource setCopyright(String theCopyright) {
+        return this;
+      }
+      
+      @Override
+      public CanonicalResource setCopyrightElement(MarkdownType theCopyright) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasCopyright() {
+        return false;
+      }
+      
+      @Override
+      public boolean hasCopyrightElement() {
+        return false;
+      }
+      
+      
+      @Override
+      public List<Identifier> getIdentifier() {
+        return new ArrayList<>();
+      }
+      
+      @Override
+      public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasIdentifier() {
+        return false;
+      }
+      
+      @Override
+      public Identifier addIdentifier() {
+	        return null;
+	      }
+	      
+      @Override
+      public CanonicalResource addIdentifier(Identifier t) {
+        return null;
+	      }
+      
+      @Override
+      public Identifier getIdentifierFirstRep() {
+        return new Identifier();
+      }
+      
+      @Override
+      public String getTitle() {
+        return new String();
+      }
+      
+      @Override
+      public StringType getTitleElement() {
+        return new StringType();
+      }
+      
+      @Override
+      public CanonicalResource setTitle(String theTitle) {
+        return this;
+      }
+      
+      @Override
+      public CanonicalResource setTitleElement(StringType theTitle) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasTitle() {
+        return false;
+      }
+      
+      @Override
+      public boolean hasTitleElement() {
+        return false;
+      }
+      
+      
+      @Override
+      public List<CodeableConcept> getJurisdiction() {
+        return new ArrayList<>();
+      }
+      
+      @Override
+      public CanonicalResource setJurisdiction(List<CodeableConcept> theJurisdiction) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasJurisdiction() {
+        return false;
+      }
+      
+      @Override
+      public CodeableConcept addJurisdiction() {
+	        return null;
+	      }
+	      
+      @Override
+      public CanonicalResource addJurisdiction(CodeableConcept t) {
+        return null;
+	      }
+      
+      @Override
+      public CodeableConcept getJurisdictionFirstRep() {
+        return new CodeableConcept();
+      }
+      
 // Manual code (from Configuration.txt):
   public boolean supportsCopyright() {
     return false;
   }
-
-  @Override
-  public List<Identifier> getIdentifier() {
-    return new ArrayList<>();
-  }
-
-  @Override
-  public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
-    return this;
-  }
-
-  @Override
-  public boolean hasIdentifier() {
-    return false;
-  }
-
-  @Override
-  public Identifier addIdentifier() {
-    return new Identifier();
-  }
-
-  @Override
-  public CanonicalResource addIdentifier(Identifier t) {
-    return this;
-  }
-
-  @Override
-  public Identifier getIdentifierFirstRep() {
-    return new Identifier();
-  }
-
-  @Override
-  public StringType getTitleElement() {
-    return new StringType();
-  }
-
-  @Override
-  public boolean hasTitleElement() {
-    return false;
-  }
-
-  @Override
-  public boolean hasTitle() {
-    return false;
-  }
-
-  @Override
-  public CanonicalResource setTitleElement(StringType value) {
-    return this;
-  }
-
-  @Override
-  public String getTitle() {
-    return null;
-  }
-
-  @Override
-  public CanonicalResource setTitle(String value) {
-    return this;
-  }
-
-  @Override
-  public List<CodeableConcept> getJurisdiction() {
-    return new ArrayList<>();
-  }
-
-  @Override
-  public CanonicalResource setJurisdiction(List<CodeableConcept> theJurisdiction) {
-    return this;
-  }
-
-  @Override
-  public boolean hasJurisdiction() {
-    return false;
-  }
-
-  @Override
-  public CodeableConcept addJurisdiction() {
-    return new CodeableConcept();
-  }
-
-  @Override
-  public CanonicalResource addJurisdiction(CodeableConcept t) {
-    return this;
-  }
-
-  @Override
-  public CodeableConcept getJurisdictionFirstRep() {
-    return new CodeableConcept();
-  }
-
-  @Override
-  public MarkdownType getCopyrightElement() {
-    return new MarkdownType();
-  }
-
-  @Override
-  public boolean hasCopyrightElement() {
-    return false;
-  }
-
-  @Override
-  public boolean hasCopyright() {
-    return false;
-  }
-
-  @Override
-  public CanonicalResource setCopyrightElement(MarkdownType value) {
-    return this;
-  }
-
-  @Override
-  public String getCopyright() {
-    return null;
-  }
-
-  @Override
-  public CanonicalResource setCopyright(String value) {
-    return this;
-  }
   
 // end addition
 

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Composition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ConceptMap.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -2784,32 +2784,70 @@ public class ConceptMap extends CanonicalResource {
       return this;
     }
 
+    /**
+     * only one on this implementation
+     */
+    @Override
+    public int getIdentifierMax() { 
+      return 1;
+    }
     /**
      * @return {@link #identifier} (A formal identifier that is used to identify this concept map when it is represented in other formats, or referenced in a specification, model, design or an instance.)
      */
     public List<Identifier> getIdentifier() { 
-      if (this.identifier == null)
+      List<Identifier> list = new ArrayList<Identifier>();
-        if (Configuration.errorOnAutoCreate())
+      if (this.identifier == null) {
-          throw new Error("Attempt to auto-create ConceptMap.identifier");
+        list.add(identifier);
-        else if (Configuration.doAutoCreate())
+      }
-          this.identifier = new Identifier(); // cc
+      return list;
-      List<Identifier> result = new ArrayList<>();
+    }
-      result.add(this.identifier);
+
-      return result;
+    /**
+     * @return Returns a reference to <code>this</code> for easy method chaining
+     */
+    public ConceptMap setIdentifier(List<Identifier> theIdentifier) { 
+      if (theIdentifier.size() == 0) {
+        this.identifier = null;
+      } else if (theIdentifier.size() == 1) {
+        this.identifier = theIdentifier.get(0);
+      } else {
+        throw new Error("Cannot have more than one ConceptMap.identifier");
+      }
+      return this;
     }
 
     public boolean hasIdentifier() { 
       return this.identifier != null && !this.identifier.isEmpty();
     }
 
-    /**
+    public Identifier addIdentifier() { //3
-     * @param value {@link #identifier} (A formal identifier that is used to identify this concept map when it is represented in other formats, or referenced in a specification, model, design or an instance.)
+      if (this.identifier == null) {
-     */
+        this.identifier = new Identifier();
-    public ConceptMap setIdentifier(Identifier value) { 
+      } else {
-      this.identifier = value;
+        throw new Error("Cannot have more than one ConceptMap.identifier");
+      }
+      return this.identifier;
+    }
+
+    public ConceptMap addIdentifier(Identifier t) { //3
+      if (this.identifier == null) {
+        this.identifier = t;
+      } else {
+        throw new Error("Cannot have more than one ConceptMap.identifier");
+      }
       return this;
     }
 
+    /**
+     * @return The first repetition of repeating field {@link #identifier}, creating it if it does not already exist {3}
+     */
+    public Identifier getIdentifierFirstRep() { 
+      if (identifier == null) {
+        addIdentifier();
+      }
+      return identifier;
+    }
+
     /**
      * @return {@link #version} (The identifier that is used to identify this version of the concept map when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the concept map author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available. There is also no expectation that versions can be placed in a lexicographical sequence.). This is the underlying object with id, value and extensions. The accessor "getVersion" gives direct access to the value
      */
@@ -3797,7 +3835,7 @@ public class ConceptMap extends CanonicalResource {
       public Base makeProperty(int hash, String name) throws FHIRException {
         switch (hash) {
         case 116079:  return getUrlElement();
-        case -1618432855:  return getIdentifier().get(0);
+        case -1618432855:  return getIdentifierFirstRep();
         case 351608024:  return getVersionElement();
         case 3373707:  return getNameElement();
         case 110371416:  return getTitleElement();
@@ -4011,32 +4049,6 @@ public class ConceptMap extends CanonicalResource {
     return ResourceType.ConceptMap;
    }
 
-  @Override
-  public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
-    if (theIdentifier.size() == 0) {
-      this.identifier = null;
-    } else {
-      this.identifier = theIdentifier.get(0);
-    }
-    return this;
-  }
-
-  @Override
-  public Identifier addIdentifier() {
-    return getIdentifierFirstRep();
-  }
-
-  @Override
-  public CanonicalResource addIdentifier(Identifier t) {
-    this.identifier = t;
-    return this;
-  }
-
-  @Override
-  public Identifier getIdentifierFirstRep() {
-    return getIdentifier().get(0);
-  }
-
  /**
    * Search parameter: <b>dependson</b>
    * <p>
@@ -5037,5 +5049,6 @@ public class ConceptMap extends CanonicalResource {
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
 
+
 }
 

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Condition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Consent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Constants.java

@@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-snapshot1
 
 
 
@@ -41,6 +41,6 @@ public class Constants {
 
   public final static String VERSION = "4.3.0-snapshot1";
   public final static String VERSION_MM = "4.3";
-  public final static String DATE = "Fri, Dec 31, 2021 05:58+1100";
+  public final static String DATE = "Fri, Apr 22, 2022 11:20+1000";
   public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseDefinition|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceReport|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Media|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationStatement|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchDefinition|ResearchElementDefinition|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?";
 }

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactDetail.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ContactPoint.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contract.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Contributor.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Count.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Coverage.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/CoverageEligibilityResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataRequirement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DataType.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DetectedIssue.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Device.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceMetric.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DeviceUseStatement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DiagnosticReport.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Distance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DocumentManifest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DocumentReference.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/DomainResource.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Dosage.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Duration.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Element.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ElementDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Encounter.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Endpoint.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EnrollmentRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EnrollmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 
 import org.hl7.fhir.instance.model.api.*;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EpisodeOfCare.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EventDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,7 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
  * The EventDefinition resource provides a reusable description of when a particular event can occur.
  */
 @ResourceDef(name="EventDefinition", profile="http://hl7.org/fhir/StructureDefinition/EventDefinition")
-public class EventDefinition extends DomainResource {
+public class EventDefinition extends CanonicalResource {
 
     /**
      * An absolute URI that is used to identify this event definition when it is referenced in a specification, model, design or an instance; also called its canonical identifier. This SHOULD be globally unique and SHOULD be a literal address at which at which an authoritative instance of this event definition is (or will be) published. This URL can be the target of a canonical reference. It SHALL remain the same when the event definition is stored on different servers.

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Evidence.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceReport.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/EvidenceVariable.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/ExplanationOfBenefit.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Expression.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Extension.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/FamilyMemberHistory.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Flag.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Goal.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GraphDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -51,7 +51,7 @@ import ca.uhn.fhir.model.api.annotation.Block;
  * A formal computable definition of a graph of resources - that is, a coherent set of resources that form a graph by following references. The Graph Definition resource defines a set and makes rules about the set.
  */
 @ResourceDef(name="GraphDefinition", profile="http://hl7.org/fhir/StructureDefinition/GraphDefinition")
-public class GraphDefinition extends DomainResource {
+public class GraphDefinition extends CanonicalResource {
 
     public enum GraphCompartmentRule {
         /**
@@ -3663,6 +3663,98 @@ public class GraphDefinition extends DomainResource {
    */
   public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
 
+      @Override
+      public String getCopyright() {
+        return new String();
+      }
+      
+      @Override
+      public MarkdownType getCopyrightElement() {
+        return new MarkdownType();
+      }
+      
+      @Override
+      public CanonicalResource setCopyright(String theCopyright) {
+        return this;
+      }
+      
+      @Override
+      public CanonicalResource setCopyrightElement(MarkdownType theCopyright) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasCopyright() {
+        return false;
+      }
+      
+      @Override
+      public boolean hasCopyrightElement() {
+        return false;
+      }
+      
+      
+      @Override
+      public List<Identifier> getIdentifier() {
+        return new ArrayList<>();
+      }
+      
+      @Override
+      public CanonicalResource setIdentifier(List<Identifier> theIdentifier) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasIdentifier() {
+        return false;
+      }
+      
+      @Override
+      public Identifier addIdentifier() {
+	        return null;
+	      }
+	      
+      @Override
+      public CanonicalResource addIdentifier(Identifier t) {
+        return null;
+	      }
+      
+      @Override
+      public Identifier getIdentifierFirstRep() {
+        return new Identifier();
+      }
+      
+      @Override
+      public String getTitle() {
+        return new String();
+      }
+      
+      @Override
+      public StringType getTitleElement() {
+        return new StringType();
+      }
+      
+      @Override
+      public CanonicalResource setTitle(String theTitle) {
+        return this;
+      }
+      
+      @Override
+      public CanonicalResource setTitleElement(StringType theTitle) {
+        return this;
+      }
+      
+      @Override
+      public boolean hasTitle() {
+        return false;
+      }
+      
+      @Override
+      public boolean hasTitleElement() {
+        return false;
+      }
+      
+      
 // Manual code (from Configuration.txt):
   public boolean supportsCopyright() {
     return false;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Group.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/GuidanceResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HealthcareService.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;

org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/HumanName.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
   POSSIBILITY OF SUCH DAMAGE.
   */
 
-// Generated on Fri, Dec 31, 2021 05:58+1100 for FHIR v4.3.0-snapshot1
+// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
 
 import java.util.ArrayList;
 import java.util.Date;