From 63e97e6fa9c0d51a6ee8a1a7d34cca4f2fc5fb52 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Sat, 7 Mar 2020 14:26:10 +0100 Subject: [PATCH] fixed convertors calling Enumeration with deprecated constructor --- .../hl7/fhir/convertors/conv10_50/MedicationDispense10_50.java | 3 ++- .../convertors/conv30_50/MedicationAdministration30_50.java | 3 ++- .../convertors/conv40_50/MedicationAdministration40_50.java | 3 ++- .../hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java | 3 ++- .../fhir/convertors/conv40_50/MedicationKnowledge40_50.java | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationDispense10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationDispense10_50.java index 7aafac6f7..79bdd9196 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationDispense10_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationDispense10_50.java @@ -4,6 +4,7 @@ import org.hl7.fhir.convertors.VersionConvertor_10_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.Dosage; import org.hl7.fhir.r5.model.Dosage.DosageDoseAndRateComponent; +import org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseStatusCodesEnumFactory; public class MedicationDispense10_50 { @@ -127,7 +128,7 @@ public class MedicationDispense10_50 { public static org.hl7.fhir.r5.model.Enumeration convertMedicationDispenseStatus(org.hl7.fhir.dstu2.model.Enumeration src) throws FHIRException { if (src == null) return null; - org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration(); + org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new MedicationDispenseStatusCodesEnumFactory()); VersionConvertor_10_50.copyElement(src, tgt); switch(src.getValue()) { case COMPLETED: diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java index 0637cebce..061b72a28 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationAdministration30_50.java @@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv30_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeableReference; +import org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodesEnumFactory; public class MedicationAdministration30_50 { @@ -139,7 +140,7 @@ public class MedicationAdministration30_50 { static public org.hl7.fhir.r5.model.Enumeration convertMedicationAdministrationStatus(org.hl7.fhir.dstu3.model.Enumeration src) { if (src == null) return null; - org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration(); + org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new MedicationAdministrationStatusCodesEnumFactory()); VersionConvertor_30_50.copyElement(src, tgt); tgt.setValue(org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodes.fromCode(src.getValueAsString())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java index eeff0d742..f5e09ddd3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java @@ -25,6 +25,7 @@ import org.hl7.fhir.r4.model.CodeType; import org.hl7.fhir.r5.model.CodeableReference; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodes; +import org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodesEnumFactory; /* Copyright (c) 2011+, HL7, Inc. @@ -141,7 +142,7 @@ public class MedicationAdministration40_50 extends VersionConvertor_40_50 { private static Enumeration convertMedicationAdministrationStatus(CodeType src) { if (src == null) return null; - Enumeration tgt = new Enumeration(); + Enumeration tgt = new Enumeration<>(new MedicationAdministrationStatusCodesEnumFactory()); copyElement(src, tgt); tgt.setValue(MedicationAdministrationStatusCodes.fromCode(src.getCode())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java index 1fc91144a..421bc5b71 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java @@ -23,6 +23,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.CodeType; import org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseStatusCodes; +import org.hl7.fhir.r5.model.MedicationDispense.MedicationDispenseStatusCodesEnumFactory; /* Copyright (c) 2011+, HL7, Inc. @@ -162,7 +163,7 @@ public class MedicationDispense40_50 extends VersionConvertor_40_50 { private static org.hl7.fhir.r5.model.Enumeration convertMedicationStatus(org.hl7.fhir.r4.model.CodeType src) { if (src == null) return null; - org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration(); + org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new MedicationDispenseStatusCodesEnumFactory()); copyElement(src, tgt); if (src.hasCode()) tgt.setValue(MedicationDispenseStatusCodes.fromCode(src.getCode())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java index dd4a089e6..56180669c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java @@ -24,6 +24,7 @@ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r4.model.CodeType; import org.hl7.fhir.r5.model.Enumeration; import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodes; +import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory; /* Copyright (c) 2011+, HL7, Inc. @@ -148,7 +149,7 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 { private static Enumeration convertMedicationKnowledgeStatus(CodeType src) { if (src == null) return null; - org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration(); + org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new MedicationKnowledgeStatusCodesEnumFactory()); copyElement(src, tgt); tgt.setValue(MedicationKnowledgeStatusCodes.fromCode(src.getCode())); return tgt;