From 4cc0a8dfba485fd63d5db55472a0f2a06dd15e3e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 27 May 2022 22:17:32 +1000 Subject: [PATCH] Add support for 4.3.0 --- .../resources40_50/Enumerations40_50.java | 6 ++++++ .../java/org/hl7/fhir/r4/model/Enumerations.java | 13 +++++++++++++ .../org/hl7/fhir/r4b/model/Enumerations.java | 16 ++++++++++++++++ .../java/org/hl7/fhir/r5/model/Enumerations.java | 16 ++++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java index eb3430632..b519517fb 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java @@ -233,6 +233,9 @@ public class Enumerations40_50 { case _4_3_0_SNAPSHOT1: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0SNAPSHOT1); break; + case _4_3_0: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0); + break; default: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL); break; @@ -324,6 +327,9 @@ public class Enumerations40_50 { case _4_3_0SNAPSHOT1: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_SNAPSHOT1); break; + case _4_3_0: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0); + break; default: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL); break; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java index 09d93a8cb..5e85cd4bd 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java @@ -10038,6 +10038,7 @@ The primary difference between a medication statement and a medication administr _4_1_0, _4_3_0_SNAPSHOT1, _4_3_0_CIBUILD, + _4_3_0, NULL; public static FHIRVersion fromCode(String codeString) throws FHIRException { if (codeString == null || "".equals(codeString)) @@ -10094,6 +10095,8 @@ The primary difference between a medication statement and a medication administr return _4_3_0_SNAPSHOT1; if ("4.3.0-cibuild".equals(codeString)) return _4_3_0_CIBUILD; + if ("4.3.0".equals(codeString)) + return _4_3_0; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } @Override @@ -10128,6 +10131,7 @@ The primary difference between a medication statement and a medication administr case _4_1_0: return "4.1.0"; case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0_CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case NULL: return null; default: return "?"; @@ -10161,6 +10165,7 @@ The primary difference between a medication statement and a medication administr case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0_SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0_CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -10193,6 +10198,7 @@ The primary difference between a medication statement and a medication administr case _4_1_0: return "FHIR Release 4B Ballot #1"; case _4_3_0_SNAPSHOT1: return "FHIR Release 4B Snapshot #1"; case _4_3_0_CIBUILD: return "FHIR Release 4B CI-Builld"; + case _4_3_0: return "FHIR Release 4B"; case NULL: return null; default: return "?"; } @@ -10225,6 +10231,7 @@ The primary difference between a medication statement and a medication administr case _4_1_0: return "4.1.0"; case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot"; case _4_3_0_CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case NULL: return null; default: return "?"; } @@ -10294,6 +10301,8 @@ The primary difference between a medication statement and a medication administr return FHIRVersion._4_3_0_SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0_CIBUILD; + if ("4.3.0".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -10356,6 +10365,8 @@ The primary difference between a medication statement and a medication administr return new Enumeration(this, FHIRVersion._4_3_0_SNAPSHOT1); if ("4.3.0-cibuild".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3_0_CIBUILD); + if ("4.3.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -10411,6 +10422,8 @@ The primary difference between a medication statement and a medication administr return "4.3.0-snapshot1"; if (code == FHIRVersion._4_3_0_CIBUILD) return "4.3.0-cibuild"; + if (code == FHIRVersion._4_3_0) + return "4.3.0"; return "?"; } public String toSystem(FHIRVersion code) { diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java index e2270b2e0..4bcd3cca1 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java @@ -6112,6 +6112,10 @@ The primary difference between a medication statement and a medication administr * FHIR Release 4B CI-Build. */ _4_3_0CIBUILD, + /** + * FHIR Release 4B + */ + _4_3_0, /** * added to help the parsers */ @@ -6173,6 +6177,8 @@ The primary difference between a medication statement and a medication administr return _4_3_0SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return _4_3_0CIBUILD; + if ("4.3.0".equalsIgnoreCase(codeString)) + return _4_3_0; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode() { @@ -6204,6 +6210,7 @@ The primary difference between a medication statement and a medication administr case _4_2_0: return "4.2.0"; case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case NULL: return null; default: return "?"; } @@ -6237,6 +6244,7 @@ The primary difference between a medication statement and a medication administr case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -6270,6 +6278,7 @@ The primary difference between a medication statement and a medication administr case _4_2_0: return "FHIR Release 5 Draft #1."; case _4_3_0SNAPSHOT1: return "FHIR Release 4B Snapshot #1."; case _4_3_0CIBUILD: return "FHIR Release 4B CI-Build."; + case _4_3_0: return "FHIR Release 4B"; case NULL: return null; default: return "?"; } @@ -6303,6 +6312,7 @@ The primary difference between a medication statement and a medication administr case _4_2_0: return "4.2.0"; case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case NULL: return null; default: return "?"; } @@ -6438,6 +6448,8 @@ public String toCode(int len) { return FHIRVersion._4_3_0SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0CIBUILD; + if ("4.3.0".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -6502,6 +6514,8 @@ public String toCode(int len) { return new Enumeration(this, FHIRVersion._4_3_0SNAPSHOT1); if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return new Enumeration(this, FHIRVersion._4_3_0CIBUILD); + if ("4.3.0".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -6559,6 +6573,8 @@ public String toCode(int len) { return "4.3.0-snapshot1"; if (code == FHIRVersion._4_3_0CIBUILD) return "4.3.0-cibuild"; + if (code == FHIRVersion._4_3_0) + return "4.3.0"; return "?"; } public String toSystem(FHIRVersion code) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java index 6dd2229df..96129e7e1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java @@ -6847,6 +6847,10 @@ The primary difference between a medicationusage and a medicationadministration * R4B Rolling CI-Build. */ _4_3_0CIBUILD, + /** + * R4B Release + */ + _4_3_0, /** * R5 Preview #2. */ @@ -6928,6 +6932,8 @@ The primary difference between a medicationusage and a medicationadministration return _4_3_0SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return _4_3_0CIBUILD; + if ("4.3.0".equalsIgnoreCase(codeString)) + return _4_3_0; if ("4.4.0".equals(codeString)) return _4_4_0; if ("4.5.0".equals(codeString)) @@ -6969,6 +6975,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_2_0: return "4.2.0"; case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case _4_4_0: return "4.4.0"; case _4_5_0: return "4.5.0"; case _4_6_0: return "4.6.0"; @@ -7007,6 +7014,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0: return "http://hl7.org/fhir/FHIR-version"; case _4_4_0: return "http://hl7.org/fhir/FHIR-version"; case _4_5_0: return "http://hl7.org/fhir/FHIR-version"; case _4_6_0: return "http://hl7.org/fhir/FHIR-version"; @@ -7045,6 +7053,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_2_0: return "R5 Preview #1."; case _4_3_0SNAPSHOT1: return "R4B Snapshot #1."; case _4_3_0CIBUILD: return "R4B Rolling CI-Build."; + case _4_3_0: return "FHIR Release 4B"; case _4_4_0: return "R5 Preview #2."; case _4_5_0: return "R5 Preview #3."; case _4_6_0: return "R5 Draft Ballot."; @@ -7083,6 +7092,7 @@ The primary difference between a medicationusage and a medicationadministration case _4_2_0: return "4.2.0"; case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3_0: return "4.3.0"; case _4_4_0: return "4.4.0"; case _4_5_0: return "4.5.0"; case _4_6_0: return "4.6.0"; @@ -7223,6 +7233,8 @@ public String toCode(int len) { return FHIRVersion._4_3_0SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0CIBUILD; + if ("4.3.0".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0; if ("4.4.0".equals(codeString)) return FHIRVersion._4_4_0; if ("4.5.0".equals(codeString)) @@ -7297,6 +7309,8 @@ public String toCode(int len) { return new Enumeration(this, FHIRVersion._4_3_0SNAPSHOT1); if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return new Enumeration(this, FHIRVersion._4_3_0CIBUILD); + if ("4.3.0".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0); if ("4.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_4_0); if ("4.5.0".equals(codeString)) @@ -7364,6 +7378,8 @@ public String toCode(int len) { return "4.3.0-snapshot1"; if (code == FHIRVersion._4_3_0CIBUILD) return "4.3.0-cibuild"; + if (code == FHIRVersion._4_3_0) + return "4.3.0"; if (code == FHIRVersion._4_4_0) return "4.4.0"; if (code == FHIRVersion._4_5_0)