From 415d8acc12dfbaa972bc97f304431b3692a75e6c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 16 Dec 2022 08:48:24 +1100 Subject: [PATCH] Add R5 snapshot3 to R4 versions enum --- .../resources40_50/Enumerations40_50.java | 6 ++++++ .../java/org/hl7/fhir/r4/model/Enumerations.java | 16 ++++++++++++++++ .../hl7/fhir/r5/model/PackageInformation.java | 7 +++++++ 3 files changed, 29 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 cf4d8b5a8..74d26d25c 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 @@ -248,6 +248,9 @@ public class Enumerations40_50 { case _5_0_0BALLOT: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0BALLOT); break; + case _5_0_0SNAPSHOT3: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT3); + break; default: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL); break; @@ -354,6 +357,9 @@ public class Enumerations40_50 { case _5_0_0BALLOT: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0BALLOT); break; + case _5_0_0SNAPSHOT3: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT3); + break; default: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL); 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 0e9db0277..1b8df2186 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 @@ -10154,6 +10154,10 @@ The primary difference between a medication statement and a medication administr * R5 Ballot. */ _5_0_0BALLOT, + /** + * R5Connectathon 32 release. + */ + _5_0_0SNAPSHOT3, /** * added to help the parsers */ @@ -10271,6 +10275,8 @@ The primary difference between a medication statement and a medication administr return _5_0_0SNAPSHOT2; if ("5.0.0-ballot".equals(codeString)) return _5_0_0BALLOT; + if ("5.0.0-snapshot3".equals(codeString)) + return _5_0_0SNAPSHOT3; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public static boolean isValidCode(String codeString) { @@ -10441,6 +10447,7 @@ The primary difference between a medication statement and a medication administr case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; case _5_0_0BALLOT: return "5.0.0-ballot"; + case _5_0_0SNAPSHOT3: return "5.0.0-snapshot3"; case NULL: return null; default: return "?"; } @@ -10502,6 +10509,7 @@ The primary difference between a medication statement and a medication administr case _5_0_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; case _5_0_0SNAPSHOT2: return "http://hl7.org/fhir/FHIR-version"; case _5_0_0BALLOT: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT3: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -10563,6 +10571,7 @@ The primary difference between a medication statement and a medication administr case _5_0_0SNAPSHOT1: return "R5 Preview #2."; case _5_0_0SNAPSHOT2: return "R5 Interim tooling stage."; case _5_0_0BALLOT: return "R5 Ballot."; + case _5_0_0SNAPSHOT3: return "R5 Connectathon 32 release."; case NULL: return null; default: return "?"; } @@ -10624,6 +10633,7 @@ The primary difference between a medication statement and a medication administr case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; case _5_0_0BALLOT: return "5.0.0-ballot"; + case _5_0_0SNAPSHOT3: return "5.0.0-snapshot3"; case NULL: return null; default: return "?"; } @@ -10741,6 +10751,8 @@ The primary difference between a medication statement and a medication administr return FHIRVersion._5_0_0SNAPSHOT2; if ("5.0.0-ballot".equals(codeString)) return FHIRVersion._5_0_0BALLOT; + if ("5.0.0-snapshot3".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT3; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -10861,6 +10873,8 @@ The primary difference between a medication statement and a medication administr return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT2); if ("5.0.0-ballot".equals(codeString)) return new Enumeration(this, FHIRVersion._5_0_0BALLOT); + if ("5.0.0-snapshot3".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT3); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -10974,6 +10988,8 @@ The primary difference between a medication statement and a medication administr return "5.0.0-snapshot2"; if (code == FHIRVersion._5_0_0BALLOT) return "5.0.0-ballot"; + if (code == FHIRVersion._5_0_0SNAPSHOT3) + return "5.0.0-snapshot3"; return "?"; } public String toSystem(FHIRVersion code) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackageInformation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackageInformation.java index 028fddb46..cecc024e5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackageInformation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackageInformation.java @@ -96,4 +96,11 @@ public class PackageInformation { public String toString() { return getVID(); } + + public String dense() { + if (id.startsWith("hl7.fhir")) { + return id.substring(9); + } + return id; + } }