From 52187af17a8ad823154c437d3d9482c9941b03ea Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 1 Nov 2019 11:21:06 +1100 Subject: [PATCH] Fix for R3 and R4 technical corrections and getting IGs publishing and passing (and fix version markers) --- .../convertors/VersionConvertor_10_50.java | 4 +- .../convertors/conv40_50/Enumerations.java | 4 + .../misc/CountryCodesConverter.java | 9 +- .../hl7/fhir/dstu3/formats/JsonParser.java | 2 +- .../org/hl7/fhir/dstu3/formats/RdfParser.java | 2 +- .../org/hl7/fhir/dstu3/formats/XmlParser.java | 2 +- .../org/hl7/fhir/dstu3/model/Account.java | 2 +- .../fhir/dstu3/model/ActivityDefinition.java | 2 +- .../org/hl7/fhir/dstu3/model/Address.java | 2 +- .../hl7/fhir/dstu3/model/AdverseEvent.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Age.java | 2 +- .../fhir/dstu3/model/AllergyIntolerance.java | 2 +- .../org/hl7/fhir/dstu3/model/Annotation.java | 2 +- .../org/hl7/fhir/dstu3/model/Appointment.java | 2 +- .../fhir/dstu3/model/AppointmentResponse.java | 2 +- .../org/hl7/fhir/dstu3/model/Attachment.java | 2 +- .../org/hl7/fhir/dstu3/model/AuditEvent.java | 2 +- .../hl7/fhir/dstu3/model/BackboneElement.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Basic.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Binary.java | 2 +- .../org/hl7/fhir/dstu3/model/BodySite.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Bundle.java | 2 +- .../fhir/dstu3/model/CapabilityStatement.java | 2 +- .../org/hl7/fhir/dstu3/model/CarePlan.java | 2 +- .../org/hl7/fhir/dstu3/model/CareTeam.java | 2 +- .../org/hl7/fhir/dstu3/model/ChargeItem.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Claim.java | 2 +- .../hl7/fhir/dstu3/model/ClaimResponse.java | 2 +- .../fhir/dstu3/model/ClinicalImpression.java | 2 +- .../org/hl7/fhir/dstu3/model/CodeSystem.java | 2 +- .../hl7/fhir/dstu3/model/CodeableConcept.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Coding.java | 2 +- .../hl7/fhir/dstu3/model/Communication.java | 2 +- .../dstu3/model/CommunicationRequest.java | 2 +- .../dstu3/model/CompartmentDefinition.java | 2 +- .../org/hl7/fhir/dstu3/model/Composition.java | 2 +- .../org/hl7/fhir/dstu3/model/ConceptMap.java | 2 +- .../org/hl7/fhir/dstu3/model/Condition.java | 2 +- .../org/hl7/fhir/dstu3/model/Consent.java | 2 +- .../org/hl7/fhir/dstu3/model/Constants.java | 4 +- .../hl7/fhir/dstu3/model/ContactDetail.java | 2 +- .../hl7/fhir/dstu3/model/ContactPoint.java | 2 +- .../org/hl7/fhir/dstu3/model/Contract.java | 2 +- .../org/hl7/fhir/dstu3/model/Contributor.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Count.java | 2 +- .../org/hl7/fhir/dstu3/model/Coverage.java | 2 +- .../org/hl7/fhir/dstu3/model/DataElement.java | 2 +- .../hl7/fhir/dstu3/model/DataRequirement.java | 2 +- .../hl7/fhir/dstu3/model/DetectedIssue.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Device.java | 2 +- .../hl7/fhir/dstu3/model/DeviceComponent.java | 2 +- .../hl7/fhir/dstu3/model/DeviceMetric.java | 2 +- .../hl7/fhir/dstu3/model/DeviceRequest.java | 2 +- .../fhir/dstu3/model/DeviceUseStatement.java | 2 +- .../fhir/dstu3/model/DiagnosticReport.java | 2 +- .../org/hl7/fhir/dstu3/model/Distance.java | 2 +- .../fhir/dstu3/model/DocumentManifest.java | 2 +- .../fhir/dstu3/model/DocumentReference.java | 2 +- .../hl7/fhir/dstu3/model/DomainResource.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Dosage.java | 2 +- .../org/hl7/fhir/dstu3/model/Duration.java | 2 +- .../org/hl7/fhir/dstu3/model/Element.java | 2 +- .../fhir/dstu3/model/ElementDefinition.java | 2 +- .../fhir/dstu3/model/EligibilityRequest.java | 2 +- .../fhir/dstu3/model/EligibilityResponse.java | 2 +- .../org/hl7/fhir/dstu3/model/Encounter.java | 2 +- .../org/hl7/fhir/dstu3/model/Endpoint.java | 2 +- .../fhir/dstu3/model/EnrollmentRequest.java | 2 +- .../fhir/dstu3/model/EnrollmentResponse.java | 2 +- .../hl7/fhir/dstu3/model/EpisodeOfCare.java | 2 +- .../fhir/dstu3/model/ExpansionProfile.java | 2 +- .../dstu3/model/ExplanationOfBenefit.java | 2 +- .../org/hl7/fhir/dstu3/model/Extension.java | 2 +- .../fhir/dstu3/model/FamilyMemberHistory.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Flag.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Goal.java | 2 +- .../hl7/fhir/dstu3/model/GraphDefinition.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Group.java | 2 +- .../fhir/dstu3/model/GuidanceResponse.java | 2 +- .../fhir/dstu3/model/HealthcareService.java | 2 +- .../org/hl7/fhir/dstu3/model/HumanName.java | 2 +- .../org/hl7/fhir/dstu3/model/Identifier.java | 2 +- .../hl7/fhir/dstu3/model/ImagingManifest.java | 2 +- .../hl7/fhir/dstu3/model/ImagingStudy.java | 2 +- .../hl7/fhir/dstu3/model/Immunization.java | 2 +- .../model/ImmunizationRecommendation.java | 2 +- .../fhir/dstu3/model/ImplementationGuide.java | 18 ++-- .../org/hl7/fhir/dstu3/model/Library.java | 2 +- .../org/hl7/fhir/dstu3/model/Linkage.java | 2 +- .../hl7/fhir/dstu3/model/ListResource.java | 2 +- .../org/hl7/fhir/dstu3/model/Location.java | 2 +- .../org/hl7/fhir/dstu3/model/Measure.java | 2 +- .../hl7/fhir/dstu3/model/MeasureReport.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Media.java | 2 +- .../org/hl7/fhir/dstu3/model/Medication.java | 2 +- .../dstu3/model/MedicationAdministration.java | 2 +- .../fhir/dstu3/model/MedicationDispense.java | 2 +- .../fhir/dstu3/model/MedicationRequest.java | 2 +- .../fhir/dstu3/model/MedicationStatement.java | 2 +- .../fhir/dstu3/model/MessageDefinition.java | 2 +- .../hl7/fhir/dstu3/model/MessageHeader.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Meta.java | 2 +- .../fhir/dstu3/model/MetadataResource.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Money.java | 2 +- .../hl7/fhir/dstu3/model/NamingSystem.java | 2 +- .../org/hl7/fhir/dstu3/model/Narrative.java | 2 +- .../hl7/fhir/dstu3/model/NutritionOrder.java | 2 +- .../org/hl7/fhir/dstu3/model/Observation.java | 2 +- .../fhir/dstu3/model/OperationDefinition.java | 2 +- .../fhir/dstu3/model/OperationOutcome.java | 2 +- .../hl7/fhir/dstu3/model/Organization.java | 2 +- .../fhir/dstu3/model/ParameterDefinition.java | 2 +- .../org/hl7/fhir/dstu3/model/Parameters.java | 2 +- .../org/hl7/fhir/dstu3/model/Patient.java | 2 +- .../hl7/fhir/dstu3/model/PaymentNotice.java | 2 +- .../dstu3/model/PaymentReconciliation.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Period.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Person.java | 2 +- .../hl7/fhir/dstu3/model/PlanDefinition.java | 2 +- .../hl7/fhir/dstu3/model/Practitioner.java | 2 +- .../fhir/dstu3/model/PractitionerRole.java | 2 +- .../org/hl7/fhir/dstu3/model/Procedure.java | 2 +- .../fhir/dstu3/model/ProcedureRequest.java | 2 +- .../hl7/fhir/dstu3/model/ProcessRequest.java | 2 +- .../hl7/fhir/dstu3/model/ProcessResponse.java | 2 +- .../org/hl7/fhir/dstu3/model/Provenance.java | 2 +- .../org/hl7/fhir/dstu3/model/Quantity.java | 2 +- .../hl7/fhir/dstu3/model/Questionnaire.java | 2 +- .../dstu3/model/QuestionnaireResponse.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Range.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Ratio.java | 2 +- .../org/hl7/fhir/dstu3/model/Reference.java | 2 +- .../hl7/fhir/dstu3/model/ReferralRequest.java | 2 +- .../hl7/fhir/dstu3/model/RelatedArtifact.java | 2 +- .../hl7/fhir/dstu3/model/RelatedPerson.java | 2 +- .../hl7/fhir/dstu3/model/RequestGroup.java | 2 +- .../hl7/fhir/dstu3/model/ResearchStudy.java | 2 +- .../hl7/fhir/dstu3/model/ResearchSubject.java | 2 +- .../org/hl7/fhir/dstu3/model/Resource.java | 2 +- .../hl7/fhir/dstu3/model/ResourceFactory.java | 2 +- .../hl7/fhir/dstu3/model/ResourceType.java | 2 +- .../hl7/fhir/dstu3/model/RiskAssessment.java | 2 +- .../org/hl7/fhir/dstu3/model/SampledData.java | 2 +- .../org/hl7/fhir/dstu3/model/Schedule.java | 2 +- .../hl7/fhir/dstu3/model/SearchParameter.java | 2 +- .../org/hl7/fhir/dstu3/model/Sequence.java | 2 +- .../fhir/dstu3/model/ServiceDefinition.java | 2 +- .../org/hl7/fhir/dstu3/model/Signature.java | 2 +- .../hl7/fhir/dstu3/model/SimpleQuantity.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Slot.java | 2 +- .../org/hl7/fhir/dstu3/model/Specimen.java | 2 +- .../fhir/dstu3/model/StructureDefinition.java | 18 ++-- .../hl7/fhir/dstu3/model/StructureMap.java | 2 +- .../hl7/fhir/dstu3/model/Subscription.java | 2 +- .../org/hl7/fhir/dstu3/model/Substance.java | 2 +- .../hl7/fhir/dstu3/model/SupplyDelivery.java | 2 +- .../hl7/fhir/dstu3/model/SupplyRequest.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Task.java | 2 +- .../org/hl7/fhir/dstu3/model/TestReport.java | 2 +- .../org/hl7/fhir/dstu3/model/TestScript.java | 2 +- .../java/org/hl7/fhir/dstu3/model/Timing.java | 2 +- .../fhir/dstu3/model/TriggerDefinition.java | 2 +- .../hl7/fhir/dstu3/model/UsageContext.java | 2 +- .../org/hl7/fhir/dstu3/model/ValueSet.java | 2 +- .../fhir/dstu3/model/VisionPrescription.java | 2 +- .../org/hl7/fhir/r4/model/Enumerations.java | 16 ++++ .../hl7/fhir/r4/model/FhirPublication.java | 6 +- .../hl7/fhir/r5/model/FhirPublication.java | 23 ++--- .../hl7/fhir/r5/test/utils/ToolsHelper.java | 2 + .../java/org/hl7/fhir/r5/utils/Version.java | 2 + .../hl7/fhir/utilities/VersionUtilities.java | 94 +++++++++++++++++++ .../hl7/fhir/utilities/cache/NpmPackage.java | 1 + .../utilities/cache/PackageCacheManager.java | 11 ++- .../fhir/r5/validation/InstanceValidator.java | 3 +- .../r5/validation/NativeHostServices.java | 15 ++- .../fhir/r5/validation/ValidationEngine.java | 2 +- .../org/hl7/fhir/r5/validation/Validator.java | 5 +- 177 files changed, 347 insertions(+), 208 deletions(-) create mode 100644 org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java index 1f5d47673..49a8bef67 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java @@ -7271,7 +7271,9 @@ public class VersionConvertor_10_50 { else tgt.addUseContext(convertCodeableConceptToUsageContext(t)); tgt.setCopyright(src.getCopyright()); - tgt.addFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); + if (src.hasFhirVersion()) { + tgt.addFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); + } for (org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuideDependencyComponent t : src.getDependency()) tgt.addDependsOn(convertImplementationGuideDependencyComponent(t)); for (org.hl7.fhir.dstu2.model.ImplementationGuide.ImplementationGuidePackageComponent t : src.getPackage()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations.java index 762b75182..ad16ab097 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations.java @@ -130,9 +130,11 @@ public class Enumerations extends VersionConvertor_40_50 { case _1_8_0: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._1_8_0; case _3_0_0: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._3_0_0; case _3_0_1: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._3_0_1; + case _3_0_2: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._3_0_2; case _3_3_0: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._3_3_0; case _3_5_0: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._3_5_0; case _4_0_0: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_0_0; + case _4_0_1: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_0_1; default: return org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL; } } @@ -159,9 +161,11 @@ public class Enumerations extends VersionConvertor_40_50 { case _1_8_0: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._1_8_0; case _3_0_0: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._3_0_0; case _3_0_1: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._3_0_1; + case _3_0_2: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._3_0_2; case _3_3_0: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._3_3_0; case _3_5_0: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._3_5_0; case _4_0_0: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_0_0; + case _4_0_1: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_0_1; default: return org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL; } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CountryCodesConverter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CountryCodesConverter.java index 6b3c07ef6..672005cd9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CountryCodesConverter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CountryCodesConverter.java @@ -119,10 +119,11 @@ public class CountryCodesConverter { } cs1.setCount(cs1.getConcept().size()); cs2.setCount(cs2.getConcept().size()); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "4.0.0", "package", "CodeSstem-iso3166.json")), cs1); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "3.0.1", "package", "CodeSstem-iso3166.json")), cs1); // format hasn't changed - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "4.0.0", "package", "CodeSstem-iso3166-2.json")), cs2); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "3.0.1", "package", "CodeSstem-iso3166-2.json")), cs2); // format hasn't changed + throw new Error("Needs revisiting"); +// new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "4.0.1", "package", "CodeSstem-iso3166.json")), cs1); +// new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "3.0.2", "package", "CodeSstem-iso3166.json")), cs1); // format hasn't changed +// new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "4.0.1", "package", "CodeSstem-iso3166-2.json")), cs2); +// new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "3.0.2", "package", "CodeSstem-iso3166-2.json")), cs2); // format hasn't changed } public void setMetadata(Document src, CodeSystem cs, String id, String url, String partName, String partTitle) { diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/JsonParser.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/JsonParser.java index 4350ecff9..47b021649 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/JsonParser.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/JsonParser.java @@ -51,7 +51,7 @@ import java.io.IOException; */ -// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.1 +// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.x import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.utilities.Utilities; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/RdfParser.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/RdfParser.java index 429a06910..38faf5179 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/RdfParser.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/RdfParser.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.formats; */ -// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.1 +// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.x import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.dstu3.utils.formats.Turtle.Complex; import org.hl7.fhir.utilities.Utilities; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/XmlParser.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/XmlParser.java index 2c2f1dc47..5b996e70b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/XmlParser.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/XmlParser.java @@ -51,7 +51,7 @@ import java.io.IOException; */ -// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.1 +// Generated on Mon, Apr 17, 2017 08:38+1000 for FHIR v3.0.x import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.utilities.Utilities; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java index d206e8eef..047341bfd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java index 2ba2d0888..01adf6986 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ActivityDefinition.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java index b2877b72b..9f1479e8c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java index bdafdafc3..928103f79 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AdverseEvent.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java index 7f76fe645..0e08afded 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java index 231fd3aad..b1c2a48af 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java index 772c3b25e..52dba8387 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java index 0cd877970..2f565b679 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java index f23cac035..383dd1388 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java index cefce48b0..209ac7069 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java index c01732eb9..14bb0ec5f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java index 41b5e563f..aa863dd70 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java index 7d00455b7..2f9715004 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java index f81ea668f..3b992cc34 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java index 55e514f1b..54cd91c87 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java index 12a6cc3e0..104c95ce5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java index 0718b4983..d376b7ca9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CapabilityStatement.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java index 311fd6988..f4a909e57 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java index 2ed4991fb..56b6bc37e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CareTeam.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java index 4fcc631ae..3b93aa945 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ChargeItem.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java index a53daab2a..bb86651ea 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java index adc39f827..0354beb01 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java index 0192b51d0..7e65ef421 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java index 698cdc046..44c7cf6dc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java index 142cd96d2..dc6fcd1cd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java index 9f298d2c5..bfe2eb6ed 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java index 81d80f1b7..14cc1fb78 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java index f40f802a9..8995cb4a0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java index 8bfbd5369..d96be87c9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/CompartmentDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java index 2fff69858..b870ed43c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java index bce039a89..e84c9ad52 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java index 702d346f7..ee2d19b60 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java index 3610ea031..aa971ef99 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Consent.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java index 62a72d46f..ec7e3ebb5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java @@ -50,12 +50,12 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x public class Constants { - public final static String VERSION = "3.0.1"; + public final static String VERSION = "3.0.2"; public final static String REVISION = "12956"; public final static String DATE = "Fri Mar 16 15:21:19 AEDT 2018"; } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactDetail.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactDetail.java index 3a6454a48..ddc2a079a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactDetail.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactDetail.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java index 63c54af92..c2c6f4f3e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java index f95b0aecb..486868d1b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java index 723b0cd32..f14b8c51d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contributor.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java index 5622b8fef..f5e406430 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java index f565a5a53..5b915c346 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java index 6bab4d008..b0fd7ae33 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataRequirement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataRequirement.java index 24c701156..51646880c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataRequirement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataRequirement.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java index f4ac5899a..cccb50547 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java index f9d2f8ccc..ae0b46920 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java index 1b4fbd7d8..fe0c6317e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java index 3ca77753f..bca6ab97d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java index 058a62e29..5c1c21601 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceRequest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java index 3ca3597f6..939d7dcf2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java index af859c954..6bdfbe95c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java index 9adad7870..1deb60d18 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java index ed7dc66c7..6e2ff5706 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java index dde5eed75..21767c0d2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java index 36e6f5bb2..bd3ac10ad 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Dosage.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Dosage.java index d830ded97..11fcff534 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Dosage.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Dosage.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java index b4c0dde46..187adf80a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java index 85cff86f9..143982e56 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java index 9ee5da8d8..a269c0a4c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java index 483f82740..539d89fde 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java index 8ffec8ab1..4dab9bac9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java index 6b6bdab19..f8efe7896 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java index 06e8a246e..0bb3f6e5d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Endpoint.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java index dcc19acf7..b3e5f60a5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java index 736330a84..96c1422ef 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java index c2eef6e56..9d5dea639 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java index 5221673a6..1618c5884 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java index 719e50388..acff42cb8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java index 80d73a611..c5f69d8fb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java index 652e5613f..3e0588ffd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/FamilyMemberHistory.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java index 6da60806e..d5b198487 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Flag.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java index b340eb019..d27e917e1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Goal.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java index 42a6c0b7d..3810a5f87 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GraphDefinition.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java index f22cfb6b7..123ee865d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Group.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java index fc23433a5..417f18773 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/GuidanceResponse.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java index f09341444..3afca4a70 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HealthcareService.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java index 3d5988a23..c1be5811a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/HumanName.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java index badd534c5..2b83a8e84 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Identifier.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingManifest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingManifest.java index 2a6dbdc32..b5d6e0776 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingManifest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingManifest.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java index a1ffc2cf8..b6afd3000 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImagingStudy.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java index e09f05c48..97bd8a4bd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Immunization.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java index 9ab32eee2..6f817048d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImmunizationRecommendation.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java index f62604082..b402365b9 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ImplementationGuide.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -2380,10 +2380,10 @@ public class ImplementationGuide extends MetadataResource { protected MarkdownType copyright; /** - * The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ @Child(name = "fhirVersion", type = {IdType.class}, order=1, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version." ) + @Description(shortDefinition="FHIR Version this Implementation Guide targets", formalDefinition="The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version." ) protected IdType fhirVersion; /** @@ -3025,7 +3025,7 @@ public class ImplementationGuide extends MetadataResource { } /** - * @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @return {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public IdType getFhirVersionElement() { if (this.fhirVersion == null) @@ -3045,7 +3045,7 @@ public class ImplementationGuide extends MetadataResource { } /** - * @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @param value {@link #fhirVersion} (The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public ImplementationGuide setFhirVersionElement(IdType value) { this.fhirVersion = value; @@ -3053,14 +3053,14 @@ public class ImplementationGuide extends MetadataResource { } /** - * @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * @return The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ public String getFhirVersion() { return this.fhirVersion == null ? null : this.fhirVersion.getValue(); } /** - * @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * @param value The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ public ImplementationGuide setFhirVersion(String value) { if (Utilities.noString(value)) @@ -3331,7 +3331,7 @@ public class ImplementationGuide extends MetadataResource { children.add(new Property("useContext", "UsageContext", "The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching for appropriate implementation guide instances.", 0, java.lang.Integer.MAX_VALUE, useContext)); children.add(new Property("jurisdiction", "CodeableConcept", "A legal or geographic region in which the implementation guide is intended to be used.", 0, java.lang.Integer.MAX_VALUE, jurisdiction)); children.add(new Property("copyright", "markdown", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the implementation guide.", 0, 1, copyright)); - children.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.", 0, 1, fhirVersion)); + children.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.", 0, 1, fhirVersion)); children.add(new Property("dependency", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc.defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependency)); children.add(new Property("package", "", "A logical group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, package_)); children.add(new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global)); @@ -3354,7 +3354,7 @@ public class ImplementationGuide extends MetadataResource { case -669707736: /*useContext*/ return new Property("useContext", "UsageContext", "The content was developed with a focus and intent of supporting the contexts that are listed. These terms may be used to assist with indexing and searching for appropriate implementation guide instances.", 0, java.lang.Integer.MAX_VALUE, useContext); case -507075711: /*jurisdiction*/ return new Property("jurisdiction", "CodeableConcept", "A legal or geographic region in which the implementation guide is intended to be used.", 0, java.lang.Integer.MAX_VALUE, jurisdiction); case 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the implementation guide and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the implementation guide.", 0, 1, copyright); - case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.", 0, 1, fhirVersion); + case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "id", "The version of the FHIR specification on which this ImplementationGuide is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.", 0, 1, fhirVersion); case -26291381: /*dependency*/ return new Property("dependency", "", "Another implementation guide that this implementation depends on. Typically, an implementation guide uses value sets, profiles etc.defined in other implementation guides.", 0, java.lang.Integer.MAX_VALUE, dependency); case -807062458: /*package*/ return new Property("package", "", "A logical group of resources. Logical groups can be used when building pages.", 0, java.lang.Integer.MAX_VALUE, package_); case -1243020381: /*global*/ return new Property("global", "", "A set of profiles that all resources covered by this implementation guide must conform to.", 0, java.lang.Integer.MAX_VALUE, global); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java index cec94915b..4518033ef 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Library.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java index ed9c74e0d..1f348f936 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Linkage.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java index 962311516..f97a2cf0e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ListResource.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java index 22d811615..c8a634d84 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Location.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java index 372a6e2bd..919d0f12c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Measure.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java index 28253e3e7..b4ccb77ff 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MeasureReport.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java index 7b3c89973..d4bc8a41c 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Media.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java index b79956a0a..4b5ae6c83 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Medication.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java index aa965a20f..aad6c2dee 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationAdministration.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java index 530935de6..ed0750690 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationDispense.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java index 4eaeec3c5..2a1599aa2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationRequest.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java index b6c418c34..67d45a331 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MedicationStatement.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java index 89704bb02..8b811d8b2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java index 1638392b9..6b1b3feea 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MessageHeader.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Meta.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Meta.java index d9821a9ef..e98bef91f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Meta.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Meta.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MetadataResource.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MetadataResource.java index 19b87f30a..21bac666f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MetadataResource.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/MetadataResource.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Money.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Money.java index 11b23b298..6460300d3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Money.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Money.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java index 8e7f0bb74..b55158f97 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NamingSystem.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java index a39fe6a0c..a03ac8064 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Narrative.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java index f4403a3f4..147e915dd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/NutritionOrder.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java index a6ac3a9c4..400ed16c5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Observation.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java index a6e3e5673..946db4af6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java index 42beb7f07..5dcde82a6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/OperationOutcome.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java index b2d90a8eb..17660db4d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Organization.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java index 7d871cf38..f41ccd1c2 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ParameterDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java index ab12e9660..846a6c4fd 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Parameters.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java index 0a0b3ac57..64b0b346b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Patient.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java index 0f2fd18c3..5e667b17b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentNotice.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java index 8f76d0f7d..492b17cc3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PaymentReconciliation.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Period.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Period.java index 39ea7732b..e4e4a4d17 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Period.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Period.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java index 70fff36dd..b5b04cfbe 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Person.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java index b2d8fe2e2..c7f1dc123 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PlanDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java index 65248df3b..efdad94aa 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Practitioner.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java index 541903c67..8c264eb9f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/PractitionerRole.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java index ce01e3d6c..6c65df39e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Procedure.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java index 8a47a4029..104cd73e4 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcedureRequest.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java index 1c370c735..9b473bb59 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessRequest.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java index e6f4ca280..77c50a963 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ProcessResponse.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java index 448152f3b..0219d14a3 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Provenance.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java index f56949c9f..6b864edab 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java index 247ba35e7..daa1ead5b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Questionnaire.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java index 4f0ff036c..e2dc0368e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/QuestionnaireResponse.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Range.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Range.java index cf0dbdda8..0681549da 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Range.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Range.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Ratio.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Ratio.java index 0f45f1cb6..1fc428dc5 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Ratio.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Ratio.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Reference.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Reference.java index dcffcf019..91253aa3d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Reference.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Reference.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java index a5acf699d..e3795468d 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ReferralRequest.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java index f1956f875..b39eda530 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedArtifact.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java index 2444dcf36..501862d34 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RelatedPerson.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java index ec4893d96..98253229e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RequestGroup.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java index 62409000c..e57b60fb0 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchStudy.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java index d483bc058..55d142670 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResearchSubject.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java index b9fa18db8..c301c68cc 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Resource.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceFactory.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceFactory.java index e37b84e3c..35852f43a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceFactory.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceFactory.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceType.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceType.java index ceae6d9dd..fac22f221 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceType.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ResourceType.java @@ -23,7 +23,7 @@ package org.hl7.fhir.dstu3.model; import org.hl7.fhir.exceptions.FHIRException; -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x public enum ResourceType { Account, diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java index 3bff501f2..f37d51e9a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/RiskAssessment.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SampledData.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SampledData.java index 3e55f0e36..20c6b3a5f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SampledData.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SampledData.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java index 19fe95c38..301033206 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Schedule.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java index dd7d94338..013a96be8 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SearchParameter.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java index e409c1298..5471b1477 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Sequence.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ServiceDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ServiceDefinition.java index e949d9f2c..c79026498 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ServiceDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ServiceDefinition.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Signature.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Signature.java index cc3bc0c40..6ccae2e03 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Signature.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Signature.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SimpleQuantity.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SimpleQuantity.java index f2c167ac6..6ad8d2d89 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SimpleQuantity.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SimpleQuantity.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java index 63fcd1eae..e1ad9bb33 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Slot.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java index 0238740fc..544e57c45 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Specimen.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java index e700fd40e..f4f5b99ef 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureDefinition.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -1186,10 +1186,10 @@ public class StructureDefinition extends MetadataResource { protected List keyword; /** - * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ @Child(name = "fhirVersion", type = {IdType.class}, order=4, min=0, max=1, modifier=false, summary=true) - @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version." ) + @Description(shortDefinition="FHIR Version this StructureDefinition targets", formalDefinition="The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version." ) protected IdType fhirVersion; /** @@ -2084,7 +2084,7 @@ public class StructureDefinition extends MetadataResource { } /** - * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @return {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public IdType getFhirVersionElement() { if (this.fhirVersion == null) @@ -2104,7 +2104,7 @@ public class StructureDefinition extends MetadataResource { } /** - * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value + * @param value {@link #fhirVersion} (The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.). This is the underlying object with id, value and extensions. The accessor "getFhirVersion" gives direct access to the value */ public StructureDefinition setFhirVersionElement(IdType value) { this.fhirVersion = value; @@ -2112,14 +2112,14 @@ public class StructureDefinition extends MetadataResource { } /** - * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * @return The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ public String getFhirVersion() { return this.fhirVersion == null ? null : this.fhirVersion.getValue(); } /** - * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version. + * @param value The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version. */ public StructureDefinition setFhirVersion(String value) { if (Utilities.noString(value)) @@ -2655,7 +2655,7 @@ public class StructureDefinition extends MetadataResource { children.add(new Property("purpose", "markdown", "Explaination of why this structure definition is needed and why it has been designed as it has.", 0, 1, purpose)); children.add(new Property("copyright", "markdown", "A copyright statement relating to the structure definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the structure definition.", 0, 1, copyright)); children.add(new Property("keyword", "Coding", "A set of key words or terms from external terminologies that may be used to assist with indexing and searching of templates.", 0, java.lang.Integer.MAX_VALUE, keyword)); - children.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.", 0, 1, fhirVersion)); + children.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.", 0, 1, fhirVersion)); children.add(new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping)); children.add(new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, 1, kind)); children.add(new Property("abstract", "boolean", "Whether structure this definition describes is abstract or not - that is, whether the structure is not intended to be instantiated. For Resources and Data types, abstract types will never be exchanged between systems.", 0, 1, abstract_)); @@ -2688,7 +2688,7 @@ public class StructureDefinition extends MetadataResource { case -220463842: /*purpose*/ return new Property("purpose", "markdown", "Explaination of why this structure definition is needed and why it has been designed as it has.", 0, 1, purpose); case 1522889671: /*copyright*/ return new Property("copyright", "markdown", "A copyright statement relating to the structure definition and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the structure definition.", 0, 1, copyright); case -814408215: /*keyword*/ return new Property("keyword", "Coding", "A set of key words or terms from external terminologies that may be used to assist with indexing and searching of templates.", 0, java.lang.Integer.MAX_VALUE, keyword); - case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.1 for this version.", 0, 1, fhirVersion); + case 461006061: /*fhirVersion*/ return new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 3.0.2 for this version.", 0, 1, fhirVersion); case 837556430: /*mapping*/ return new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping); case 3292052: /*kind*/ return new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, 1, kind); case 1732898850: /*abstract*/ return new Property("abstract", "boolean", "Whether structure this definition describes is abstract or not - that is, whether the structure is not intended to be instantiated. For Resources and Data types, abstract types will never be exchanged between systems.", 0, 1, abstract_); diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java index 0bc0cb2a0..73cacbc57 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/StructureMap.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java index c220a1d95..c93e029c6 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Subscription.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java index 58211f10d..9eb8da50b 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Substance.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java index e45faa4ad..0405bb376 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyDelivery.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java index 7b98efaca..7468c9609 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/SupplyRequest.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java index b6283a4c3..bdd645075 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Task.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java index a51171e32..99cb3710a 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestReport.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java index 6b8ecbe92..ec4313aaf 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TestScript.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java index bd3228568..da89429eb 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Timing.java @@ -52,7 +52,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java index cba97d357..65de3c59e 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/TriggerDefinition.java @@ -50,7 +50,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/UsageContext.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/UsageContext.java index 451d1ae52..e4cccca08 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/UsageContext.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/UsageContext.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.List; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java index db46dcb2a..4eb940f62 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/ValueSet.java @@ -49,7 +49,7 @@ package org.hl7.fhir.dstu3.model; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java index b32501208..4089a5cc1 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/VisionPrescription.java @@ -51,7 +51,7 @@ import java.math.BigDecimal; */ -// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.1 +// Generated on Fri, Mar 16, 2018 15:21+1100 for FHIR v3.0.x import java.util.ArrayList; import java.util.Date; import java.util.List; 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 7e9cd15bb..099f6c8a8 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 @@ -9948,6 +9948,10 @@ The primary difference between a medication statement and a medication administr * FHIR Release 3 (STU) with 1 technical errata. */ _3_0_1, + /** + * FHIR Release 3 (STU) with 2 technical errata. + */ + _3_0_2, /** * R4 Ballot #1. */ @@ -10004,6 +10008,8 @@ The primary difference between a medication statement and a medication administr return _3_0_0; if ("3.0.1".equals(codeString)) return _3_0_1; + if ("3.0.2".equals(codeString)) + return _3_0_2; if ("3.3.0".equals(codeString)) return _3_3_0; if ("3.5.0".equals(codeString)) @@ -10038,6 +10044,7 @@ The primary difference between a medication statement and a medication administr case _1_8_0: return "1.8.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; + case _3_0_2: return "3.0.2"; case _3_3_0: return "3.3.0"; case _3_5_0: return "3.5.0"; case _4_0_0: return "4.0.0"; @@ -10065,6 +10072,7 @@ The primary difference between a medication statement and a medication administr case _1_8_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_1: return "http://hl7.org/fhir/FHIR-version"; + case _3_0_2: return "http://hl7.org/fhir/FHIR-version"; case _3_3_0: return "http://hl7.org/fhir/FHIR-version"; case _3_5_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_0: return "http://hl7.org/fhir/FHIR-version"; @@ -10092,6 +10100,7 @@ The primary difference between a medication statement and a medication administr case _1_8_0: return "FHIR STU3 Candidate + Connectathon 14 (San Antonio)."; case _3_0_0: return "FHIR Release 3 (STU)."; case _3_0_1: return "FHIR Release 3 (STU) with 1 technical errata."; + case _3_0_2: return "FHIR Release 3 (STU) with 2 technical errata."; case _3_3_0: return "R4 Ballot #1."; case _3_5_0: return "R4 Ballot #2."; case _4_0_0: return "FHIR Release 4 (Normative + STU)."; @@ -10119,6 +10128,7 @@ The primary difference between a medication statement and a medication administr case _1_8_0: return "1.8.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; + case _3_0_2: return "3.0.2"; case _3_3_0: return "3.3.0"; case _3_5_0: return "3.5.0"; case _4_0_0: return "4.0.0"; @@ -10175,6 +10185,8 @@ The primary difference between a medication statement and a medication administr return FHIRVersion._3_0_0; if ("3.0.1".equals(codeString)) return FHIRVersion._3_0_1; + if ("3.0.2".equals(codeString)) + return FHIRVersion._3_0_2; if ("3.3.0".equals(codeString)) return FHIRVersion._3_3_0; if ("3.5.0".equals(codeString)) @@ -10229,6 +10241,8 @@ The primary difference between a medication statement and a medication administr return new Enumeration(this, FHIRVersion._3_0_0); if ("3.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_1); + if ("3.0.2".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0_2); if ("3.3.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_3_0); if ("3.5.0".equals(codeString)) @@ -10276,6 +10290,8 @@ The primary difference between a medication statement and a medication administr return "3.0.0"; if (code == FHIRVersion._3_0_1) return "3.0.1"; + if (code == FHIRVersion._3_0_2) + return "3.0.2"; if (code == FHIRVersion._3_3_0) return "3.3.0"; if (code == FHIRVersion._3_5_0) diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FhirPublication.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FhirPublication.java index 44e2aff02..e858e5607 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FhirPublication.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/FhirPublication.java @@ -22,6 +22,8 @@ package org.hl7.fhir.r4.model; import org.hl7.fhir.r4.model.Enumerations.FHIRVersion; +import org.hl7.fhir.r4.test.utils.ToolsHelper; +import org.hl7.fhir.utilities.VersionUtilities; /** * This enumreation is special, and hand crafted. It only supports a subset of the actual published FHIR versions, those that are still supported. @@ -37,7 +39,7 @@ public enum FhirPublication { R4; public static FhirPublication fromCode(String v) { - if ("1.0.2".equals(v)) + if (VersionUtilities.isR4Ver(v)) return FhirPublication.DSTU2; if ("1.0".equals(v)) return FhirPublication.DSTU2; @@ -47,6 +49,8 @@ public enum FhirPublication { return FhirPublication.DSTU2016May; if ("3.0.1".equals(v)) return FhirPublication.STU3; + if ("3.0.1".equals(v)) + return FhirPublication.STU3; if ("3.0".equals(v)) return FhirPublication.STU3; if ("3.5.0".equals(v)) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FhirPublication.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FhirPublication.java index 5cf6cd1b4..a297c9c7b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FhirPublication.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FhirPublication.java @@ -22,6 +22,7 @@ package org.hl7.fhir.r5.model; import org.hl7.fhir.r5.model.Enumerations.FHIRVersion; +import org.hl7.fhir.utilities.VersionUtilities; /** * This enumreation is special, and hand crafted. It only supports a subset of the actual published FHIR versions, those that are still supported. @@ -38,28 +39,20 @@ public enum FhirPublication { R5; public static FhirPublication fromCode(String v) { - if ("1.0.2".equals(v)) + if (VersionUtilities.isR2Ver(v)) return FhirPublication.DSTU2; - if ("1.0".equals(v)) - return FhirPublication.DSTU2; - if ("1.4.0".equals(v)) + if (VersionUtilities.isR2BVer(v)) return FhirPublication.DSTU2016May; - if ("1.4".equals(v)) - return FhirPublication.DSTU2016May; - if ("3.0.1".equals(v)) + if (VersionUtilities.isR3Ver(v)) return FhirPublication.STU3; - if ("3.0".equals(v)) - return FhirPublication.STU3; - if ("3.5.0".equals(v)) + if (VersionUtilities.isR4Ver(v)) return FhirPublication.R4; - if ("4.0.0".equals(v)) + if (VersionUtilities.isR5Ver(v)) + return FhirPublication.R5; + if ("3.5.0".equals(v)) return FhirPublication.R4; if ("3.5".equals(v)) return FhirPublication.R4; - if ("4.0".equals(v)) - return FhirPublication.R4; - if ("4.1.0".equals(v)) - return FhirPublication.R5; // hack workaround build problem return null; } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/ToolsHelper.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/ToolsHelper.java index baedc70b8..60af22aa6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/ToolsHelper.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/ToolsHelper.java @@ -455,4 +455,6 @@ public class ToolsHelper { TextFile.stringToFile(e.getMessage(), Utilities.changeFileExt(args[1], ".out")); } } + + } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/Version.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/Version.java index 53d95b835..5f2eee7e1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/Version.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/Version.java @@ -61,4 +61,6 @@ public class Version { * org.hl7.fhir.r5.model.Configuration */ public static final String VERSION = "1.0"; + + } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java new file mode 100644 index 000000000..926572232 --- /dev/null +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java @@ -0,0 +1,94 @@ +package org.hl7.fhir.utilities; + +/*- + * #%L + * org.hl7.fhir.r5 + * %% + * Copyright (C) 2014 - 2019 Health Level 7 + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +public class VersionUtilities { + + + public static final String CURRENT_VERSION = "4.1"; + public static final String CURRENT_FULL_VERSION = "4.1.0"; + + public static String packageForVersion(String v) { + if (isR2Ver(v)) { + return "hl7.fhir.r2.core"; + } + if (isR2BVer(v)) { + return "hl7.fhir.r2b.core"; + } + if (isR3Ver(v)) { + return "hl7.fhir.r3.core"; + } + if (isR4Ver(v)) { + return "hl7.fhir.r4.core"; + } + if (v != null && v.startsWith(CURRENT_VERSION)) { + return "hl7.fhir.r5.core"; + } + return null; + } + + public static String getCurrentVersion(String v) { + if (isR2Ver(v)) { + return "1.0.2"; + } + if (isR2BVer(v)) { + return "1.4.0"; + } + if (isR3Ver(v)) { + return "3.0.2"; + } + if (isR4Ver(v)) { + return "4.0.1"; + } + if (v != null && v.startsWith(CURRENT_VERSION)) { + return "Constants.VERSION"; + } + return v; + } + public static boolean isSupportedVersion(String version) { + return Utilities.existsInList(version, "1.0.2", "1.4.0", "3.0.2", "4.0.1", CURRENT_FULL_VERSION); + } + + public static String listSupportedVersions() { + return "1.0.2, 1.4.0, 3.0.2, 4.0.1, "+CURRENT_FULL_VERSION; + } + + public static boolean isR5Ver(String ver) { + return ver != null && ver.startsWith(CURRENT_VERSION); + } + + public static boolean isR4Ver(String ver) { + return ver != null && ver.startsWith("4.0"); + } + + public static boolean isR3Ver(String ver) { + return ver != null && ver.startsWith("3.0"); + } + + public static boolean isR2BVer(String ver) { + return ver != null && ver.startsWith("1.4"); + } + + public static boolean isR2Ver(String ver) { + return ver != null && ver.startsWith("1.0"); + } + +} diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java index c33664475..57001b64d 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java @@ -462,4 +462,5 @@ import com.google.gson.JsonObject; if (path != null) FileUtils.copyDirectory(new File(path), new File(dir)); } + } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java index 5fe50c814..e2505fb26 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java @@ -511,6 +511,8 @@ public class PackageCacheManager { NpmPackage npm = NpmPackage.fromPackage(tgz, true); + recordMap(npm.canonical(), npm.name()); + if (progress ) System.out.print("|"); if (npm.name() == null || id == null || !id.equals(npm.name())) { @@ -715,5 +717,12 @@ public class PackageCacheManager { public void clear() throws IOException { clearCache(); } - + + public void loadFromFolder(String packagesFolder) throws IOException { + for (File f : new File(packagesFolder).listFiles()) { + if (f.getName().endsWith(".tgz")) { + temporaryPackages.add(NpmPackage.fromPackage(new FileInputStream(f))); + } + } + } } diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java index 41ec7f91b..d9aabc531 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java @@ -134,6 +134,7 @@ import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.TerminologyServiceOptions; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities.DecimalStatus; +import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; @@ -3756,7 +3757,7 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L private static final String EXECUTION_ID = "validator.execution.id"; private String uriRegexForVersion() { - if ("3.0.1".equals(context.getVersion())) + if (VersionUtilities.isR3Ver(context.getVersion())) return URI_REGEX3; else return Constants.URI_REGEX; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java index 2e19c586b..4035543ff 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java @@ -29,6 +29,7 @@ import org.hl7.fhir.convertors.VersionConvertorAdvisor50; import org.hl7.fhir.convertors.VersionConvertor_10_50; import org.hl7.fhir.convertors.VersionConvertor_14_50; import org.hl7.fhir.convertors.VersionConvertor_30_50; +import org.hl7.fhir.convertors.VersionConvertor_40_50; import org.hl7.fhir.exceptions.FHIRException; /** @@ -60,6 +61,7 @@ import org.hl7.fhir.r5.utils.IResourceValidator.BestPracticeWarningLevel; import org.hl7.fhir.r5.utils.IResourceValidator.CheckDisplayOption; import org.hl7.fhir.r5.utils.IResourceValidator.IdStatus; import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.utilities.VersionUtilities; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -343,14 +345,14 @@ public class NativeHostServices { */ public byte[] convertResource(byte[] r, String fmt, String version) throws FHIRException, IOException { try { - if ("3.0".equals(version) || "3.0.1".equals(version) || "r3".equals(version)) { + if (VersionUtilities.isR3Ver(version)) { org.hl7.fhir.dstu3.formats.ParserBase p3 = org.hl7.fhir.dstu3.formats.FormatUtilities.makeParser(fmt); org.hl7.fhir.dstu3.model.Resource res3 = p3.parse(r); Resource res4 = VersionConvertor_30_50.convertResource(res3, false); org.hl7.fhir.r5.formats.ParserBase p4 = org.hl7.fhir.r5.formats.FormatUtilities.makeParser(fmt); convertCount++; return p4.composeBytes(res4); - } else if ("1.0".equals(version) || "1.0.2".equals(version) || "r2".equals(version)) { + } else if (VersionUtilities.isR2Ver(version)) { org.hl7.fhir.dstu2.formats.ParserBase p2 = org.hl7.fhir.dstu2.formats.FormatUtilities.makeParser(fmt); org.hl7.fhir.dstu2.model.Resource res2 = p2.parse(r); VersionConvertor_10_50 conv = new VersionConvertor_10_50(conv_10_50_advisor ); @@ -358,13 +360,20 @@ public class NativeHostServices { org.hl7.fhir.r5.formats.ParserBase p4 = org.hl7.fhir.r5.formats.FormatUtilities.makeParser(fmt); convertCount++; return p4.composeBytes(res4); - } else if ("1.4".equals(version) || "1.4.0".equals(version)) { + } else if (VersionUtilities.isR2BVer(version)) { org.hl7.fhir.dstu2016may.formats.ParserBase p2 = org.hl7.fhir.dstu2016may.formats.FormatUtilities.makeParser(fmt); org.hl7.fhir.dstu2016may.model.Resource res2 = p2.parse(r); Resource res4 = VersionConvertor_14_50.convertResource(res2); org.hl7.fhir.r5.formats.ParserBase p4 = org.hl7.fhir.r5.formats.FormatUtilities.makeParser(fmt); convertCount++; return p4.composeBytes(res4); + } else if (VersionUtilities.isR4Ver(version)) { + org.hl7.fhir.r4.formats.ParserBase p2 = org.hl7.fhir.r4.formats.FormatUtilities.makeParser(fmt); + org.hl7.fhir.r4.model.Resource res2 = p2.parse(r); + Resource res4 = VersionConvertor_40_50.convertResource(res2); + org.hl7.fhir.r5.formats.ParserBase p4 = org.hl7.fhir.r5.formats.FormatUtilities.makeParser(fmt); + convertCount++; + return p4.composeBytes(res4); } else throw new FHIRException("Unsupported version "+version); } catch (Exception e) { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java index e479bb8b3..bc090a7ed 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java @@ -163,7 +163,7 @@ import org.xml.sax.SAXException; * This is just a wrapper around the InstanceValidator class for convenient use * * The following resource formats are supported: XML, JSON, Turtle - * The following versions are supported: 1.0.1, 1.4.0, 3.0.1, 4.0.0, and current + * The following versions are supported: 1.0.2, 1.4.0, 3.0.2, 4.0.1, and current * * Note: the validation engine is intended to be threadsafe * To Use: diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java index 3eb511ca1..0fee9353d 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java @@ -92,6 +92,7 @@ import org.hl7.fhir.r5.validation.ValidationEngine.ScanOutputItem; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtil; +import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.cache.PackageCacheManager; import org.hl7.fhir.utilities.cache.ToolsVersion; import org.hl7.fhir.utilities.validation.ValidationMessage; @@ -175,8 +176,8 @@ public class Validator { System.out.println(" Patterns are limited to a directory followed by a filename with an embedded"); System.out.println(" asterisk. E.g. foo*-examples.xml or someresource.*, etc."); System.out.println("-version [ver]: The FHIR version to use. This can only appear once. "); - System.out.println(" valid values 1.0 | 1.4 | 3.0 | "+Constants.VERSION.substring(0, 3)+" or 1.0.2 | 1.4.0 | 3.0.1 | "+Constants.VERSION); - System.out.println(" Default value is "+Constants.VERSION.substring(0, 3)); + System.out.println(" valid values 1.0 | 1.4 | 3.0 | "+VersionUtilities.CURRENT_VERSION+" or 1.0.2 | 1.4.0 | 3.0.2 | 4.0.1 | "+VersionUtilities.CURRENT_FULL_VERSION); + System.out.println(" Default value is "+VersionUtilities.CURRENT_VERSION); System.out.println("-ig [package|file|folder|url]: an IG or profile definition to load. Can be "); System.out.println(" the URL of an implementation guide or a package ([id]-[ver]) for"); System.out.println(" a built implementation guide or a local folder that contains a");