From 147164d66db9ee4b3fe853872aea1e61e954e251 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 5 Feb 2020 13:28:43 -0500 Subject: [PATCH] Changing filenames to reflect version --- .../convertors/SpecDifferenceEvaluator.java | 6 +- .../fhir/convertors/TerminologyClientR4.java | 3 +- .../convertors/VersionConvertor_40_50.java | 512 +++-- .../{Account.java => Account40_50.java} | 2 +- ...tion.java => ActivityDefinition40_50.java} | 6 +- ...ance.java => AllergyIntolerance40_50.java} | 2 +- ...Appointment.java => Appointment40_50.java} | 2 +- ...nse.java => AppointmentResponse40_50.java} | 2 +- .../{AuditEvent.java => AuditEvent40_50.java} | 2 +- .../conv40_50/{Basic.java => Basic40_50.java} | 2 +- .../{Binary.java => Binary40_50.java} | 2 +- ...a => BiologicallyDerivedProduct40_50.java} | 2 +- ...Structure.java => BodyStructure40_50.java} | 2 +- .../{Bundle.java => Bundle40_50.java} | 2 +- ...ent.java => CapabilityStatement40_50.java} | 15 +- .../{CarePlan.java => CarePlan40_50.java} | 2 +- .../{CareTeam.java => CareTeam40_50.java} | 2 +- .../{ChargeItem.java => ChargeItem40_50.java} | 2 +- ...on.java => ChargeItemDefinition40_50.java} | 6 +- .../conv40_50/{Claim.java => Claim40_50.java} | 2 +- ...mResponse.java => ClaimResponse40_50.java} | 6 +- ...sion.java => ClinicalImpression40_50.java} | 2 +- .../{CodeSystem.java => CodeSystem40_50.java} | 6 +- ...unication.java => Communication40_50.java} | 2 +- ...st.java => CommunicationRequest40_50.java} | 2 +- ...n.java => CompartmentDefinition40_50.java} | 6 +- ...Composition.java => Composition40_50.java} | 2 +- .../{ConceptMap.java => ConceptMap40_50.java} | 10 +- .../{Condition.java => Condition40_50.java} | 2 +- .../{Consent.java => Consent40_50.java} | 2 +- .../{Contract.java => Contract40_50.java} | 2 +- .../{Coverage.java => Coverage40_50.java} | 2 +- ...a => CoverageEligibilityRequest40_50.java} | 2 +- ... => CoverageEligibilityResponse40_50.java} | 2 +- ...ctedIssue.java => DetectedIssue40_50.java} | 2 +- .../{Device.java => Device40_50.java} | 2 +- ...nition.java => DeviceDefinition40_50.java} | 2 +- ...viceMetric.java => DeviceMetric40_50.java} | 2 +- ...ceRequest.java => DeviceRequest40_50.java} | 2 +- ...ment.java => DeviceUseStatement40_50.java} | 2 +- ...Report.java => DiagnosticReport40_50.java} | 2 +- ...nifest.java => DocumentManifest40_50.java} | 6 +- ...rence.java => DocumentReference40_50.java} | 6 +- .../{Encounter.java => Encounter40_50.java} | 2 +- .../{Endpoint.java => Endpoint40_50.java} | 2 +- ...quest.java => EnrollmentRequest40_50.java} | 2 +- ...onse.java => EnrollmentResponse40_50.java} | 2 +- ...umerations.java => Enumerations40_50.java} | 2 +- ...odeOfCare.java => EpisodeOfCare40_50.java} | 2 +- ...inition.java => EventDefinition40_50.java} | 6 +- ...cenario.java => ExampleScenario40_50.java} | 6 +- ...it.java => ExplanationOfBenefit40_50.java} | 6 +- ...ory.java => FamilyMemberHistory40_50.java} | 2 +- .../conv40_50/{Flag.java => Flag40_50.java} | 2 +- .../conv40_50/{Goal.java => Goal40_50.java} | 2 +- ...inition.java => GraphDefinition40_50.java} | 9 +- .../conv40_50/{Group.java => Group40_50.java} | 2 +- ...sponse.java => GuidanceResponse40_50.java} | 2 +- ...rvice.java => HealthcareService40_50.java} | 2 +- ...agingStudy.java => ImagingStudy40_50.java} | 2 +- ...munization.java => Immunization40_50.java} | 2 +- ....java => ImmunizationEvaluation40_50.java} | 2 +- ...a => ImmunizationRecommendation40_50.java} | 2 +- ...ide.java => ImplementationGuide40_50.java} | 14 +- ...rancePlan.java => InsurancePlan40_50.java} | 6 +- .../{Invoice.java => Invoice40_50.java} | 2 +- .../{Library.java => Library40_50.java} | 6 +- .../{Linkage.java => Linkage40_50.java} | 2 +- ...stResource.java => ListResource40_50.java} | 2 +- .../{Location.java => Location40_50.java} | 2 +- .../{Measure.java => Measure40_50.java} | 6 +- ...ureReport.java => MeasureReport40_50.java} | 2 +- .../conv40_50/{Media.java => Media40_50.java} | 2 +- .../{Medication.java => Medication40_50.java} | 2 +- ...ava => MedicationAdministration40_50.java} | 2 +- ...ense.java => MedicationDispense40_50.java} | 2 +- ...dge.java => MedicationKnowledge40_50.java} | 2 +- ...quest.java => MedicationRequest40_50.java} | 2 +- ...ent.java => MedicationStatement40_50.java} | 2 +- ...ition.java => MessageDefinition40_50.java} | 6 +- ...ageHeader.java => MessageHeader40_50.java} | 2 +- ...uence.java => MolecularSequence40_50.java} | 2 +- ...mingSystem.java => NamingSystem40_50.java} | 6 +- ...ionOrder.java => NutritionOrder40_50.java} | 2 +- ...Observation.java => Observation40_50.java} | 2 +- ...n.java => ObservationDefinition40_50.java} | 6 +- ...ion.java => OperationDefinition40_50.java} | 20 +- ...utcome.java => OperationOutcome40_50.java} | 2 +- ...ganization.java => Organization40_50.java} | 2 +- ...java => OrganizationAffiliation40_50.java} | 2 +- .../{Parameters.java => Parameters40_50.java} | 2 +- .../{Patient.java => Patient40_50.java} | 10 +- ...entNotice.java => PaymentNotice40_50.java} | 2 +- ...n.java => PaymentReconciliation40_50.java} | 6 +- .../{Person.java => Person40_50.java} | 6 +- ...finition.java => PlanDefinition40_50.java} | 6 +- ...actitioner.java => Practitioner40_50.java} | 6 +- ...erRole.java => PractitionerRole40_50.java} | 2 +- .../{Procedure.java => Procedure40_50.java} | 2 +- .../{Provenance.java => Provenance40_50.java} | 2 +- ...tionnaire.java => Questionnaire40_50.java} | 8 +- ...e.java => QuestionnaireResponse40_50.java} | 2 +- ...tedPerson.java => RelatedPerson40_50.java} | 6 +- ...questGroup.java => RequestGroup40_50.java} | 2 +- ...archStudy.java => ResearchStudy40_50.java} | 2 +- ...Subject.java => ResearchSubject40_50.java} | 2 +- ...sessment.java => RiskAssessment40_50.java} | 2 +- .../{Schedule.java => Schedule40_50.java} | 2 +- ...rameter.java => SearchParameter40_50.java} | 13 +- ...eRequest.java => ServiceRequest40_50.java} | 2 +- .../conv40_50/{Slot.java => Slot40_50.java} | 2 +- .../{Specimen.java => Specimen40_50.java} | 2 +- ...tion.java => SpecimenDefinition40_50.java} | 2 +- ...ion.java => StructureDefinition40_50.java} | 10 +- ...ructureMap.java => StructureMap40_50.java} | 6 +- .../{Substance.java => Substance40_50.java} | 2 +- ...id.java => SubstanceNucleicAcid40_50.java} | 2 +- ...olymer.java => SubstancePolymer40_50.java} | 2 +- ...rotein.java => SubstanceProtein40_50.java} | 2 +- ...> SubstanceReferenceInformation40_50.java} | 2 +- ...java => SubstanceSourceMaterial40_50.java} | 2 +- ...Delivery.java => SupplyDelivery40_50.java} | 2 +- ...lyRequest.java => SupplyRequest40_50.java} | 2 +- .../conv40_50/{Task.java => Task40_50.java} | 2 +- ...java => TerminologyCapabilities40_50.java} | 6 +- .../{TestReport.java => TestReport40_50.java} | 2 +- .../{TestScript.java => TestScript40_50.java} | 6 +- .../{ValueSet.java => ValueSet40_50.java} | 6 +- ...sult.java => VerificationResult40_50.java} | 2 +- ...tion.java => VisionPrescription40_50.java} | 2 +- .../hl7/fhir/convertors/parser/Parser.java | 1743 +++++++++++++++++ .../fhir/convertors/parser/ParserTest.java | 12 + 132 files changed, 2230 insertions(+), 491 deletions(-) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Account.java => Account40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ActivityDefinition.java => ActivityDefinition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{AllergyIntolerance.java => AllergyIntolerance40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Appointment.java => Appointment40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{AppointmentResponse.java => AppointmentResponse40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{AuditEvent.java => AuditEvent40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Basic.java => Basic40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Binary.java => Binary40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{BiologicallyDerivedProduct.java => BiologicallyDerivedProduct40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{BodyStructure.java => BodyStructure40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Bundle.java => Bundle40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CapabilityStatement.java => CapabilityStatement40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CarePlan.java => CarePlan40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CareTeam.java => CareTeam40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ChargeItem.java => ChargeItem40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ChargeItemDefinition.java => ChargeItemDefinition40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Claim.java => Claim40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ClaimResponse.java => ClaimResponse40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ClinicalImpression.java => ClinicalImpression40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CodeSystem.java => CodeSystem40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Communication.java => Communication40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CommunicationRequest.java => CommunicationRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CompartmentDefinition.java => CompartmentDefinition40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Composition.java => Composition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ConceptMap.java => ConceptMap40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Condition.java => Condition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Consent.java => Consent40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Contract.java => Contract40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Coverage.java => Coverage40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CoverageEligibilityRequest.java => CoverageEligibilityRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{CoverageEligibilityResponse.java => CoverageEligibilityResponse40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DetectedIssue.java => DetectedIssue40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Device.java => Device40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DeviceDefinition.java => DeviceDefinition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DeviceMetric.java => DeviceMetric40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DeviceRequest.java => DeviceRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DeviceUseStatement.java => DeviceUseStatement40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DiagnosticReport.java => DiagnosticReport40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DocumentManifest.java => DocumentManifest40_50.java} (96%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{DocumentReference.java => DocumentReference40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Encounter.java => Encounter40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Endpoint.java => Endpoint40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{EnrollmentRequest.java => EnrollmentRequest40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{EnrollmentResponse.java => EnrollmentResponse40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Enumerations.java => Enumerations40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{EpisodeOfCare.java => EpisodeOfCare40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{EventDefinition.java => EventDefinition40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ExampleScenario.java => ExampleScenario40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ExplanationOfBenefit.java => ExplanationOfBenefit40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{FamilyMemberHistory.java => FamilyMemberHistory40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Flag.java => Flag40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Goal.java => Goal40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{GraphDefinition.java => GraphDefinition40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Group.java => Group40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{GuidanceResponse.java => GuidanceResponse40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{HealthcareService.java => HealthcareService40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ImagingStudy.java => ImagingStudy40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Immunization.java => Immunization40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ImmunizationEvaluation.java => ImmunizationEvaluation40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ImmunizationRecommendation.java => ImmunizationRecommendation40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ImplementationGuide.java => ImplementationGuide40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{InsurancePlan.java => InsurancePlan40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Invoice.java => Invoice40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Library.java => Library40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Linkage.java => Linkage40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ListResource.java => ListResource40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Location.java => Location40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Measure.java => Measure40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MeasureReport.java => MeasureReport40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Media.java => Media40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Medication.java => Medication40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MedicationAdministration.java => MedicationAdministration40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MedicationDispense.java => MedicationDispense40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MedicationKnowledge.java => MedicationKnowledge40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MedicationRequest.java => MedicationRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MedicationStatement.java => MedicationStatement40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MessageDefinition.java => MessageDefinition40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MessageHeader.java => MessageHeader40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{MolecularSequence.java => MolecularSequence40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{NamingSystem.java => NamingSystem40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{NutritionOrder.java => NutritionOrder40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Observation.java => Observation40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ObservationDefinition.java => ObservationDefinition40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{OperationDefinition.java => OperationDefinition40_50.java} (96%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{OperationOutcome.java => OperationOutcome40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Organization.java => Organization40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{OrganizationAffiliation.java => OrganizationAffiliation40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Parameters.java => Parameters40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Patient.java => Patient40_50.java} (96%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{PaymentNotice.java => PaymentNotice40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{PaymentReconciliation.java => PaymentReconciliation40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Person.java => Person40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{PlanDefinition.java => PlanDefinition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Practitioner.java => Practitioner40_50.java} (96%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{PractitionerRole.java => PractitionerRole40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Procedure.java => Procedure40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Provenance.java => Provenance40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Questionnaire.java => Questionnaire40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{QuestionnaireResponse.java => QuestionnaireResponse40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{RelatedPerson.java => RelatedPerson40_50.java} (96%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{RequestGroup.java => RequestGroup40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ResearchStudy.java => ResearchStudy40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ResearchSubject.java => ResearchSubject40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{RiskAssessment.java => RiskAssessment40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Schedule.java => Schedule40_50.java} (98%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SearchParameter.java => SearchParameter40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ServiceRequest.java => ServiceRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Slot.java => Slot40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Specimen.java => Specimen40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SpecimenDefinition.java => SpecimenDefinition40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{StructureDefinition.java => StructureDefinition40_50.java} (97%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{StructureMap.java => StructureMap40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Substance.java => Substance40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SubstanceNucleicAcid.java => SubstanceNucleicAcid40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SubstancePolymer.java => SubstancePolymer40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SubstanceProtein.java => SubstanceProtein40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SubstanceReferenceInformation.java => SubstanceReferenceInformation40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SubstanceSourceMaterial.java => SubstanceSourceMaterial40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SupplyDelivery.java => SupplyDelivery40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{SupplyRequest.java => SupplyRequest40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{Task.java => Task40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{TerminologyCapabilities.java => TerminologyCapabilities40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{TestReport.java => TestReport40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{TestScript.java => TestScript40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{ValueSet.java => ValueSet40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{VerificationResult.java => VerificationResult40_50.java} (99%) rename org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/{VisionPrescription.java => VisionPrescription40_50.java} (99%) create mode 100644 org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java create mode 100644 org.hl7.fhir.convertors/src/test/java/org/hl7/fhir/convertors/parser/ParserTest.java diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java index 25d2d1a4c..201870595 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java @@ -32,6 +32,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.hl7.fhir.convertors.conv40_50.StructureDefinition40_50; +import org.hl7.fhir.convertors.conv40_50.ValueSet40_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat; @@ -164,7 +166,7 @@ public class SpecDifferenceEvaluator { for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { if (be.getResource() instanceof org.hl7.fhir.r4.model.StructureDefinition) { org.hl7.fhir.r4.model.StructureDefinition sd = (org.hl7.fhir.r4.model.StructureDefinition) be.getResource(); - map.put(sd.getName(), org.hl7.fhir.convertors.conv40_50.StructureDefinition.convertStructureDefinition(sd)); + map.put(sd.getName(), StructureDefinition40_50.convertStructureDefinition(sd)); } } @@ -184,7 +186,7 @@ public class SpecDifferenceEvaluator { for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { if (be.getResource() instanceof org.hl7.fhir.r4.model.ValueSet) { org.hl7.fhir.r4.model.ValueSet sd = (org.hl7.fhir.r4.model.ValueSet) be.getResource(); - map.put(sd.getName(), org.hl7.fhir.convertors.conv40_50.ValueSet.convertValueSet(sd)); + map.put(sd.getName(), ValueSet40_50.convertValueSet(sd)); } } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/TerminologyClientR4.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/TerminologyClientR4.java index 726903fe4..9e96bc6ea 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/TerminologyClientR4.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/TerminologyClientR4.java @@ -24,6 +24,7 @@ package org.hl7.fhir.convertors; import java.net.URISyntaxException; import java.util.Map; +import org.hl7.fhir.convertors.conv40_50.TerminologyCapabilities40_50; import org.hl7.fhir.r4.utils.client.FHIRToolingClient; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.utils.client.ToolingClientLogger; @@ -43,7 +44,7 @@ public class TerminologyClientR4 implements TerminologyClient { @Override public TerminologyCapabilities getTerminologyCapabilities() throws FHIRException { - return (TerminologyCapabilities) org.hl7.fhir.convertors.conv40_50.TerminologyCapabilities.convertTerminologyCapabilities(client.getTerminologyCapabilities()); + return (TerminologyCapabilities) TerminologyCapabilities40_50.convertTerminologyCapabilities(client.getTerminologyCapabilities()); } @Override diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java index f759a07b7..af6f3b243 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java @@ -28,11 +28,7 @@ package org.hl7.fhir.convertors; */ import org.hl7.fhir.convertors.conv40_50.*; import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.r4.model.CodeType; import org.hl7.fhir.r5.model.CodeableReference; -import org.hl7.fhir.r5.model.Enumeration; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnumEnumFactory; /* @@ -2853,7 +2849,7 @@ public class VersionConvertor_40_50 { org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionBindingComponent tgt = new org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionBindingComponent(); copyElement(src, tgt); if (src.hasStrength()) - tgt.setStrength(Enumerations.convertBindingStrength(src.getStrength())); + tgt.setStrength(Enumerations40_50.convertBindingStrength(src.getStrength())); if (src.hasDescription()) tgt.setDescriptionElement(convertString(src.getDescriptionElement())); if (src.hasValueSet()) @@ -2867,7 +2863,7 @@ public class VersionConvertor_40_50 { org.hl7.fhir.r4.model.ElementDefinition.ElementDefinitionBindingComponent tgt = new org.hl7.fhir.r4.model.ElementDefinition.ElementDefinitionBindingComponent(); copyElement(src, tgt); if (src.hasStrength()) - tgt.setStrength(Enumerations.convertBindingStrength(src.getStrength())); + tgt.setStrength(Enumerations40_50.convertBindingStrength(src.getStrength())); if (src.hasDescription()) tgt.setDescriptionElement(convertString(src.getDescriptionElement())); if (src.hasValueSet()) @@ -3278,263 +3274,263 @@ public class VersionConvertor_40_50 { if (src == null) return null; if (src instanceof org.hl7.fhir.r4.model.Parameters) - return Parameters.convertParameters((org.hl7.fhir.r4.model.Parameters) src); + return Parameters40_50.convertParameters((org.hl7.fhir.r4.model.Parameters) src); if (src instanceof org.hl7.fhir.r4.model.Account) - return Account.convertAccount((org.hl7.fhir.r4.model.Account) src); + return Account40_50.convertAccount((org.hl7.fhir.r4.model.Account) src); if (src instanceof org.hl7.fhir.r4.model.ActivityDefinition) - return ActivityDefinition.convertActivityDefinition((org.hl7.fhir.r4.model.ActivityDefinition) src); + return ActivityDefinition40_50.convertActivityDefinition((org.hl7.fhir.r4.model.ActivityDefinition) src); // if (src instanceof org.hl7.fhir.r4.model.AdverseEvent) // return AdverseEvent.convertAdverseEvent((org.hl7.fhir.r4.model.AdverseEvent) src); if (src instanceof org.hl7.fhir.r4.model.AllergyIntolerance) - return AllergyIntolerance.convertAllergyIntolerance((org.hl7.fhir.r4.model.AllergyIntolerance) src); + return AllergyIntolerance40_50.convertAllergyIntolerance((org.hl7.fhir.r4.model.AllergyIntolerance) src); if (src instanceof org.hl7.fhir.r4.model.Appointment) - return Appointment.convertAppointment((org.hl7.fhir.r4.model.Appointment) src); + return Appointment40_50.convertAppointment((org.hl7.fhir.r4.model.Appointment) src); if (src instanceof org.hl7.fhir.r4.model.AppointmentResponse) - return AppointmentResponse.convertAppointmentResponse((org.hl7.fhir.r4.model.AppointmentResponse) src); + return AppointmentResponse40_50.convertAppointmentResponse((org.hl7.fhir.r4.model.AppointmentResponse) src); if (src instanceof org.hl7.fhir.r4.model.AuditEvent) - return AuditEvent.convertAuditEvent((org.hl7.fhir.r4.model.AuditEvent) src); + return AuditEvent40_50.convertAuditEvent((org.hl7.fhir.r4.model.AuditEvent) src); if (src instanceof org.hl7.fhir.r4.model.Basic) - return Basic.convertBasic((org.hl7.fhir.r4.model.Basic) src); + return Basic40_50.convertBasic((org.hl7.fhir.r4.model.Basic) src); if (src instanceof org.hl7.fhir.r4.model.Binary) - return Binary.convertBinary((org.hl7.fhir.r4.model.Binary) src); + return Binary40_50.convertBinary((org.hl7.fhir.r4.model.Binary) src); if (src instanceof org.hl7.fhir.r4.model.BiologicallyDerivedProduct) - return BiologicallyDerivedProduct.convertBiologicallyDerivedProduct((org.hl7.fhir.r4.model.BiologicallyDerivedProduct) src); + return BiologicallyDerivedProduct40_50.convertBiologicallyDerivedProduct((org.hl7.fhir.r4.model.BiologicallyDerivedProduct) src); if (src instanceof org.hl7.fhir.r4.model.BodyStructure) - return BodyStructure.convertBodyStructure((org.hl7.fhir.r4.model.BodyStructure) src); + return BodyStructure40_50.convertBodyStructure((org.hl7.fhir.r4.model.BodyStructure) src); if (src instanceof org.hl7.fhir.r4.model.Bundle) - return Bundle.convertBundle((org.hl7.fhir.r4.model.Bundle) src); + return Bundle40_50.convertBundle((org.hl7.fhir.r4.model.Bundle) src); if (src instanceof org.hl7.fhir.r4.model.CapabilityStatement) - return CapabilityStatement.convertCapabilityStatement((org.hl7.fhir.r4.model.CapabilityStatement) src); + return CapabilityStatement40_50.convertCapabilityStatement((org.hl7.fhir.r4.model.CapabilityStatement) src); if (src instanceof org.hl7.fhir.r4.model.CarePlan) - return CarePlan.convertCarePlan((org.hl7.fhir.r4.model.CarePlan) src); + return CarePlan40_50.convertCarePlan((org.hl7.fhir.r4.model.CarePlan) src); if (src instanceof org.hl7.fhir.r4.model.CareTeam) - return CareTeam.convertCareTeam((org.hl7.fhir.r4.model.CareTeam) src); + return CareTeam40_50.convertCareTeam((org.hl7.fhir.r4.model.CareTeam) src); // if (src instanceof org.hl7.fhir.r4.model.CatalogEntry) // return CatalogEntry.convertCatalogEntry((org.hl7.fhir.r4.model.CatalogEntry) src); if (src instanceof org.hl7.fhir.r4.model.ChargeItem) - return ChargeItem.convertChargeItem((org.hl7.fhir.r4.model.ChargeItem) src); + return ChargeItem40_50.convertChargeItem((org.hl7.fhir.r4.model.ChargeItem) src); if (src instanceof org.hl7.fhir.r4.model.ChargeItemDefinition) - return ChargeItemDefinition.convertChargeItemDefinition((org.hl7.fhir.r4.model.ChargeItemDefinition) src); + return ChargeItemDefinition40_50.convertChargeItemDefinition((org.hl7.fhir.r4.model.ChargeItemDefinition) src); if (src instanceof org.hl7.fhir.r4.model.Claim) - return Claim.convertClaim((org.hl7.fhir.r4.model.Claim) src); + return Claim40_50.convertClaim((org.hl7.fhir.r4.model.Claim) src); if (src instanceof org.hl7.fhir.r4.model.ClaimResponse) - return ClaimResponse.convertClaimResponse((org.hl7.fhir.r4.model.ClaimResponse) src); + return ClaimResponse40_50.convertClaimResponse((org.hl7.fhir.r4.model.ClaimResponse) src); if (src instanceof org.hl7.fhir.r4.model.ClinicalImpression) - return ClinicalImpression.convertClinicalImpression((org.hl7.fhir.r4.model.ClinicalImpression) src); + return ClinicalImpression40_50.convertClinicalImpression((org.hl7.fhir.r4.model.ClinicalImpression) src); if (src instanceof org.hl7.fhir.r4.model.CodeSystem) - return CodeSystem.convertCodeSystem((org.hl7.fhir.r4.model.CodeSystem) src); + return CodeSystem40_50.convertCodeSystem((org.hl7.fhir.r4.model.CodeSystem) src); if (src instanceof org.hl7.fhir.r4.model.Communication) - return Communication.convertCommunication((org.hl7.fhir.r4.model.Communication) src); + return Communication40_50.convertCommunication((org.hl7.fhir.r4.model.Communication) src); if (src instanceof org.hl7.fhir.r4.model.CommunicationRequest) - return CommunicationRequest.convertCommunicationRequest((org.hl7.fhir.r4.model.CommunicationRequest) src); + return CommunicationRequest40_50.convertCommunicationRequest((org.hl7.fhir.r4.model.CommunicationRequest) src); if (src instanceof org.hl7.fhir.r4.model.CompartmentDefinition) - return CompartmentDefinition.convertCompartmentDefinition((org.hl7.fhir.r4.model.CompartmentDefinition) src); + return CompartmentDefinition40_50.convertCompartmentDefinition((org.hl7.fhir.r4.model.CompartmentDefinition) src); if (src instanceof org.hl7.fhir.r4.model.Composition) - return Composition.convertComposition((org.hl7.fhir.r4.model.Composition) src); + return Composition40_50.convertComposition((org.hl7.fhir.r4.model.Composition) src); if (src instanceof org.hl7.fhir.r4.model.ConceptMap) - return ConceptMap.convertConceptMap((org.hl7.fhir.r4.model.ConceptMap) src); + return ConceptMap40_50.convertConceptMap((org.hl7.fhir.r4.model.ConceptMap) src); if (src instanceof org.hl7.fhir.r4.model.Condition) - return Condition.convertCondition((org.hl7.fhir.r4.model.Condition) src); + return Condition40_50.convertCondition((org.hl7.fhir.r4.model.Condition) src); if (src instanceof org.hl7.fhir.r4.model.Consent) - return Consent.convertConsent((org.hl7.fhir.r4.model.Consent) src); + return Consent40_50.convertConsent((org.hl7.fhir.r4.model.Consent) src); if (src instanceof org.hl7.fhir.r4.model.Contract) - return Contract.convertContract((org.hl7.fhir.r4.model.Contract) src); + return Contract40_50.convertContract((org.hl7.fhir.r4.model.Contract) src); if (src instanceof org.hl7.fhir.r4.model.Coverage) - return Coverage.convertCoverage((org.hl7.fhir.r4.model.Coverage) src); + return Coverage40_50.convertCoverage((org.hl7.fhir.r4.model.Coverage) src); if (src instanceof org.hl7.fhir.r4.model.CoverageEligibilityRequest) - return CoverageEligibilityRequest.convertCoverageEligibilityRequest((org.hl7.fhir.r4.model.CoverageEligibilityRequest) src); + return CoverageEligibilityRequest40_50.convertCoverageEligibilityRequest((org.hl7.fhir.r4.model.CoverageEligibilityRequest) src); if (src instanceof org.hl7.fhir.r4.model.CoverageEligibilityResponse) - return CoverageEligibilityResponse.convertCoverageEligibilityResponse((org.hl7.fhir.r4.model.CoverageEligibilityResponse) src); + return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r4.model.CoverageEligibilityResponse) src); if (src instanceof org.hl7.fhir.r4.model.DetectedIssue) - return DetectedIssue.convertDetectedIssue((org.hl7.fhir.r4.model.DetectedIssue) src); + return DetectedIssue40_50.convertDetectedIssue((org.hl7.fhir.r4.model.DetectedIssue) src); if (src instanceof org.hl7.fhir.r4.model.Device) - return Device.convertDevice((org.hl7.fhir.r4.model.Device) src); + return Device40_50.convertDevice((org.hl7.fhir.r4.model.Device) src); if (src instanceof org.hl7.fhir.r4.model.DeviceDefinition) - return DeviceDefinition.convertDeviceDefinition((org.hl7.fhir.r4.model.DeviceDefinition) src); + return DeviceDefinition40_50.convertDeviceDefinition((org.hl7.fhir.r4.model.DeviceDefinition) src); if (src instanceof org.hl7.fhir.r4.model.DeviceMetric) - return DeviceMetric.convertDeviceMetric((org.hl7.fhir.r4.model.DeviceMetric) src); + return DeviceMetric40_50.convertDeviceMetric((org.hl7.fhir.r4.model.DeviceMetric) src); if (src instanceof org.hl7.fhir.r4.model.DeviceRequest) - return DeviceRequest.convertDeviceRequest((org.hl7.fhir.r4.model.DeviceRequest) src); + return DeviceRequest40_50.convertDeviceRequest((org.hl7.fhir.r4.model.DeviceRequest) src); if (src instanceof org.hl7.fhir.r4.model.DeviceUseStatement) - return DeviceUseStatement.convertDeviceUseStatement((org.hl7.fhir.r4.model.DeviceUseStatement) src); + return DeviceUseStatement40_50.convertDeviceUseStatement((org.hl7.fhir.r4.model.DeviceUseStatement) src); if (src instanceof org.hl7.fhir.r4.model.DiagnosticReport) - return DiagnosticReport.convertDiagnosticReport((org.hl7.fhir.r4.model.DiagnosticReport) src); + return DiagnosticReport40_50.convertDiagnosticReport((org.hl7.fhir.r4.model.DiagnosticReport) src); if (src instanceof org.hl7.fhir.r4.model.DocumentManifest) - return DocumentManifest.convertDocumentManifest((org.hl7.fhir.r4.model.DocumentManifest) src); + return DocumentManifest40_50.convertDocumentManifest((org.hl7.fhir.r4.model.DocumentManifest) src); if (src instanceof org.hl7.fhir.r4.model.DocumentReference) - return DocumentReference.convertDocumentReference((org.hl7.fhir.r4.model.DocumentReference) src); + return DocumentReference40_50.convertDocumentReference((org.hl7.fhir.r4.model.DocumentReference) src); if (src instanceof org.hl7.fhir.r4.model.Encounter) - return Encounter.convertEncounter((org.hl7.fhir.r4.model.Encounter) src); + return Encounter40_50.convertEncounter((org.hl7.fhir.r4.model.Encounter) src); if (src instanceof org.hl7.fhir.r4.model.Endpoint) - return Endpoint.convertEndpoint((org.hl7.fhir.r4.model.Endpoint) src); + return Endpoint40_50.convertEndpoint((org.hl7.fhir.r4.model.Endpoint) src); if (src instanceof org.hl7.fhir.r4.model.EnrollmentRequest) - return EnrollmentRequest.convertEnrollmentRequest((org.hl7.fhir.r4.model.EnrollmentRequest) src); + return EnrollmentRequest40_50.convertEnrollmentRequest((org.hl7.fhir.r4.model.EnrollmentRequest) src); if (src instanceof org.hl7.fhir.r4.model.EnrollmentResponse) - return EnrollmentResponse.convertEnrollmentResponse((org.hl7.fhir.r4.model.EnrollmentResponse) src); + return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r4.model.EnrollmentResponse) src); if (src instanceof org.hl7.fhir.r4.model.EpisodeOfCare) - return EpisodeOfCare.convertEpisodeOfCare((org.hl7.fhir.r4.model.EpisodeOfCare) src); + return EpisodeOfCare40_50.convertEpisodeOfCare((org.hl7.fhir.r4.model.EpisodeOfCare) src); if (src instanceof org.hl7.fhir.r4.model.EventDefinition) - return EventDefinition.convertEventDefinition((org.hl7.fhir.r4.model.EventDefinition) src); + return EventDefinition40_50.convertEventDefinition((org.hl7.fhir.r4.model.EventDefinition) src); if (src instanceof org.hl7.fhir.r4.model.ExampleScenario) - return ExampleScenario.convertExampleScenario((org.hl7.fhir.r4.model.ExampleScenario) src); + return ExampleScenario40_50.convertExampleScenario((org.hl7.fhir.r4.model.ExampleScenario) src); if (src instanceof org.hl7.fhir.r4.model.ExplanationOfBenefit) - return ExplanationOfBenefit.convertExplanationOfBenefit((org.hl7.fhir.r4.model.ExplanationOfBenefit) src); + return ExplanationOfBenefit40_50.convertExplanationOfBenefit((org.hl7.fhir.r4.model.ExplanationOfBenefit) src); if (src instanceof org.hl7.fhir.r4.model.FamilyMemberHistory) - return FamilyMemberHistory.convertFamilyMemberHistory((org.hl7.fhir.r4.model.FamilyMemberHistory) src); + return FamilyMemberHistory40_50.convertFamilyMemberHistory((org.hl7.fhir.r4.model.FamilyMemberHistory) src); if (src instanceof org.hl7.fhir.r4.model.Flag) - return Flag.convertFlag((org.hl7.fhir.r4.model.Flag) src); + return Flag40_50.convertFlag((org.hl7.fhir.r4.model.Flag) src); if (src instanceof org.hl7.fhir.r4.model.Goal) - return Goal.convertGoal((org.hl7.fhir.r4.model.Goal) src); + return Goal40_50.convertGoal((org.hl7.fhir.r4.model.Goal) src); if (src instanceof org.hl7.fhir.r4.model.GraphDefinition) - return GraphDefinition.convertGraphDefinition((org.hl7.fhir.r4.model.GraphDefinition) src); + return GraphDefinition40_50.convertGraphDefinition((org.hl7.fhir.r4.model.GraphDefinition) src); if (src instanceof org.hl7.fhir.r4.model.Group) - return Group.convertGroup((org.hl7.fhir.r4.model.Group) src); + return Group40_50.convertGroup((org.hl7.fhir.r4.model.Group) src); if (src instanceof org.hl7.fhir.r4.model.GuidanceResponse) - return GuidanceResponse.convertGuidanceResponse((org.hl7.fhir.r4.model.GuidanceResponse) src); + return GuidanceResponse40_50.convertGuidanceResponse((org.hl7.fhir.r4.model.GuidanceResponse) src); if (src instanceof org.hl7.fhir.r4.model.HealthcareService) - return HealthcareService.convertHealthcareService((org.hl7.fhir.r4.model.HealthcareService) src); + return HealthcareService40_50.convertHealthcareService((org.hl7.fhir.r4.model.HealthcareService) src); if (src instanceof org.hl7.fhir.r4.model.ImagingStudy) - return ImagingStudy.convertImagingStudy((org.hl7.fhir.r4.model.ImagingStudy) src); + return ImagingStudy40_50.convertImagingStudy((org.hl7.fhir.r4.model.ImagingStudy) src); if (src instanceof org.hl7.fhir.r4.model.Immunization) - return Immunization.convertImmunization((org.hl7.fhir.r4.model.Immunization) src); + return Immunization40_50.convertImmunization((org.hl7.fhir.r4.model.Immunization) src); if (src instanceof org.hl7.fhir.r4.model.ImmunizationEvaluation) - return ImmunizationEvaluation.convertImmunizationEvaluation((org.hl7.fhir.r4.model.ImmunizationEvaluation) src); + return ImmunizationEvaluation40_50.convertImmunizationEvaluation((org.hl7.fhir.r4.model.ImmunizationEvaluation) src); if (src instanceof org.hl7.fhir.r4.model.ImmunizationRecommendation) - return ImmunizationRecommendation.convertImmunizationRecommendation((org.hl7.fhir.r4.model.ImmunizationRecommendation) src); + return ImmunizationRecommendation40_50.convertImmunizationRecommendation((org.hl7.fhir.r4.model.ImmunizationRecommendation) src); if (src instanceof org.hl7.fhir.r4.model.ImplementationGuide) - return ImplementationGuide.convertImplementationGuide((org.hl7.fhir.r4.model.ImplementationGuide) src); + return ImplementationGuide40_50.convertImplementationGuide((org.hl7.fhir.r4.model.ImplementationGuide) src); if (src instanceof org.hl7.fhir.r4.model.InsurancePlan) - return InsurancePlan.convertInsurancePlan((org.hl7.fhir.r4.model.InsurancePlan) src); + return InsurancePlan40_50.convertInsurancePlan((org.hl7.fhir.r4.model.InsurancePlan) src); if (src instanceof org.hl7.fhir.r4.model.Invoice) - return Invoice.convertInvoice((org.hl7.fhir.r4.model.Invoice) src); + return Invoice40_50.convertInvoice((org.hl7.fhir.r4.model.Invoice) src); if (src instanceof org.hl7.fhir.r4.model.Library) - return Library.convertLibrary((org.hl7.fhir.r4.model.Library) src); + return Library40_50.convertLibrary((org.hl7.fhir.r4.model.Library) src); if (src instanceof org.hl7.fhir.r4.model.Linkage) - return Linkage.convertLinkage((org.hl7.fhir.r4.model.Linkage) src); + return Linkage40_50.convertLinkage((org.hl7.fhir.r4.model.Linkage) src); if (src instanceof org.hl7.fhir.r4.model.ListResource) - return ListResource.convertListResource((org.hl7.fhir.r4.model.ListResource) src); + return ListResource40_50.convertListResource((org.hl7.fhir.r4.model.ListResource) src); if (src instanceof org.hl7.fhir.r4.model.Location) - return Location.convertLocation((org.hl7.fhir.r4.model.Location) src); + return Location40_50.convertLocation((org.hl7.fhir.r4.model.Location) src); if (src instanceof org.hl7.fhir.r4.model.Measure) - return Measure.convertMeasure((org.hl7.fhir.r4.model.Measure) src); + return Measure40_50.convertMeasure((org.hl7.fhir.r4.model.Measure) src); if (src instanceof org.hl7.fhir.r4.model.MeasureReport) - return MeasureReport.convertMeasureReport((org.hl7.fhir.r4.model.MeasureReport) src); + return MeasureReport40_50.convertMeasureReport((org.hl7.fhir.r4.model.MeasureReport) src); if (src instanceof org.hl7.fhir.r4.model.Media) - return Media.convertMedia((org.hl7.fhir.r4.model.Media) src); + return Media40_50.convertMedia((org.hl7.fhir.r4.model.Media) src); if (src instanceof org.hl7.fhir.r4.model.Medication) - return Medication.convertMedication((org.hl7.fhir.r4.model.Medication) src); + return Medication40_50.convertMedication((org.hl7.fhir.r4.model.Medication) src); if (src instanceof org.hl7.fhir.r4.model.MedicationAdministration) - return MedicationAdministration.convertMedicationAdministration((org.hl7.fhir.r4.model.MedicationAdministration) src); + return MedicationAdministration40_50.convertMedicationAdministration((org.hl7.fhir.r4.model.MedicationAdministration) src); if (src instanceof org.hl7.fhir.r4.model.MedicationDispense) - return MedicationDispense.convertMedicationDispense((org.hl7.fhir.r4.model.MedicationDispense) src); + return MedicationDispense40_50.convertMedicationDispense((org.hl7.fhir.r4.model.MedicationDispense) src); if (src instanceof org.hl7.fhir.r4.model.MedicationKnowledge) - return MedicationKnowledge.convertMedicationKnowledge((org.hl7.fhir.r4.model.MedicationKnowledge) src); + return MedicationKnowledge40_50.convertMedicationKnowledge((org.hl7.fhir.r4.model.MedicationKnowledge) src); if (src instanceof org.hl7.fhir.r4.model.MedicationRequest) - return MedicationRequest.convertMedicationRequest((org.hl7.fhir.r4.model.MedicationRequest) src); + return MedicationRequest40_50.convertMedicationRequest((org.hl7.fhir.r4.model.MedicationRequest) src); if (src instanceof org.hl7.fhir.r4.model.MedicationStatement) - return MedicationStatement.convertMedicationStatement((org.hl7.fhir.r4.model.MedicationStatement) src); + return MedicationStatement40_50.convertMedicationStatement((org.hl7.fhir.r4.model.MedicationStatement) src); if (src instanceof org.hl7.fhir.r4.model.MessageDefinition) - return MessageDefinition.convertMessageDefinition((org.hl7.fhir.r4.model.MessageDefinition) src); + return MessageDefinition40_50.convertMessageDefinition((org.hl7.fhir.r4.model.MessageDefinition) src); if (src instanceof org.hl7.fhir.r4.model.MessageHeader) - return MessageHeader.convertMessageHeader((org.hl7.fhir.r4.model.MessageHeader) src); + return MessageHeader40_50.convertMessageHeader((org.hl7.fhir.r4.model.MessageHeader) src); if (src instanceof org.hl7.fhir.r4.model.MolecularSequence) - return MolecularSequence.convertMolecularSequence((org.hl7.fhir.r4.model.MolecularSequence) src); + return MolecularSequence40_50.convertMolecularSequence((org.hl7.fhir.r4.model.MolecularSequence) src); if (src instanceof org.hl7.fhir.r4.model.NamingSystem) - return NamingSystem.convertNamingSystem((org.hl7.fhir.r4.model.NamingSystem) src); + return NamingSystem40_50.convertNamingSystem((org.hl7.fhir.r4.model.NamingSystem) src); if (src instanceof org.hl7.fhir.r4.model.NutritionOrder) - return NutritionOrder.convertNutritionOrder((org.hl7.fhir.r4.model.NutritionOrder) src); + return NutritionOrder40_50.convertNutritionOrder((org.hl7.fhir.r4.model.NutritionOrder) src); if (src instanceof org.hl7.fhir.r4.model.Observation) - return Observation.convertObservation((org.hl7.fhir.r4.model.Observation) src); + return Observation40_50.convertObservation((org.hl7.fhir.r4.model.Observation) src); if (src instanceof org.hl7.fhir.r4.model.ObservationDefinition) - return ObservationDefinition.convertObservationDefinition((org.hl7.fhir.r4.model.ObservationDefinition) src); + return ObservationDefinition40_50.convertObservationDefinition((org.hl7.fhir.r4.model.ObservationDefinition) src); if (src instanceof org.hl7.fhir.r4.model.OperationDefinition) - return OperationDefinition.convertOperationDefinition((org.hl7.fhir.r4.model.OperationDefinition) src); + return OperationDefinition40_50.convertOperationDefinition((org.hl7.fhir.r4.model.OperationDefinition) src); if (src instanceof org.hl7.fhir.r4.model.OperationOutcome) - return OperationOutcome.convertOperationOutcome((org.hl7.fhir.r4.model.OperationOutcome) src); + return OperationOutcome40_50.convertOperationOutcome((org.hl7.fhir.r4.model.OperationOutcome) src); if (src instanceof org.hl7.fhir.r4.model.Organization) - return Organization.convertOrganization((org.hl7.fhir.r4.model.Organization) src); + return Organization40_50.convertOrganization((org.hl7.fhir.r4.model.Organization) src); if (src instanceof org.hl7.fhir.r4.model.OrganizationAffiliation) - return OrganizationAffiliation.convertOrganizationAffiliation((org.hl7.fhir.r4.model.OrganizationAffiliation) src); + return OrganizationAffiliation40_50.convertOrganizationAffiliation((org.hl7.fhir.r4.model.OrganizationAffiliation) src); if (src instanceof org.hl7.fhir.r4.model.Patient) - return Patient.convertPatient((org.hl7.fhir.r4.model.Patient) src); + return Patient40_50.convertPatient((org.hl7.fhir.r4.model.Patient) src); if (src instanceof org.hl7.fhir.r4.model.PaymentNotice) - return PaymentNotice.convertPaymentNotice((org.hl7.fhir.r4.model.PaymentNotice) src); + return PaymentNotice40_50.convertPaymentNotice((org.hl7.fhir.r4.model.PaymentNotice) src); if (src instanceof org.hl7.fhir.r4.model.PaymentReconciliation) - return PaymentReconciliation.convertPaymentReconciliation((org.hl7.fhir.r4.model.PaymentReconciliation) src); + return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r4.model.PaymentReconciliation) src); if (src instanceof org.hl7.fhir.r4.model.Person) - return Person.convertPerson((org.hl7.fhir.r4.model.Person) src); + return Person40_50.convertPerson((org.hl7.fhir.r4.model.Person) src); if (src instanceof org.hl7.fhir.r4.model.PlanDefinition) - return PlanDefinition.convertPlanDefinition((org.hl7.fhir.r4.model.PlanDefinition) src); + return PlanDefinition40_50.convertPlanDefinition((org.hl7.fhir.r4.model.PlanDefinition) src); if (src instanceof org.hl7.fhir.r4.model.Practitioner) - return Practitioner.convertPractitioner((org.hl7.fhir.r4.model.Practitioner) src); + return Practitioner40_50.convertPractitioner((org.hl7.fhir.r4.model.Practitioner) src); if (src instanceof org.hl7.fhir.r4.model.PractitionerRole) - return PractitionerRole.convertPractitionerRole((org.hl7.fhir.r4.model.PractitionerRole) src); + return PractitionerRole40_50.convertPractitionerRole((org.hl7.fhir.r4.model.PractitionerRole) src); if (src instanceof org.hl7.fhir.r4.model.Procedure) - return Procedure.convertProcedure((org.hl7.fhir.r4.model.Procedure) src); + return Procedure40_50.convertProcedure((org.hl7.fhir.r4.model.Procedure) src); if (src instanceof org.hl7.fhir.r4.model.Provenance) - return Provenance.convertProvenance((org.hl7.fhir.r4.model.Provenance) src); + return Provenance40_50.convertProvenance((org.hl7.fhir.r4.model.Provenance) src); if (src instanceof org.hl7.fhir.r4.model.Questionnaire) - return Questionnaire.convertQuestionnaire((org.hl7.fhir.r4.model.Questionnaire) src); + return Questionnaire40_50.convertQuestionnaire((org.hl7.fhir.r4.model.Questionnaire) src); if (src instanceof org.hl7.fhir.r4.model.QuestionnaireResponse) - return QuestionnaireResponse.convertQuestionnaireResponse((org.hl7.fhir.r4.model.QuestionnaireResponse) src); + return QuestionnaireResponse40_50.convertQuestionnaireResponse((org.hl7.fhir.r4.model.QuestionnaireResponse) src); if (src instanceof org.hl7.fhir.r4.model.RelatedPerson) - return RelatedPerson.convertRelatedPerson((org.hl7.fhir.r4.model.RelatedPerson) src); + return RelatedPerson40_50.convertRelatedPerson((org.hl7.fhir.r4.model.RelatedPerson) src); if (src instanceof org.hl7.fhir.r4.model.RequestGroup) - return RequestGroup.convertRequestGroup((org.hl7.fhir.r4.model.RequestGroup) src); + return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r4.model.RequestGroup) src); if (src instanceof org.hl7.fhir.r4.model.ResearchStudy) - return ResearchStudy.convertResearchStudy((org.hl7.fhir.r4.model.ResearchStudy) src); + return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r4.model.ResearchStudy) src); if (src instanceof org.hl7.fhir.r4.model.ResearchSubject) - return ResearchSubject.convertResearchSubject((org.hl7.fhir.r4.model.ResearchSubject) src); + return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r4.model.ResearchSubject) src); if (src instanceof org.hl7.fhir.r4.model.RiskAssessment) - return RiskAssessment.convertRiskAssessment((org.hl7.fhir.r4.model.RiskAssessment) src); + return RiskAssessment40_50.convertRiskAssessment((org.hl7.fhir.r4.model.RiskAssessment) src); if (src instanceof org.hl7.fhir.r4.model.Schedule) - return Schedule.convertSchedule((org.hl7.fhir.r4.model.Schedule) src); + return Schedule40_50.convertSchedule((org.hl7.fhir.r4.model.Schedule) src); if (src instanceof org.hl7.fhir.r4.model.SearchParameter) - return SearchParameter.convertSearchParameter((org.hl7.fhir.r4.model.SearchParameter) src); + return SearchParameter40_50.convertSearchParameter((org.hl7.fhir.r4.model.SearchParameter) src); if (src instanceof org.hl7.fhir.r4.model.ServiceRequest) - return ServiceRequest.convertServiceRequest((org.hl7.fhir.r4.model.ServiceRequest) src); + return ServiceRequest40_50.convertServiceRequest((org.hl7.fhir.r4.model.ServiceRequest) src); if (src instanceof org.hl7.fhir.r4.model.Slot) - return Slot.convertSlot((org.hl7.fhir.r4.model.Slot) src); + return Slot40_50.convertSlot((org.hl7.fhir.r4.model.Slot) src); if (src instanceof org.hl7.fhir.r4.model.Specimen) - return Specimen.convertSpecimen((org.hl7.fhir.r4.model.Specimen) src); + return Specimen40_50.convertSpecimen((org.hl7.fhir.r4.model.Specimen) src); if (src instanceof org.hl7.fhir.r4.model.SpecimenDefinition) - return SpecimenDefinition.convertSpecimenDefinition((org.hl7.fhir.r4.model.SpecimenDefinition) src); + return SpecimenDefinition40_50.convertSpecimenDefinition((org.hl7.fhir.r4.model.SpecimenDefinition) src); if (src instanceof org.hl7.fhir.r4.model.StructureDefinition) - return StructureDefinition.convertStructureDefinition((org.hl7.fhir.r4.model.StructureDefinition) src); + return StructureDefinition40_50.convertStructureDefinition((org.hl7.fhir.r4.model.StructureDefinition) src); if (src instanceof org.hl7.fhir.r4.model.StructureMap) - return StructureMap.convertStructureMap((org.hl7.fhir.r4.model.StructureMap) src); + return StructureMap40_50.convertStructureMap((org.hl7.fhir.r4.model.StructureMap) src); // if (src instanceof org.hl7.fhir.r4.model.Subscription) // return Subscription.convertSubscription((org.hl7.fhir.r4.model.Subscription) src); if (src instanceof org.hl7.fhir.r4.model.Substance) - return Substance.convertSubstance((org.hl7.fhir.r4.model.Substance) src); + return Substance40_50.convertSubstance((org.hl7.fhir.r4.model.Substance) src); if (src instanceof org.hl7.fhir.r4.model.SubstanceNucleicAcid) - return SubstanceNucleicAcid.convertSubstanceNucleicAcid((org.hl7.fhir.r4.model.SubstanceNucleicAcid) src); + return SubstanceNucleicAcid40_50.convertSubstanceNucleicAcid((org.hl7.fhir.r4.model.SubstanceNucleicAcid) src); if (src instanceof org.hl7.fhir.r4.model.SubstancePolymer) - return SubstancePolymer.convertSubstancePolymer((org.hl7.fhir.r4.model.SubstancePolymer) src); + return SubstancePolymer40_50.convertSubstancePolymer((org.hl7.fhir.r4.model.SubstancePolymer) src); if (src instanceof org.hl7.fhir.r4.model.SubstanceProtein) - return SubstanceProtein.convertSubstanceProtein((org.hl7.fhir.r4.model.SubstanceProtein) src); + return SubstanceProtein40_50.convertSubstanceProtein((org.hl7.fhir.r4.model.SubstanceProtein) src); if (src instanceof org.hl7.fhir.r4.model.SubstanceReferenceInformation) - return SubstanceReferenceInformation.convertSubstanceReferenceInformation((org.hl7.fhir.r4.model.SubstanceReferenceInformation) src); + return SubstanceReferenceInformation40_50.convertSubstanceReferenceInformation((org.hl7.fhir.r4.model.SubstanceReferenceInformation) src); if (src instanceof org.hl7.fhir.r4.model.SubstanceSourceMaterial) - return SubstanceSourceMaterial.convertSubstanceSourceMaterial((org.hl7.fhir.r4.model.SubstanceSourceMaterial) src); + return SubstanceSourceMaterial40_50.convertSubstanceSourceMaterial((org.hl7.fhir.r4.model.SubstanceSourceMaterial) src); if (src instanceof org.hl7.fhir.r4.model.SupplyDelivery) - return SupplyDelivery.convertSupplyDelivery((org.hl7.fhir.r4.model.SupplyDelivery) src); + return SupplyDelivery40_50.convertSupplyDelivery((org.hl7.fhir.r4.model.SupplyDelivery) src); if (src instanceof org.hl7.fhir.r4.model.SupplyRequest) - return SupplyRequest.convertSupplyRequest((org.hl7.fhir.r4.model.SupplyRequest) src); + return SupplyRequest40_50.convertSupplyRequest((org.hl7.fhir.r4.model.SupplyRequest) src); if (src instanceof org.hl7.fhir.r4.model.Task) - return Task.convertTask((org.hl7.fhir.r4.model.Task) src); + return Task40_50.convertTask((org.hl7.fhir.r4.model.Task) src); if (src instanceof org.hl7.fhir.r4.model.TerminologyCapabilities) - return TerminologyCapabilities.convertTerminologyCapabilities((org.hl7.fhir.r4.model.TerminologyCapabilities) src); + return TerminologyCapabilities40_50.convertTerminologyCapabilities((org.hl7.fhir.r4.model.TerminologyCapabilities) src); if (src instanceof org.hl7.fhir.r4.model.TestReport) - return TestReport.convertTestReport((org.hl7.fhir.r4.model.TestReport) src); + return TestReport40_50.convertTestReport((org.hl7.fhir.r4.model.TestReport) src); if (src instanceof org.hl7.fhir.r4.model.TestScript) - return TestScript.convertTestScript((org.hl7.fhir.r4.model.TestScript) src); + return TestScript40_50.convertTestScript((org.hl7.fhir.r4.model.TestScript) src); if (src instanceof org.hl7.fhir.r4.model.ValueSet) - return ValueSet.convertValueSet((org.hl7.fhir.r4.model.ValueSet) src); + return ValueSet40_50.convertValueSet((org.hl7.fhir.r4.model.ValueSet) src); if (src instanceof org.hl7.fhir.r4.model.VerificationResult) - return VerificationResult.convertVerificationResult((org.hl7.fhir.r4.model.VerificationResult) src); + return VerificationResult40_50.convertVerificationResult((org.hl7.fhir.r4.model.VerificationResult) src); if (src instanceof org.hl7.fhir.r4.model.VisionPrescription) - return VisionPrescription.convertVisionPrescription((org.hl7.fhir.r4.model.VisionPrescription) src); + return VisionPrescription40_50.convertVisionPrescription((org.hl7.fhir.r4.model.VisionPrescription) src); throw new Error("Unknown resource "+src.fhirType()); } @@ -3542,263 +3538,263 @@ public class VersionConvertor_40_50 { if (src == null) return null; if (src instanceof org.hl7.fhir.r5.model.Parameters) - return Parameters.convertParameters((org.hl7.fhir.r5.model.Parameters) src); + return Parameters40_50.convertParameters((org.hl7.fhir.r5.model.Parameters) src); if (src instanceof org.hl7.fhir.r5.model.Account) - return Account.convertAccount((org.hl7.fhir.r5.model.Account) src); + return Account40_50.convertAccount((org.hl7.fhir.r5.model.Account) src); if (src instanceof org.hl7.fhir.r5.model.ActivityDefinition) - return ActivityDefinition.convertActivityDefinition((org.hl7.fhir.r5.model.ActivityDefinition) src); + return ActivityDefinition40_50.convertActivityDefinition((org.hl7.fhir.r5.model.ActivityDefinition) src); // if (src instanceof org.hl7.fhir.r5.model.AdverseEvent) // return AdverseEvent.convertAdverseEvent((org.hl7.fhir.r5.model.AdverseEvent) src); if (src instanceof org.hl7.fhir.r5.model.AllergyIntolerance) - return AllergyIntolerance.convertAllergyIntolerance((org.hl7.fhir.r5.model.AllergyIntolerance) src); + return AllergyIntolerance40_50.convertAllergyIntolerance((org.hl7.fhir.r5.model.AllergyIntolerance) src); if (src instanceof org.hl7.fhir.r5.model.Appointment) - return Appointment.convertAppointment((org.hl7.fhir.r5.model.Appointment) src); + return Appointment40_50.convertAppointment((org.hl7.fhir.r5.model.Appointment) src); if (src instanceof org.hl7.fhir.r5.model.AppointmentResponse) - return AppointmentResponse.convertAppointmentResponse((org.hl7.fhir.r5.model.AppointmentResponse) src); + return AppointmentResponse40_50.convertAppointmentResponse((org.hl7.fhir.r5.model.AppointmentResponse) src); if (src instanceof org.hl7.fhir.r5.model.AuditEvent) - return AuditEvent.convertAuditEvent((org.hl7.fhir.r5.model.AuditEvent) src); + return AuditEvent40_50.convertAuditEvent((org.hl7.fhir.r5.model.AuditEvent) src); if (src instanceof org.hl7.fhir.r5.model.Basic) - return Basic.convertBasic((org.hl7.fhir.r5.model.Basic) src); + return Basic40_50.convertBasic((org.hl7.fhir.r5.model.Basic) src); if (src instanceof org.hl7.fhir.r5.model.Binary) - return Binary.convertBinary((org.hl7.fhir.r5.model.Binary) src); + return Binary40_50.convertBinary((org.hl7.fhir.r5.model.Binary) src); if (src instanceof org.hl7.fhir.r5.model.BiologicallyDerivedProduct) - return BiologicallyDerivedProduct.convertBiologicallyDerivedProduct((org.hl7.fhir.r5.model.BiologicallyDerivedProduct) src); + return BiologicallyDerivedProduct40_50.convertBiologicallyDerivedProduct((org.hl7.fhir.r5.model.BiologicallyDerivedProduct) src); if (src instanceof org.hl7.fhir.r5.model.BodyStructure) - return BodyStructure.convertBodyStructure((org.hl7.fhir.r5.model.BodyStructure) src); + return BodyStructure40_50.convertBodyStructure((org.hl7.fhir.r5.model.BodyStructure) src); if (src instanceof org.hl7.fhir.r5.model.Bundle) - return Bundle.convertBundle((org.hl7.fhir.r5.model.Bundle) src); + return Bundle40_50.convertBundle((org.hl7.fhir.r5.model.Bundle) src); if (src instanceof org.hl7.fhir.r5.model.CapabilityStatement) - return CapabilityStatement.convertCapabilityStatement((org.hl7.fhir.r5.model.CapabilityStatement) src); + return CapabilityStatement40_50.convertCapabilityStatement((org.hl7.fhir.r5.model.CapabilityStatement) src); if (src instanceof org.hl7.fhir.r5.model.CarePlan) - return CarePlan.convertCarePlan((org.hl7.fhir.r5.model.CarePlan) src); + return CarePlan40_50.convertCarePlan((org.hl7.fhir.r5.model.CarePlan) src); if (src instanceof org.hl7.fhir.r5.model.CareTeam) - return CareTeam.convertCareTeam((org.hl7.fhir.r5.model.CareTeam) src); + return CareTeam40_50.convertCareTeam((org.hl7.fhir.r5.model.CareTeam) src); // if (src instanceof org.hl7.fhir.r5.model.CatalogEntry) // return CatalogEntry.convertCatalogEntry((org.hl7.fhir.r5.model.CatalogEntry) src); if (src instanceof org.hl7.fhir.r5.model.ChargeItem) - return ChargeItem.convertChargeItem((org.hl7.fhir.r5.model.ChargeItem) src); + return ChargeItem40_50.convertChargeItem((org.hl7.fhir.r5.model.ChargeItem) src); if (src instanceof org.hl7.fhir.r5.model.ChargeItemDefinition) - return ChargeItemDefinition.convertChargeItemDefinition((org.hl7.fhir.r5.model.ChargeItemDefinition) src); + return ChargeItemDefinition40_50.convertChargeItemDefinition((org.hl7.fhir.r5.model.ChargeItemDefinition) src); if (src instanceof org.hl7.fhir.r5.model.Claim) - return Claim.convertClaim((org.hl7.fhir.r5.model.Claim) src); + return Claim40_50.convertClaim((org.hl7.fhir.r5.model.Claim) src); if (src instanceof org.hl7.fhir.r5.model.ClaimResponse) - return ClaimResponse.convertClaimResponse((org.hl7.fhir.r5.model.ClaimResponse) src); + return ClaimResponse40_50.convertClaimResponse((org.hl7.fhir.r5.model.ClaimResponse) src); if (src instanceof org.hl7.fhir.r5.model.ClinicalImpression) - return ClinicalImpression.convertClinicalImpression((org.hl7.fhir.r5.model.ClinicalImpression) src); + return ClinicalImpression40_50.convertClinicalImpression((org.hl7.fhir.r5.model.ClinicalImpression) src); if (src instanceof org.hl7.fhir.r5.model.CodeSystem) - return CodeSystem.convertCodeSystem((org.hl7.fhir.r5.model.CodeSystem) src); + return CodeSystem40_50.convertCodeSystem((org.hl7.fhir.r5.model.CodeSystem) src); if (src instanceof org.hl7.fhir.r5.model.Communication) - return Communication.convertCommunication((org.hl7.fhir.r5.model.Communication) src); + return Communication40_50.convertCommunication((org.hl7.fhir.r5.model.Communication) src); if (src instanceof org.hl7.fhir.r5.model.CommunicationRequest) - return CommunicationRequest.convertCommunicationRequest((org.hl7.fhir.r5.model.CommunicationRequest) src); + return CommunicationRequest40_50.convertCommunicationRequest((org.hl7.fhir.r5.model.CommunicationRequest) src); if (src instanceof org.hl7.fhir.r5.model.CompartmentDefinition) - return CompartmentDefinition.convertCompartmentDefinition((org.hl7.fhir.r5.model.CompartmentDefinition) src); + return CompartmentDefinition40_50.convertCompartmentDefinition((org.hl7.fhir.r5.model.CompartmentDefinition) src); if (src instanceof org.hl7.fhir.r5.model.Composition) - return Composition.convertComposition((org.hl7.fhir.r5.model.Composition) src); + return Composition40_50.convertComposition((org.hl7.fhir.r5.model.Composition) src); if (src instanceof org.hl7.fhir.r5.model.ConceptMap) - return ConceptMap.convertConceptMap((org.hl7.fhir.r5.model.ConceptMap) src); + return ConceptMap40_50.convertConceptMap((org.hl7.fhir.r5.model.ConceptMap) src); if (src instanceof org.hl7.fhir.r5.model.Condition) - return Condition.convertCondition((org.hl7.fhir.r5.model.Condition) src); + return Condition40_50.convertCondition((org.hl7.fhir.r5.model.Condition) src); if (src instanceof org.hl7.fhir.r5.model.Consent) - return Consent.convertConsent((org.hl7.fhir.r5.model.Consent) src); + return Consent40_50.convertConsent((org.hl7.fhir.r5.model.Consent) src); if (src instanceof org.hl7.fhir.r5.model.Contract) - return Contract.convertContract((org.hl7.fhir.r5.model.Contract) src); + return Contract40_50.convertContract((org.hl7.fhir.r5.model.Contract) src); if (src instanceof org.hl7.fhir.r5.model.Coverage) - return Coverage.convertCoverage((org.hl7.fhir.r5.model.Coverage) src); + return Coverage40_50.convertCoverage((org.hl7.fhir.r5.model.Coverage) src); if (src instanceof org.hl7.fhir.r5.model.CoverageEligibilityRequest) - return CoverageEligibilityRequest.convertCoverageEligibilityRequest((org.hl7.fhir.r5.model.CoverageEligibilityRequest) src); + return CoverageEligibilityRequest40_50.convertCoverageEligibilityRequest((org.hl7.fhir.r5.model.CoverageEligibilityRequest) src); if (src instanceof org.hl7.fhir.r5.model.CoverageEligibilityResponse) - return CoverageEligibilityResponse.convertCoverageEligibilityResponse((org.hl7.fhir.r5.model.CoverageEligibilityResponse) src); + return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r5.model.CoverageEligibilityResponse) src); if (src instanceof org.hl7.fhir.r5.model.DetectedIssue) - return DetectedIssue.convertDetectedIssue((org.hl7.fhir.r5.model.DetectedIssue) src); + return DetectedIssue40_50.convertDetectedIssue((org.hl7.fhir.r5.model.DetectedIssue) src); if (src instanceof org.hl7.fhir.r5.model.Device) - return Device.convertDevice((org.hl7.fhir.r5.model.Device) src); + return Device40_50.convertDevice((org.hl7.fhir.r5.model.Device) src); if (src instanceof org.hl7.fhir.r5.model.DeviceDefinition) - return DeviceDefinition.convertDeviceDefinition((org.hl7.fhir.r5.model.DeviceDefinition) src); + return DeviceDefinition40_50.convertDeviceDefinition((org.hl7.fhir.r5.model.DeviceDefinition) src); if (src instanceof org.hl7.fhir.r5.model.DeviceMetric) - return DeviceMetric.convertDeviceMetric((org.hl7.fhir.r5.model.DeviceMetric) src); + return DeviceMetric40_50.convertDeviceMetric((org.hl7.fhir.r5.model.DeviceMetric) src); if (src instanceof org.hl7.fhir.r5.model.DeviceRequest) - return DeviceRequest.convertDeviceRequest((org.hl7.fhir.r5.model.DeviceRequest) src); + return DeviceRequest40_50.convertDeviceRequest((org.hl7.fhir.r5.model.DeviceRequest) src); if (src instanceof org.hl7.fhir.r5.model.DeviceUseStatement) - return DeviceUseStatement.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUseStatement) src); + return DeviceUseStatement40_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUseStatement) src); if (src instanceof org.hl7.fhir.r5.model.DiagnosticReport) - return DiagnosticReport.convertDiagnosticReport((org.hl7.fhir.r5.model.DiagnosticReport) src); + return DiagnosticReport40_50.convertDiagnosticReport((org.hl7.fhir.r5.model.DiagnosticReport) src); if (src instanceof org.hl7.fhir.r5.model.DocumentManifest) - return DocumentManifest.convertDocumentManifest((org.hl7.fhir.r5.model.DocumentManifest) src); + return DocumentManifest40_50.convertDocumentManifest((org.hl7.fhir.r5.model.DocumentManifest) src); if (src instanceof org.hl7.fhir.r5.model.DocumentReference) - return DocumentReference.convertDocumentReference((org.hl7.fhir.r5.model.DocumentReference) src); + return DocumentReference40_50.convertDocumentReference((org.hl7.fhir.r5.model.DocumentReference) src); if (src instanceof org.hl7.fhir.r5.model.Encounter) - return Encounter.convertEncounter((org.hl7.fhir.r5.model.Encounter) src); + return Encounter40_50.convertEncounter((org.hl7.fhir.r5.model.Encounter) src); if (src instanceof org.hl7.fhir.r5.model.Endpoint) - return Endpoint.convertEndpoint((org.hl7.fhir.r5.model.Endpoint) src); + return Endpoint40_50.convertEndpoint((org.hl7.fhir.r5.model.Endpoint) src); if (src instanceof org.hl7.fhir.r5.model.EnrollmentRequest) - return EnrollmentRequest.convertEnrollmentRequest((org.hl7.fhir.r5.model.EnrollmentRequest) src); + return EnrollmentRequest40_50.convertEnrollmentRequest((org.hl7.fhir.r5.model.EnrollmentRequest) src); if (src instanceof org.hl7.fhir.r5.model.EnrollmentResponse) - return EnrollmentResponse.convertEnrollmentResponse((org.hl7.fhir.r5.model.EnrollmentResponse) src); + return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r5.model.EnrollmentResponse) src); if (src instanceof org.hl7.fhir.r5.model.EpisodeOfCare) - return EpisodeOfCare.convertEpisodeOfCare((org.hl7.fhir.r5.model.EpisodeOfCare) src); + return EpisodeOfCare40_50.convertEpisodeOfCare((org.hl7.fhir.r5.model.EpisodeOfCare) src); if (src instanceof org.hl7.fhir.r5.model.EventDefinition) - return EventDefinition.convertEventDefinition((org.hl7.fhir.r5.model.EventDefinition) src); + return EventDefinition40_50.convertEventDefinition((org.hl7.fhir.r5.model.EventDefinition) src); if (src instanceof org.hl7.fhir.r5.model.ExampleScenario) - return ExampleScenario.convertExampleScenario((org.hl7.fhir.r5.model.ExampleScenario) src); + return ExampleScenario40_50.convertExampleScenario((org.hl7.fhir.r5.model.ExampleScenario) src); if (src instanceof org.hl7.fhir.r5.model.ExplanationOfBenefit) - return ExplanationOfBenefit.convertExplanationOfBenefit((org.hl7.fhir.r5.model.ExplanationOfBenefit) src); + return ExplanationOfBenefit40_50.convertExplanationOfBenefit((org.hl7.fhir.r5.model.ExplanationOfBenefit) src); if (src instanceof org.hl7.fhir.r5.model.FamilyMemberHistory) - return FamilyMemberHistory.convertFamilyMemberHistory((org.hl7.fhir.r5.model.FamilyMemberHistory) src); + return FamilyMemberHistory40_50.convertFamilyMemberHistory((org.hl7.fhir.r5.model.FamilyMemberHistory) src); if (src instanceof org.hl7.fhir.r5.model.Flag) - return Flag.convertFlag((org.hl7.fhir.r5.model.Flag) src); + return Flag40_50.convertFlag((org.hl7.fhir.r5.model.Flag) src); if (src instanceof org.hl7.fhir.r5.model.Goal) - return Goal.convertGoal((org.hl7.fhir.r5.model.Goal) src); + return Goal40_50.convertGoal((org.hl7.fhir.r5.model.Goal) src); if (src instanceof org.hl7.fhir.r5.model.GraphDefinition) - return GraphDefinition.convertGraphDefinition((org.hl7.fhir.r5.model.GraphDefinition) src); + return GraphDefinition40_50.convertGraphDefinition((org.hl7.fhir.r5.model.GraphDefinition) src); if (src instanceof org.hl7.fhir.r5.model.Group) - return Group.convertGroup((org.hl7.fhir.r5.model.Group) src); + return Group40_50.convertGroup((org.hl7.fhir.r5.model.Group) src); if (src instanceof org.hl7.fhir.r5.model.GuidanceResponse) - return GuidanceResponse.convertGuidanceResponse((org.hl7.fhir.r5.model.GuidanceResponse) src); + return GuidanceResponse40_50.convertGuidanceResponse((org.hl7.fhir.r5.model.GuidanceResponse) src); if (src instanceof org.hl7.fhir.r5.model.HealthcareService) - return HealthcareService.convertHealthcareService((org.hl7.fhir.r5.model.HealthcareService) src); + return HealthcareService40_50.convertHealthcareService((org.hl7.fhir.r5.model.HealthcareService) src); if (src instanceof org.hl7.fhir.r5.model.ImagingStudy) - return ImagingStudy.convertImagingStudy((org.hl7.fhir.r5.model.ImagingStudy) src); + return ImagingStudy40_50.convertImagingStudy((org.hl7.fhir.r5.model.ImagingStudy) src); if (src instanceof org.hl7.fhir.r5.model.Immunization) - return Immunization.convertImmunization((org.hl7.fhir.r5.model.Immunization) src); + return Immunization40_50.convertImmunization((org.hl7.fhir.r5.model.Immunization) src); if (src instanceof org.hl7.fhir.r5.model.ImmunizationEvaluation) - return ImmunizationEvaluation.convertImmunizationEvaluation((org.hl7.fhir.r5.model.ImmunizationEvaluation) src); + return ImmunizationEvaluation40_50.convertImmunizationEvaluation((org.hl7.fhir.r5.model.ImmunizationEvaluation) src); if (src instanceof org.hl7.fhir.r5.model.ImmunizationRecommendation) - return ImmunizationRecommendation.convertImmunizationRecommendation((org.hl7.fhir.r5.model.ImmunizationRecommendation) src); + return ImmunizationRecommendation40_50.convertImmunizationRecommendation((org.hl7.fhir.r5.model.ImmunizationRecommendation) src); if (src instanceof org.hl7.fhir.r5.model.ImplementationGuide) - return ImplementationGuide.convertImplementationGuide((org.hl7.fhir.r5.model.ImplementationGuide) src); + return ImplementationGuide40_50.convertImplementationGuide((org.hl7.fhir.r5.model.ImplementationGuide) src); if (src instanceof org.hl7.fhir.r5.model.InsurancePlan) - return InsurancePlan.convertInsurancePlan((org.hl7.fhir.r5.model.InsurancePlan) src); + return InsurancePlan40_50.convertInsurancePlan((org.hl7.fhir.r5.model.InsurancePlan) src); if (src instanceof org.hl7.fhir.r5.model.Invoice) - return Invoice.convertInvoice((org.hl7.fhir.r5.model.Invoice) src); + return Invoice40_50.convertInvoice((org.hl7.fhir.r5.model.Invoice) src); if (src instanceof org.hl7.fhir.r5.model.Library) - return Library.convertLibrary((org.hl7.fhir.r5.model.Library) src); + return Library40_50.convertLibrary((org.hl7.fhir.r5.model.Library) src); if (src instanceof org.hl7.fhir.r5.model.Linkage) - return Linkage.convertLinkage((org.hl7.fhir.r5.model.Linkage) src); + return Linkage40_50.convertLinkage((org.hl7.fhir.r5.model.Linkage) src); if (src instanceof org.hl7.fhir.r5.model.ListResource) - return ListResource.convertListResource((org.hl7.fhir.r5.model.ListResource) src); + return ListResource40_50.convertListResource((org.hl7.fhir.r5.model.ListResource) src); if (src instanceof org.hl7.fhir.r5.model.Location) - return Location.convertLocation((org.hl7.fhir.r5.model.Location) src); + return Location40_50.convertLocation((org.hl7.fhir.r5.model.Location) src); if (src instanceof org.hl7.fhir.r5.model.Measure) - return Measure.convertMeasure((org.hl7.fhir.r5.model.Measure) src); + return Measure40_50.convertMeasure((org.hl7.fhir.r5.model.Measure) src); if (src instanceof org.hl7.fhir.r5.model.MeasureReport) - return MeasureReport.convertMeasureReport((org.hl7.fhir.r5.model.MeasureReport) src); + return MeasureReport40_50.convertMeasureReport((org.hl7.fhir.r5.model.MeasureReport) src); if (src instanceof org.hl7.fhir.r5.model.DocumentReference) // todo: will never get here (doesn't work anyway) - return Media.convertMedia((org.hl7.fhir.r5.model.DocumentReference) src); + return Media40_50.convertMedia((org.hl7.fhir.r5.model.DocumentReference) src); if (src instanceof org.hl7.fhir.r5.model.Medication) - return Medication.convertMedication((org.hl7.fhir.r5.model.Medication) src); + return Medication40_50.convertMedication((org.hl7.fhir.r5.model.Medication) src); if (src instanceof org.hl7.fhir.r5.model.MedicationAdministration) - return MedicationAdministration.convertMedicationAdministration((org.hl7.fhir.r5.model.MedicationAdministration) src); + return MedicationAdministration40_50.convertMedicationAdministration((org.hl7.fhir.r5.model.MedicationAdministration) src); if (src instanceof org.hl7.fhir.r5.model.MedicationDispense) - return MedicationDispense.convertMedicationDispense((org.hl7.fhir.r5.model.MedicationDispense) src); + return MedicationDispense40_50.convertMedicationDispense((org.hl7.fhir.r5.model.MedicationDispense) src); if (src instanceof org.hl7.fhir.r5.model.MedicationKnowledge) - return MedicationKnowledge.convertMedicationKnowledge((org.hl7.fhir.r5.model.MedicationKnowledge) src); + return MedicationKnowledge40_50.convertMedicationKnowledge((org.hl7.fhir.r5.model.MedicationKnowledge) src); if (src instanceof org.hl7.fhir.r5.model.MedicationRequest) - return MedicationRequest.convertMedicationRequest((org.hl7.fhir.r5.model.MedicationRequest) src); + return MedicationRequest40_50.convertMedicationRequest((org.hl7.fhir.r5.model.MedicationRequest) src); if (src instanceof org.hl7.fhir.r5.model.MedicationUsage) - return MedicationStatement.convertMedicationStatement((org.hl7.fhir.r5.model.MedicationUsage) src); + return MedicationStatement40_50.convertMedicationStatement((org.hl7.fhir.r5.model.MedicationUsage) src); if (src instanceof org.hl7.fhir.r5.model.MessageDefinition) - return MessageDefinition.convertMessageDefinition((org.hl7.fhir.r5.model.MessageDefinition) src); + return MessageDefinition40_50.convertMessageDefinition((org.hl7.fhir.r5.model.MessageDefinition) src); if (src instanceof org.hl7.fhir.r5.model.MessageHeader) - return MessageHeader.convertMessageHeader((org.hl7.fhir.r5.model.MessageHeader) src); + return MessageHeader40_50.convertMessageHeader((org.hl7.fhir.r5.model.MessageHeader) src); if (src instanceof org.hl7.fhir.r5.model.MolecularSequence) - return MolecularSequence.convertMolecularSequence((org.hl7.fhir.r5.model.MolecularSequence) src); + return MolecularSequence40_50.convertMolecularSequence((org.hl7.fhir.r5.model.MolecularSequence) src); if (src instanceof org.hl7.fhir.r5.model.NamingSystem) - return NamingSystem.convertNamingSystem((org.hl7.fhir.r5.model.NamingSystem) src); + return NamingSystem40_50.convertNamingSystem((org.hl7.fhir.r5.model.NamingSystem) src); if (src instanceof org.hl7.fhir.r5.model.NutritionOrder) - return NutritionOrder.convertNutritionOrder((org.hl7.fhir.r5.model.NutritionOrder) src); + return NutritionOrder40_50.convertNutritionOrder((org.hl7.fhir.r5.model.NutritionOrder) src); if (src instanceof org.hl7.fhir.r5.model.Observation) - return Observation.convertObservation((org.hl7.fhir.r5.model.Observation) src); + return Observation40_50.convertObservation((org.hl7.fhir.r5.model.Observation) src); if (src instanceof org.hl7.fhir.r5.model.ObservationDefinition) - return ObservationDefinition.convertObservationDefinition((org.hl7.fhir.r5.model.ObservationDefinition) src); + return ObservationDefinition40_50.convertObservationDefinition((org.hl7.fhir.r5.model.ObservationDefinition) src); if (src instanceof org.hl7.fhir.r5.model.OperationDefinition) - return OperationDefinition.convertOperationDefinition((org.hl7.fhir.r5.model.OperationDefinition) src); + return OperationDefinition40_50.convertOperationDefinition((org.hl7.fhir.r5.model.OperationDefinition) src); if (src instanceof org.hl7.fhir.r5.model.OperationOutcome) - return OperationOutcome.convertOperationOutcome((org.hl7.fhir.r5.model.OperationOutcome) src); + return OperationOutcome40_50.convertOperationOutcome((org.hl7.fhir.r5.model.OperationOutcome) src); if (src instanceof org.hl7.fhir.r5.model.Organization) - return Organization.convertOrganization((org.hl7.fhir.r5.model.Organization) src); + return Organization40_50.convertOrganization((org.hl7.fhir.r5.model.Organization) src); if (src instanceof org.hl7.fhir.r5.model.OrganizationAffiliation) - return OrganizationAffiliation.convertOrganizationAffiliation((org.hl7.fhir.r5.model.OrganizationAffiliation) src); + return OrganizationAffiliation40_50.convertOrganizationAffiliation((org.hl7.fhir.r5.model.OrganizationAffiliation) src); if (src instanceof org.hl7.fhir.r5.model.Patient) - return Patient.convertPatient((org.hl7.fhir.r5.model.Patient) src); + return Patient40_50.convertPatient((org.hl7.fhir.r5.model.Patient) src); if (src instanceof org.hl7.fhir.r5.model.PaymentNotice) - return PaymentNotice.convertPaymentNotice((org.hl7.fhir.r5.model.PaymentNotice) src); + return PaymentNotice40_50.convertPaymentNotice((org.hl7.fhir.r5.model.PaymentNotice) src); if (src instanceof org.hl7.fhir.r5.model.PaymentReconciliation) - return PaymentReconciliation.convertPaymentReconciliation((org.hl7.fhir.r5.model.PaymentReconciliation) src); + return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r5.model.PaymentReconciliation) src); if (src instanceof org.hl7.fhir.r5.model.Person) - return Person.convertPerson((org.hl7.fhir.r5.model.Person) src); + return Person40_50.convertPerson((org.hl7.fhir.r5.model.Person) src); if (src instanceof org.hl7.fhir.r5.model.PlanDefinition) - return PlanDefinition.convertPlanDefinition((org.hl7.fhir.r5.model.PlanDefinition) src); + return PlanDefinition40_50.convertPlanDefinition((org.hl7.fhir.r5.model.PlanDefinition) src); if (src instanceof org.hl7.fhir.r5.model.Practitioner) - return Practitioner.convertPractitioner((org.hl7.fhir.r5.model.Practitioner) src); + return Practitioner40_50.convertPractitioner((org.hl7.fhir.r5.model.Practitioner) src); if (src instanceof org.hl7.fhir.r5.model.PractitionerRole) - return PractitionerRole.convertPractitionerRole((org.hl7.fhir.r5.model.PractitionerRole) src); + return PractitionerRole40_50.convertPractitionerRole((org.hl7.fhir.r5.model.PractitionerRole) src); if (src instanceof org.hl7.fhir.r5.model.Procedure) - return Procedure.convertProcedure((org.hl7.fhir.r5.model.Procedure) src); + return Procedure40_50.convertProcedure((org.hl7.fhir.r5.model.Procedure) src); if (src instanceof org.hl7.fhir.r5.model.Provenance) - return Provenance.convertProvenance((org.hl7.fhir.r5.model.Provenance) src); + return Provenance40_50.convertProvenance((org.hl7.fhir.r5.model.Provenance) src); if (src instanceof org.hl7.fhir.r5.model.Questionnaire) - return Questionnaire.convertQuestionnaire((org.hl7.fhir.r5.model.Questionnaire) src); + return Questionnaire40_50.convertQuestionnaire((org.hl7.fhir.r5.model.Questionnaire) src); if (src instanceof org.hl7.fhir.r5.model.QuestionnaireResponse) - return QuestionnaireResponse.convertQuestionnaireResponse((org.hl7.fhir.r5.model.QuestionnaireResponse) src); + return QuestionnaireResponse40_50.convertQuestionnaireResponse((org.hl7.fhir.r5.model.QuestionnaireResponse) src); if (src instanceof org.hl7.fhir.r5.model.RelatedPerson) - return RelatedPerson.convertRelatedPerson((org.hl7.fhir.r5.model.RelatedPerson) src); + return RelatedPerson40_50.convertRelatedPerson((org.hl7.fhir.r5.model.RelatedPerson) src); if (src instanceof org.hl7.fhir.r5.model.RequestGroup) - return RequestGroup.convertRequestGroup((org.hl7.fhir.r5.model.RequestGroup) src); + return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r5.model.RequestGroup) src); if (src instanceof org.hl7.fhir.r5.model.ResearchStudy) - return ResearchStudy.convertResearchStudy((org.hl7.fhir.r5.model.ResearchStudy) src); + return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r5.model.ResearchStudy) src); if (src instanceof org.hl7.fhir.r5.model.ResearchSubject) - return ResearchSubject.convertResearchSubject((org.hl7.fhir.r5.model.ResearchSubject) src); + return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r5.model.ResearchSubject) src); if (src instanceof org.hl7.fhir.r5.model.RiskAssessment) - return RiskAssessment.convertRiskAssessment((org.hl7.fhir.r5.model.RiskAssessment) src); + return RiskAssessment40_50.convertRiskAssessment((org.hl7.fhir.r5.model.RiskAssessment) src); if (src instanceof org.hl7.fhir.r5.model.Schedule) - return Schedule.convertSchedule((org.hl7.fhir.r5.model.Schedule) src); + return Schedule40_50.convertSchedule((org.hl7.fhir.r5.model.Schedule) src); if (src instanceof org.hl7.fhir.r5.model.SearchParameter) - return SearchParameter.convertSearchParameter((org.hl7.fhir.r5.model.SearchParameter) src); + return SearchParameter40_50.convertSearchParameter((org.hl7.fhir.r5.model.SearchParameter) src); if (src instanceof org.hl7.fhir.r5.model.ServiceRequest) - return ServiceRequest.convertServiceRequest((org.hl7.fhir.r5.model.ServiceRequest) src); + return ServiceRequest40_50.convertServiceRequest((org.hl7.fhir.r5.model.ServiceRequest) src); if (src instanceof org.hl7.fhir.r5.model.Slot) - return Slot.convertSlot((org.hl7.fhir.r5.model.Slot) src); + return Slot40_50.convertSlot((org.hl7.fhir.r5.model.Slot) src); if (src instanceof org.hl7.fhir.r5.model.Specimen) - return Specimen.convertSpecimen((org.hl7.fhir.r5.model.Specimen) src); + return Specimen40_50.convertSpecimen((org.hl7.fhir.r5.model.Specimen) src); if (src instanceof org.hl7.fhir.r5.model.SpecimenDefinition) - return SpecimenDefinition.convertSpecimenDefinition((org.hl7.fhir.r5.model.SpecimenDefinition) src); + return SpecimenDefinition40_50.convertSpecimenDefinition((org.hl7.fhir.r5.model.SpecimenDefinition) src); if (src instanceof org.hl7.fhir.r5.model.StructureDefinition) - return StructureDefinition.convertStructureDefinition((org.hl7.fhir.r5.model.StructureDefinition) src); + return StructureDefinition40_50.convertStructureDefinition((org.hl7.fhir.r5.model.StructureDefinition) src); if (src instanceof org.hl7.fhir.r5.model.StructureMap) - return StructureMap.convertStructureMap((org.hl7.fhir.r5.model.StructureMap) src); + return StructureMap40_50.convertStructureMap((org.hl7.fhir.r5.model.StructureMap) src); // if (src instanceof org.hl7.fhir.r5.model.Subscription) // return Subscription.convertSubscription((org.hl7.fhir.r5.model.Subscription) src); if (src instanceof org.hl7.fhir.r5.model.Substance) - return Substance.convertSubstance((org.hl7.fhir.r5.model.Substance) src); + return Substance40_50.convertSubstance((org.hl7.fhir.r5.model.Substance) src); if (src instanceof org.hl7.fhir.r5.model.SubstanceNucleicAcid) - return SubstanceNucleicAcid.convertSubstanceNucleicAcid((org.hl7.fhir.r5.model.SubstanceNucleicAcid) src); + return SubstanceNucleicAcid40_50.convertSubstanceNucleicAcid((org.hl7.fhir.r5.model.SubstanceNucleicAcid) src); if (src instanceof org.hl7.fhir.r5.model.SubstancePolymer) - return SubstancePolymer.convertSubstancePolymer((org.hl7.fhir.r5.model.SubstancePolymer) src); + return SubstancePolymer40_50.convertSubstancePolymer((org.hl7.fhir.r5.model.SubstancePolymer) src); if (src instanceof org.hl7.fhir.r5.model.SubstanceProtein) - return SubstanceProtein.convertSubstanceProtein((org.hl7.fhir.r5.model.SubstanceProtein) src); + return SubstanceProtein40_50.convertSubstanceProtein((org.hl7.fhir.r5.model.SubstanceProtein) src); if (src instanceof org.hl7.fhir.r5.model.SubstanceReferenceInformation) - return SubstanceReferenceInformation.convertSubstanceReferenceInformation((org.hl7.fhir.r5.model.SubstanceReferenceInformation) src); + return SubstanceReferenceInformation40_50.convertSubstanceReferenceInformation((org.hl7.fhir.r5.model.SubstanceReferenceInformation) src); if (src instanceof org.hl7.fhir.r5.model.SubstanceSourceMaterial) - return SubstanceSourceMaterial.convertSubstanceSourceMaterial((org.hl7.fhir.r5.model.SubstanceSourceMaterial) src); + return SubstanceSourceMaterial40_50.convertSubstanceSourceMaterial((org.hl7.fhir.r5.model.SubstanceSourceMaterial) src); if (src instanceof org.hl7.fhir.r5.model.SupplyDelivery) - return SupplyDelivery.convertSupplyDelivery((org.hl7.fhir.r5.model.SupplyDelivery) src); + return SupplyDelivery40_50.convertSupplyDelivery((org.hl7.fhir.r5.model.SupplyDelivery) src); if (src instanceof org.hl7.fhir.r5.model.SupplyRequest) - return SupplyRequest.convertSupplyRequest((org.hl7.fhir.r5.model.SupplyRequest) src); + return SupplyRequest40_50.convertSupplyRequest((org.hl7.fhir.r5.model.SupplyRequest) src); if (src instanceof org.hl7.fhir.r5.model.Task) - return Task.convertTask((org.hl7.fhir.r5.model.Task) src); + return Task40_50.convertTask((org.hl7.fhir.r5.model.Task) src); if (src instanceof org.hl7.fhir.r5.model.TerminologyCapabilities) - return TerminologyCapabilities.convertTerminologyCapabilities((org.hl7.fhir.r5.model.TerminologyCapabilities) src); + return TerminologyCapabilities40_50.convertTerminologyCapabilities((org.hl7.fhir.r5.model.TerminologyCapabilities) src); if (src instanceof org.hl7.fhir.r5.model.TestReport) - return TestReport.convertTestReport((org.hl7.fhir.r5.model.TestReport) src); + return TestReport40_50.convertTestReport((org.hl7.fhir.r5.model.TestReport) src); if (src instanceof org.hl7.fhir.r5.model.TestScript) - return TestScript.convertTestScript((org.hl7.fhir.r5.model.TestScript) src); + return TestScript40_50.convertTestScript((org.hl7.fhir.r5.model.TestScript) src); if (src instanceof org.hl7.fhir.r5.model.ValueSet) - return ValueSet.convertValueSet((org.hl7.fhir.r5.model.ValueSet) src); + return ValueSet40_50.convertValueSet((org.hl7.fhir.r5.model.ValueSet) src); if (src instanceof org.hl7.fhir.r5.model.VerificationResult) - return VerificationResult.convertVerificationResult((org.hl7.fhir.r5.model.VerificationResult) src); + return VerificationResult40_50.convertVerificationResult((org.hl7.fhir.r5.model.VerificationResult) src); if (src instanceof org.hl7.fhir.r5.model.VisionPrescription) - return VisionPrescription.convertVisionPrescription((org.hl7.fhir.r5.model.VisionPrescription) src); + return VisionPrescription40_50.convertVisionPrescription((org.hl7.fhir.r5.model.VisionPrescription) src); throw new Error("Unknown resource "+src.fhirType()); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account40_50.java index 11cf33612..3f6f96064 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Account40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Account extends VersionConvertor_40_50 { +public class Account40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Account convertAccount(org.hl7.fhir.r4.model.Account src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java index 96e7e6500..63607b94d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ActivityDefinition extends VersionConvertor_40_50 { +public class ActivityDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ActivityDefinition convertActivityDefinition(org.hl7.fhir.r4.model.ActivityDefinition src) throws FHIRException { if (src == null) @@ -72,7 +72,7 @@ public class ActivityDefinition extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) @@ -190,7 +190,7 @@ public class ActivityDefinition extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java index 02595a457..68f8a18ab 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class AllergyIntolerance extends VersionConvertor_40_50 { +public class AllergyIntolerance40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.AllergyIntolerance convertAllergyIntolerance(org.hl7.fhir.r4.model.AllergyIntolerance src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java index 8908b163f..8a9026c20 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Appointment extends VersionConvertor_40_50 { +public class Appointment40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Appointment convertAppointment(org.hl7.fhir.r4.model.Appointment src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse40_50.java index 130937ff9..777a501ce 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AppointmentResponse40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class AppointmentResponse extends VersionConvertor_40_50 { +public class AppointmentResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.AppointmentResponse convertAppointmentResponse(org.hl7.fhir.r4.model.AppointmentResponse src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent40_50.java index ad352e707..71192a35a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AuditEvent40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class AuditEvent extends VersionConvertor_40_50 { +public class AuditEvent40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.AuditEvent convertAuditEvent(org.hl7.fhir.r4.model.AuditEvent src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic40_50.java index 082551c3f..2b93f46af 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Basic40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Basic extends VersionConvertor_40_50 { +public class Basic40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Basic convertBasic(org.hl7.fhir.r4.model.Basic src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary40_50.java index 309e5584c..3eb8d88b6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Binary40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Binary extends VersionConvertor_40_50 { +public class Binary40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Binary convertBinary(org.hl7.fhir.r4.model.Binary src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct40_50.java index d0a81d72c..c09b4776b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BiologicallyDerivedProduct40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class BiologicallyDerivedProduct extends VersionConvertor_40_50 { +public class BiologicallyDerivedProduct40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.BiologicallyDerivedProduct convertBiologicallyDerivedProduct(org.hl7.fhir.r4.model.BiologicallyDerivedProduct src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure40_50.java index 32381ccf2..6e7cd2446 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/BodyStructure40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class BodyStructure extends VersionConvertor_40_50 { +public class BodyStructure40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.BodyStructure convertBodyStructure(org.hl7.fhir.r4.model.BodyStructure src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle40_50.java index eb89d2915..a17fbc191 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Bundle40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Bundle extends VersionConvertor_40_50 { +public class Bundle40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Bundle convertBundle(org.hl7.fhir.r4.model.Bundle src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement40_50.java index 6346aae49..5b1f65854 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CapabilityStatement40_50.java @@ -20,7 +20,6 @@ package org.hl7.fhir.convertors.conv40_50; * #L% */ import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.convertors.VersionConvertor_40_50; /* @@ -52,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CapabilityStatement extends VersionConvertor_40_50 { +public class CapabilityStatement40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CapabilityStatement convertCapabilityStatement(org.hl7.fhir.r4.model.CapabilityStatement src) throws FHIRException { if (src == null) @@ -68,7 +67,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -103,7 +102,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasImplementation()) tgt.setImplementation(convertCapabilityStatementImplementationComponent(src.getImplementation())); if (src.hasFhirVersion()) - tgt.setFhirVersion(Enumerations.convertFHIRVersion(src.getFhirVersion())); + tgt.setFhirVersion(Enumerations40_50.convertFHIRVersion(src.getFhirVersion())); if (src.hasFormat()) { for (org.hl7.fhir.r4.model.CodeType t : src.getFormat()) tgt.getFormat().add(convertCode(t)); } @@ -139,7 +138,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -174,7 +173,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasImplementation()) tgt.setImplementation(convertCapabilityStatementImplementationComponent(src.getImplementation())); if (src.hasFhirVersion()) - tgt.setFhirVersion(Enumerations.convertFHIRVersion(src.getFhirVersion())); + tgt.setFhirVersion(Enumerations40_50.convertFHIRVersion(src.getFhirVersion())); if (src.hasFormat()) { for (org.hl7.fhir.r5.model.CodeType t : src.getFormat()) tgt.getFormat().add(convertCode(t)); } @@ -714,7 +713,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasDefinition()) tgt.setDefinitionElement(convertCanonical(src.getDefinitionElement())); if (src.hasType()) - tgt.setType(Enumerations.convertSearchParamType(src.getType())); + tgt.setType(Enumerations40_50.convertSearchParamType(src.getType())); if (src.hasDocumentation()) tgt.setDocumentationElement(convertMarkdown(src.getDocumentationElement())); return tgt; @@ -730,7 +729,7 @@ public class CapabilityStatement extends VersionConvertor_40_50 { if (src.hasDefinition()) tgt.setDefinitionElement(convertCanonical(src.getDefinitionElement())); if (src.hasType()) - tgt.setType(Enumerations.convertSearchParamType(src.getType())); + tgt.setType(Enumerations40_50.convertSearchParamType(src.getType())); if (src.hasDocumentation()) tgt.setDocumentationElement(convertMarkdown(src.getDocumentationElement())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java index 6a66cfb9b..50b34f936 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CarePlan extends VersionConvertor_40_50 { +public class CarePlan40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CarePlan convertCarePlan(org.hl7.fhir.r4.model.CarePlan src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam40_50.java index f70c860a5..0df53a4b6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CareTeam40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CareTeam extends VersionConvertor_40_50 { +public class CareTeam40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CareTeam convertCareTeam(org.hl7.fhir.r4.model.CareTeam src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem40_50.java index 22002064a..dac0d3003 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItem40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ChargeItem extends VersionConvertor_40_50 { +public class ChargeItem40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ChargeItem convertChargeItem(org.hl7.fhir.r4.model.ChargeItem src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition40_50.java index 6d6432b7f..88b502053 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ChargeItemDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ChargeItemDefinition extends VersionConvertor_40_50 { +public class ChargeItemDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ChargeItemDefinition convertChargeItemDefinition(org.hl7.fhir.r4.model.ChargeItemDefinition src) throws FHIRException { if (src == null) @@ -77,7 +77,7 @@ public class ChargeItemDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CanonicalType t : src.getReplaces()) tgt.getReplaces().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -141,7 +141,7 @@ public class ChargeItemDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.CanonicalType t : src.getReplaces()) tgt.getReplaces().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim40_50.java index 8323c297e..7c29f03a9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Claim40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Claim extends VersionConvertor_40_50 { +public class Claim40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Claim convertClaim(org.hl7.fhir.r4.model.Claim src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse40_50.java index d899eb067..96385875b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClaimResponse40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ClaimResponse extends VersionConvertor_40_50 { +public class ClaimResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ClaimResponse convertClaimResponse(org.hl7.fhir.r4.model.ClaimResponse src) throws FHIRException { if (src == null) @@ -727,7 +727,7 @@ public class ClaimResponse extends VersionConvertor_40_50 { if (src.hasNumber()) tgt.setNumberElement(convertPositiveInt(src.getNumberElement())); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); if (src.hasLanguage()) @@ -743,7 +743,7 @@ public class ClaimResponse extends VersionConvertor_40_50 { if (src.hasNumber()) tgt.setNumberElement(convertPositiveInt(src.getNumberElement())); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); if (src.hasLanguage()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression40_50.java index 3c305de6e..921e0fa8e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ClinicalImpression40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ClinicalImpression extends VersionConvertor_40_50 { +public class ClinicalImpression40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ClinicalImpression convertClinicalImpression(org.hl7.fhir.r4.model.ClinicalImpression src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem40_50.java index 74b193e21..5d453c44f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CodeSystem40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CodeSystem extends VersionConvertor_40_50 { +public class CodeSystem40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CodeSystem convertCodeSystem(org.hl7.fhir.r4.model.CodeSystem src) throws FHIRException { if (src == null) @@ -70,7 +70,7 @@ public class CodeSystem extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -137,7 +137,7 @@ public class CodeSystem extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication40_50.java index 2f11cdf62..86e049b79 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication40_50.java @@ -55,7 +55,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Communication extends VersionConvertor_40_50 { +public class Communication40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Communication convertCommunication(org.hl7.fhir.r4.model.Communication src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest40_50.java index 91591f76d..c3cfce621 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CommunicationRequest40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CommunicationRequest extends VersionConvertor_40_50 { +public class CommunicationRequest40_50 extends VersionConvertor_40_50 { public final static String EXT_PAYLOAD_CONTENT = "http://hl7.org/fhir/4.0/StructureDefinition/extension-CommunicationRequest.payload.content"; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition40_50.java index 4589d0cd2..635e9a4a4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CompartmentDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CompartmentDefinition extends VersionConvertor_40_50 { +public class CompartmentDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CompartmentDefinition convertCompartmentDefinition(org.hl7.fhir.r4.model.CompartmentDefinition src) throws FHIRException { if (src == null) @@ -65,7 +65,7 @@ public class CompartmentDefinition extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -104,7 +104,7 @@ public class CompartmentDefinition extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java index c256d28ab..d447821c7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Composition40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Composition extends VersionConvertor_40_50 { +public class Composition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Composition convertComposition(org.hl7.fhir.r4.model.Composition src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java index 4b7692a54..e912aef19 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ConceptMap extends VersionConvertor_40_50 { +public class ConceptMap40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ConceptMap convertConceptMap(org.hl7.fhir.r4.model.ConceptMap src) throws FHIRException { if (src == null) @@ -69,7 +69,7 @@ public class ConceptMap extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -117,7 +117,7 @@ public class ConceptMap extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -237,7 +237,7 @@ public class ConceptMap extends VersionConvertor_40_50 { if (src.hasDisplay()) tgt.setDisplayElement(convertString(src.getDisplayElement())); if (src.hasEquivalence()) - tgt.setRelationship(Enumerations.convertConceptMapRelationship(src.getEquivalence())); + tgt.setRelationship(Enumerations40_50.convertConceptMapRelationship(src.getEquivalence())); if (src.hasComment()) tgt.setCommentElement(convertString(src.getCommentElement())); if (src.hasDependsOn()) { @@ -259,7 +259,7 @@ public class ConceptMap extends VersionConvertor_40_50 { if (src.hasDisplay()) tgt.setDisplayElement(convertString(src.getDisplayElement())); if (src.hasRelationship()) - tgt.setEquivalence(Enumerations.convertConceptMapEquivalence(src.getRelationship())); + tgt.setEquivalence(Enumerations40_50.convertConceptMapEquivalence(src.getRelationship())); if (src.hasComment()) tgt.setCommentElement(convertString(src.getCommentElement())); if (src.hasDependsOn()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition40_50.java index 37a54b607..d62642bc6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Condition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Condition extends VersionConvertor_40_50 { +public class Condition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Condition convertCondition(org.hl7.fhir.r4.model.Condition src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java index 00ca7b515..ae2414c73 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Consent40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Consent extends VersionConvertor_40_50 { +public class Consent40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Consent convertConsent(org.hl7.fhir.r4.model.Consent src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract40_50.java index 66c2090ea..5cecd3224 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Contract40_50.java @@ -53,7 +53,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Contract extends VersionConvertor_40_50 { +public class Contract40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Contract convertContract(org.hl7.fhir.r4.model.Contract src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage40_50.java index 358187064..ca213135a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Coverage40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Coverage extends VersionConvertor_40_50 { +public class Coverage40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Coverage convertCoverage(org.hl7.fhir.r4.model.Coverage src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest40_50.java index 0f10f9910..3be884a20 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityRequest40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CoverageEligibilityRequest extends VersionConvertor_40_50 { +public class CoverageEligibilityRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CoverageEligibilityRequest convertCoverageEligibilityRequest(org.hl7.fhir.r4.model.CoverageEligibilityRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java index 8edbf96df..84a93a095 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class CoverageEligibilityResponse extends VersionConvertor_40_50 { +public class CoverageEligibilityResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.CoverageEligibilityResponse convertCoverageEligibilityResponse(org.hl7.fhir.r4.model.CoverageEligibilityResponse src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue40_50.java index 51cb01a50..1d1a54389 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DetectedIssue40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DetectedIssue extends VersionConvertor_40_50 { +public class DetectedIssue40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DetectedIssue convertDetectedIssue(org.hl7.fhir.r4.model.DetectedIssue src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java index f0018b5be..19924c811 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Device extends VersionConvertor_40_50 { +public class Device40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Device convertDevice(org.hl7.fhir.r4.model.Device src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java index 3027947b4..95adbc004 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DeviceDefinition extends VersionConvertor_40_50 { +public class DeviceDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DeviceDefinition convertDeviceDefinition(org.hl7.fhir.r4.model.DeviceDefinition src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric40_50.java index 7c169088e..e20be9662 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceMetric40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DeviceMetric extends VersionConvertor_40_50 { +public class DeviceMetric40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DeviceMetric convertDeviceMetric(org.hl7.fhir.r4.model.DeviceMetric src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest40_50.java index f7bc0f8c6..4d1772f56 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceRequest40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DeviceRequest extends VersionConvertor_40_50 { +public class DeviceRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DeviceRequest convertDeviceRequest(org.hl7.fhir.r4.model.DeviceRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java index f2d84b558..d24fcc6e7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DeviceUseStatement extends VersionConvertor_40_50 { +public class DeviceUseStatement40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r4.model.DeviceUseStatement src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport40_50.java index a2bd32610..b449beca9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DiagnosticReport40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DiagnosticReport extends VersionConvertor_40_50 { +public class DiagnosticReport40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DiagnosticReport convertDiagnosticReport(org.hl7.fhir.r4.model.DiagnosticReport src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest40_50.java similarity index 96% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest40_50.java index 074ad9b09..e60221443 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentManifest40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DocumentManifest extends VersionConvertor_40_50 { +public class DocumentManifest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DocumentManifest convertDocumentManifest(org.hl7.fhir.r4.model.DocumentManifest src) throws FHIRException { if (src == null) @@ -64,7 +64,7 @@ public class DocumentManifest extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertDocumentReferenceStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertDocumentReferenceStatus(src.getStatus())); if (src.hasType()) tgt.setType(convertCodeableConcept(src.getType())); if (src.hasSubject()) @@ -101,7 +101,7 @@ public class DocumentManifest extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertDocumentReferenceStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertDocumentReferenceStatus(src.getStatus())); if (src.hasType()) tgt.setType(convertCodeableConcept(src.getType())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java index 905778029..6743c4a40 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DocumentReference40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class DocumentReference extends VersionConvertor_40_50 { +public class DocumentReference40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DocumentReference convertDocumentReference(org.hl7.fhir.r4.model.DocumentReference src) throws FHIRException { if (src == null) @@ -64,7 +64,7 @@ public class DocumentReference extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertDocumentReferenceStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertDocumentReferenceStatus(src.getStatus())); if (src.hasDocStatus()) tgt.setDocStatus(convertReferredDocumentStatus(src.getDocStatus())); if (src.hasType()) @@ -110,7 +110,7 @@ public class DocumentReference extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertDocumentReferenceStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertDocumentReferenceStatus(src.getStatus())); if (src.hasDocStatus()) tgt.setDocStatus(convertReferredDocumentStatus(src.getDocStatus())); if (src.hasType()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter40_50.java index 64bb74044..da8466502 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Encounter40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Encounter extends VersionConvertor_40_50 { +public class Encounter40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Encounter convertEncounter(org.hl7.fhir.r4.model.Encounter src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint40_50.java index e89311a8a..c7ca97215 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Endpoint40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Endpoint extends VersionConvertor_40_50 { +public class Endpoint40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Endpoint convertEndpoint(org.hl7.fhir.r4.model.Endpoint src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest40_50.java index cd67c5c16..16e7df834 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentRequest40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class EnrollmentRequest extends VersionConvertor_40_50 { +public class EnrollmentRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.EnrollmentRequest convertEnrollmentRequest(org.hl7.fhir.r4.model.EnrollmentRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java index cc92ec611..d6922c655 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class EnrollmentResponse extends VersionConvertor_40_50 { +public class EnrollmentResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.EnrollmentResponse convertEnrollmentResponse(org.hl7.fhir.r4.model.EnrollmentResponse src) throws FHIRException { if (src == null) 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/Enumerations40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Enumerations40_50.java index b175b2aab..36694aeae 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/Enumerations40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Enumerations extends VersionConvertor_40_50 { +public class Enumerations40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Enumerations.BindingStrength convertBindingStrength(org.hl7.fhir.r4.model.Enumerations.BindingStrength src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare40_50.java index d36de2fa2..6bffe37c4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EpisodeOfCare40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class EpisodeOfCare extends VersionConvertor_40_50 { +public class EpisodeOfCare40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.EpisodeOfCare convertEpisodeOfCare(org.hl7.fhir.r4.model.EpisodeOfCare src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition40_50.java index 1d6c822ad..40701b1a1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EventDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class EventDefinition extends VersionConvertor_40_50 { +public class EventDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.EventDefinition convertEventDefinition(org.hl7.fhir.r4.model.EventDefinition src) throws FHIRException { if (src == null) @@ -72,7 +72,7 @@ public class EventDefinition extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) @@ -147,7 +147,7 @@ public class EventDefinition extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario40_50.java index 79d59bf5e..ff3a5bf83 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExampleScenario40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ExampleScenario extends VersionConvertor_40_50 { +public class ExampleScenario40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ExampleScenario convertExampleScenario(org.hl7.fhir.r4.model.ExampleScenario src) throws FHIRException { if (src == null) @@ -68,7 +68,7 @@ public class ExampleScenario extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -118,7 +118,7 @@ public class ExampleScenario extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit40_50.java index 2b04eedbd..d7d65d684 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ExplanationOfBenefit40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ExplanationOfBenefit extends VersionConvertor_40_50 { +public class ExplanationOfBenefit40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ExplanationOfBenefit convertExplanationOfBenefit(org.hl7.fhir.r4.model.ExplanationOfBenefit src) throws FHIRException { if (src == null) @@ -1253,7 +1253,7 @@ public class ExplanationOfBenefit extends VersionConvertor_40_50 { if (src.hasNumber()) tgt.setNumberElement(convertPositiveInt(src.getNumberElement())); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); if (src.hasLanguage()) @@ -1269,7 +1269,7 @@ public class ExplanationOfBenefit extends VersionConvertor_40_50 { if (src.hasNumber()) tgt.setNumberElement(convertPositiveInt(src.getNumberElement())); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); if (src.hasLanguage()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory40_50.java index a556e1440..0c42ae130 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/FamilyMemberHistory40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class FamilyMemberHistory extends VersionConvertor_40_50 { +public class FamilyMemberHistory40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.FamilyMemberHistory convertFamilyMemberHistory(org.hl7.fhir.r4.model.FamilyMemberHistory src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag40_50.java index b1c2974d3..204732d50 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Flag40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Flag extends VersionConvertor_40_50 { +public class Flag40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Flag convertFlag(org.hl7.fhir.r4.model.Flag src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java index 26396b15c..1234c39ce 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Goal extends VersionConvertor_40_50 { +public class Goal40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Goal convertGoal(org.hl7.fhir.r4.model.Goal src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition40_50.java index 52b18c25a..380690c24 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GraphDefinition40_50.java @@ -20,9 +20,6 @@ package org.hl7.fhir.convertors.conv40_50; * #L% */ import org.hl7.fhir.exceptions.FHIRException; -import org.hl7.fhir.r4.model.CodeType; -import org.hl7.fhir.r5.model.Enumeration; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; import org.hl7.fhir.convertors.VersionConvertor_40_50; /* @@ -54,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class GraphDefinition extends VersionConvertor_40_50 { +public class GraphDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.GraphDefinition convertGraphDefinition(org.hl7.fhir.r4.model.GraphDefinition src) throws FHIRException { if (src == null) @@ -68,7 +65,7 @@ public class GraphDefinition extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -110,7 +107,7 @@ public class GraphDefinition extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group40_50.java index 67fb7af8b..e3fd0c17c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Group40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Group extends VersionConvertor_40_50 { +public class Group40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Group convertGroup(org.hl7.fhir.r4.model.Group src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse40_50.java index 5ef91669e..5b82a9886 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/GuidanceResponse40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class GuidanceResponse extends VersionConvertor_40_50 { +public class GuidanceResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.GuidanceResponse convertGuidanceResponse(org.hl7.fhir.r4.model.GuidanceResponse src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService40_50.java index d83f74e9d..967da57d8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/HealthcareService40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class HealthcareService extends VersionConvertor_40_50 { +public class HealthcareService40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.HealthcareService convertHealthcareService(org.hl7.fhir.r4.model.HealthcareService src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy40_50.java index c71a3d86b..c6cf3916e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImagingStudy40_50.java @@ -53,7 +53,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ImagingStudy extends VersionConvertor_40_50 { +public class ImagingStudy40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ImagingStudy convertImagingStudy(org.hl7.fhir.r4.model.ImagingStudy src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization40_50.java index f207f4193..3f7dd5b87 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Immunization40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Immunization extends VersionConvertor_40_50 { +public class Immunization40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Immunization convertImmunization(org.hl7.fhir.r4.model.Immunization src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation40_50.java index 94f329a0f..ef83c929c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationEvaluation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ImmunizationEvaluation extends VersionConvertor_40_50 { +public class ImmunizationEvaluation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ImmunizationEvaluation convertImmunizationEvaluation(org.hl7.fhir.r4.model.ImmunizationEvaluation src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation40_50.java index d471da93d..6354441c6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImmunizationRecommendation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ImmunizationRecommendation extends VersionConvertor_40_50 { +public class ImmunizationRecommendation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ImmunizationRecommendation convertImmunizationRecommendation(org.hl7.fhir.r4.model.ImmunizationRecommendation src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide40_50.java index ca698240c..bad117bb1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ImplementationGuide40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ImplementationGuide extends VersionConvertor_40_50 { +public class ImplementationGuide40_50 extends VersionConvertor_40_50 { static final String EXT_IG_DEFINITION_PARAMETER = "http://hl7.org/fhir/tools/StructureDefinition/ig-parameter"; @@ -70,7 +70,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -95,7 +95,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasLicense()) tgt.setLicense(convertSPDXLicense(src.getLicense())); if (src.hasFhirVersion()) { - for (org.hl7.fhir.r4.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue()))); + for (org.hl7.fhir.r4.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations40_50.convertFHIRVersion(t.getValue()))); } if (src.hasDependsOn()) { for (org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDependsOnComponent t : src.getDependsOn()) tgt.addDependsOn(convertImplementationGuideDependsOnComponent(t)); @@ -124,7 +124,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -149,7 +149,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasLicense()) tgt.setLicense(convertSPDXLicense(src.getLicense())); if (src.hasFhirVersion()) { - for (org.hl7.fhir.r5.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue()))); + for (org.hl7.fhir.r5.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations40_50.convertFHIRVersion(t.getValue()))); } if (src.hasDependsOn()) { for (org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDependsOnComponent t : src.getDependsOn()) tgt.addDependsOn(convertImplementationGuideDependsOnComponent(t)); @@ -1709,7 +1709,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasReference()) tgt.setReference(convertReference(src.getReference())); if (src.hasFhirVersion()) { - for (org.hl7.fhir.r4.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue()))); + for (org.hl7.fhir.r4.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations40_50.convertFHIRVersion(t.getValue()))); } if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); @@ -1730,7 +1730,7 @@ public class ImplementationGuide extends VersionConvertor_40_50 { if (src.hasReference()) tgt.setReference(convertReference(src.getReference())); if (src.hasFhirVersion()) { - for (org.hl7.fhir.r5.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations.convertFHIRVersion(t.getValue()))); + for (org.hl7.fhir.r5.model.Enumeration t : src.getFhirVersion()) copyElement(t, tgt.addFhirVersionElement().setValue(Enumerations40_50.convertFHIRVersion(t.getValue()))); } if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan40_50.java index 380faf047..54a08c75f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/InsurancePlan40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class InsurancePlan extends VersionConvertor_40_50 { +public class InsurancePlan40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.InsurancePlan convertInsurancePlan(org.hl7.fhir.r4.model.InsurancePlan src) throws FHIRException { if (src == null) @@ -62,7 +62,7 @@ public class InsurancePlan extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasType()) { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getType()) tgt.addType(convertCodeableConcept(t)); } @@ -107,7 +107,7 @@ public class InsurancePlan extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasType()) { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getType()) tgt.addType(convertCodeableConcept(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice40_50.java index ac383766c..a9f19dcd8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Invoice40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Invoice extends VersionConvertor_40_50 { +public class Invoice40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Invoice convertInvoice(org.hl7.fhir.r4.model.Invoice src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library40_50.java index d1a6dca19..008c52f38 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Library40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Library extends VersionConvertor_40_50 { +public class Library40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Library convertLibrary(org.hl7.fhir.r4.model.Library src) throws FHIRException { if (src == null) @@ -72,7 +72,7 @@ public class Library extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasType()) @@ -155,7 +155,7 @@ public class Library extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasType()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage40_50.java index 3e7a6220f..446e739d1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Linkage40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Linkage extends VersionConvertor_40_50 { +public class Linkage40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Linkage convertLinkage(org.hl7.fhir.r4.model.Linkage src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource40_50.java index 0c52ba7d4..073e0d31a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ListResource40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ListResource extends VersionConvertor_40_50 { +public class ListResource40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ListResource convertListResource(org.hl7.fhir.r4.model.ListResource src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location40_50.java index 80ae14db3..92e38c4a6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Location40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Location extends VersionConvertor_40_50 { +public class Location40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Location convertLocation(org.hl7.fhir.r4.model.Location src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure40_50.java index 8d78bb49a..fb06b6daa 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Measure40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Measure extends VersionConvertor_40_50 { +public class Measure40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Measure convertMeasure(org.hl7.fhir.r4.model.Measure src) throws FHIRException { if (src == null) @@ -72,7 +72,7 @@ public class Measure extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) @@ -177,7 +177,7 @@ public class Measure extends VersionConvertor_40_50 { if (src.hasSubtitle()) tgt.setSubtitleElement(convertString(src.getSubtitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java index 2546b4c4f..01b8b828d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MeasureReport extends VersionConvertor_40_50 { +public class MeasureReport40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MeasureReport convertMeasureReport(org.hl7.fhir.r4.model.MeasureReport src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media40_50.java index 227b96e74..6c0d22497 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Media40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Media extends VersionConvertor_40_50 { +public class Media40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.DocumentReference convertMedia(org.hl7.fhir.r4.model.Media src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java index 300396050..adb7c91dd 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Medication extends VersionConvertor_40_50 { +public class Medication40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Medication convertMedication(org.hl7.fhir.r4.model.Medication src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java index e4f93a584..3358fc5ea 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationAdministration40_50.java @@ -56,7 +56,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MedicationAdministration extends VersionConvertor_40_50 { +public class MedicationAdministration40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MedicationAdministration convertMedicationAdministration(org.hl7.fhir.r4.model.MedicationAdministration src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java index 0f1ee6a7f..8d7967f96 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationDispense40_50.java @@ -54,7 +54,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MedicationDispense extends VersionConvertor_40_50 { +public class MedicationDispense40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MedicationDispense convertMedicationDispense(org.hl7.fhir.r4.model.MedicationDispense src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java index 7960712e8..b173b033f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java @@ -54,7 +54,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MedicationKnowledge extends VersionConvertor_40_50 { +public class MedicationKnowledge40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MedicationKnowledge convertMedicationKnowledge(org.hl7.fhir.r4.model.MedicationKnowledge src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest40_50.java index 95d65bfd5..2a7ed8b54 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationRequest40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MedicationRequest extends VersionConvertor_40_50 { +public class MedicationRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MedicationRequest convertMedicationRequest(org.hl7.fhir.r4.model.MedicationRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java index b3609202a..3e86f9c1b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MedicationStatement extends VersionConvertor_40_50 { +public class MedicationStatement40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MedicationUsage convertMedicationStatement(org.hl7.fhir.r4.model.MedicationStatement src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition40_50.java index 89bccffc5..7cafd13dd 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MessageDefinition extends VersionConvertor_40_50 { +public class MessageDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MessageDefinition convertMessageDefinition(org.hl7.fhir.r4.model.MessageDefinition src) throws FHIRException { if (src == null) @@ -73,7 +73,7 @@ public class MessageDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CanonicalType t : src.getReplaces()) tgt.getReplaces().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -138,7 +138,7 @@ public class MessageDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.CanonicalType t : src.getReplaces()) tgt.getReplaces().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader40_50.java index d8f1bd8c0..6340257ab 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MessageHeader40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MessageHeader extends VersionConvertor_40_50 { +public class MessageHeader40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MessageHeader convertMessageHeader(org.hl7.fhir.r4.model.MessageHeader src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence40_50.java index 24ad30970..518b0fedf 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MolecularSequence40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class MolecularSequence extends VersionConvertor_40_50 { +public class MolecularSequence40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.MolecularSequence convertMolecularSequence(org.hl7.fhir.r4.model.MolecularSequence src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem40_50.java index bdc153e4b..6bd0f695b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NamingSystem40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class NamingSystem extends VersionConvertor_40_50 { +public class NamingSystem40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.NamingSystem convertNamingSystem(org.hl7.fhir.r4.model.NamingSystem src) throws FHIRException { if (src == null) @@ -61,7 +61,7 @@ public class NamingSystem extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertNamingSystemType(src.getKind())); if (src.hasDate()) @@ -99,7 +99,7 @@ public class NamingSystem extends VersionConvertor_40_50 { if (src.hasName()) tgt.setNameElement(convertString(src.getNameElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertNamingSystemType(src.getKind())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder40_50.java index 0ce790ce6..37be4d4e3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/NutritionOrder40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class NutritionOrder extends VersionConvertor_40_50 { +public class NutritionOrder40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.NutritionOrder convertNutritionOrder(org.hl7.fhir.r4.model.NutritionOrder src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation40_50.java index 695a31c52..ef90be71c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Observation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Observation extends VersionConvertor_40_50 { +public class Observation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Observation convertObservation(org.hl7.fhir.r4.model.Observation src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java index f326c6aa5..64b29d2d4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ObservationDefinition extends VersionConvertor_40_50 { +public class ObservationDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ObservationDefinition convertObservationDefinition(org.hl7.fhir.r4.model.ObservationDefinition src) throws FHIRException { if (src == null) @@ -237,7 +237,7 @@ public class ObservationDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasAge()) tgt.setAge(convertRange(src.getAge())); if (src.hasGestationalAge()) @@ -262,7 +262,7 @@ public class ObservationDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasAge()) tgt.setAge(convertRange(src.getAge())); if (src.hasGestationalAge()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition40_50.java similarity index 96% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition40_50.java index cefe00227..5f6a471ae 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationDefinition40_50.java @@ -21,12 +21,6 @@ package org.hl7.fhir.convertors.conv40_50; */ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeType; -import org.hl7.fhir.r5.model.Enumeration; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import org.hl7.fhir.convertors.VersionConvertor_40_50; /* @@ -58,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class OperationDefinition extends VersionConvertor_40_50 { +public class OperationDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.OperationDefinition convertOperationDefinition(org.hl7.fhir.r4.model.OperationDefinition src) throws FHIRException { if (src == null) @@ -74,7 +68,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertOperationKind(src.getKind())); if (src.hasExperimental()) @@ -140,7 +134,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasKind()) tgt.setKind(convertOperationKind(src.getKind())); if (src.hasExperimental()) @@ -239,7 +233,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CanonicalType t : src.getTargetProfile()) tgt.getTargetProfile().add(convertCanonical(t)); } if (src.hasSearchType()) - tgt.setSearchType(Enumerations.convertSearchParamType(src.getSearchType())); + tgt.setSearchType(Enumerations40_50.convertSearchParamType(src.getSearchType())); if (src.hasBinding()) tgt.setBinding(convertOperationDefinitionParameterBindingComponent(src.getBinding())); if (src.hasReferencedFrom()) { @@ -272,7 +266,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.CanonicalType t : src.getTargetProfile()) tgt.getTargetProfile().add(convertCanonical(t)); } if (src.hasSearchType()) - tgt.setSearchType(Enumerations.convertSearchParamType(src.getSearchType())); + tgt.setSearchType(Enumerations40_50.convertSearchParamType(src.getSearchType())); if (src.hasBinding()) tgt.setBinding(convertOperationDefinitionParameterBindingComponent(src.getBinding())); if (src.hasReferencedFrom()) { @@ -316,7 +310,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterBindingComponent tgt = new org.hl7.fhir.r5.model.OperationDefinition.OperationDefinitionParameterBindingComponent(); copyElement(src, tgt); if (src.hasStrength()) - tgt.setStrength(Enumerations.convertBindingStrength(src.getStrength())); + tgt.setStrength(Enumerations40_50.convertBindingStrength(src.getStrength())); if (src.hasValueSet()) tgt.setValueSetElement(convertCanonical(src.getValueSetElement())); return tgt; @@ -328,7 +322,7 @@ public class OperationDefinition extends VersionConvertor_40_50 { org.hl7.fhir.r4.model.OperationDefinition.OperationDefinitionParameterBindingComponent tgt = new org.hl7.fhir.r4.model.OperationDefinition.OperationDefinitionParameterBindingComponent(); copyElement(src, tgt); if (src.hasStrength()) - tgt.setStrength(Enumerations.convertBindingStrength(src.getStrength())); + tgt.setStrength(Enumerations40_50.convertBindingStrength(src.getStrength())); if (src.hasValueSet()) tgt.setValueSetElement(convertCanonical(src.getValueSetElement())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome40_50.java index e241230bf..89e8ec1fc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OperationOutcome40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class OperationOutcome extends VersionConvertor_40_50 { +public class OperationOutcome40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.OperationOutcome convertOperationOutcome(org.hl7.fhir.r4.model.OperationOutcome src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization40_50.java index b9ced0f59..c0a9f5d38 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Organization40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Organization extends VersionConvertor_40_50 { +public class Organization40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Organization convertOrganization(org.hl7.fhir.r4.model.Organization src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation40_50.java index 6688690eb..34849ed8d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/OrganizationAffiliation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class OrganizationAffiliation extends VersionConvertor_40_50 { +public class OrganizationAffiliation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.OrganizationAffiliation convertOrganizationAffiliation(org.hl7.fhir.r4.model.OrganizationAffiliation src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters40_50.java index 8326939c1..36124daaf 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Parameters40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Parameters extends VersionConvertor_40_50 { +public class Parameters40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Parameters convertParameters(org.hl7.fhir.r4.model.Parameters src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient40_50.java similarity index 96% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient40_50.java index 3138f846b..b47736535 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Patient40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Patient extends VersionConvertor_40_50 { +public class Patient40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Patient convertPatient(org.hl7.fhir.r4.model.Patient src) throws FHIRException { if (src == null) @@ -70,7 +70,7 @@ public class Patient extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasDeceased()) @@ -119,7 +119,7 @@ public class Patient extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasDeceased()) @@ -167,7 +167,7 @@ public class Patient extends VersionConvertor_40_50 { if (src.hasAddress()) tgt.setAddress(convertAddress(src.getAddress())); if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasOrganization()) tgt.setOrganization(convertReference(src.getOrganization())); if (src.hasPeriod()) @@ -191,7 +191,7 @@ public class Patient extends VersionConvertor_40_50 { if (src.hasAddress()) tgt.setAddress(convertAddress(src.getAddress())); if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasOrganization()) tgt.setOrganization(convertReference(src.getOrganization())); if (src.hasPeriod()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice40_50.java index 7130ea299..33279c1b3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentNotice40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class PaymentNotice extends VersionConvertor_40_50 { +public class PaymentNotice40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.PaymentNotice convertPaymentNotice(org.hl7.fhir.r4.model.PaymentNotice src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java index f5fa5067e..c75eb8478 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class PaymentReconciliation extends VersionConvertor_40_50 { +public class PaymentReconciliation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.PaymentReconciliation convertPaymentReconciliation(org.hl7.fhir.r4.model.PaymentReconciliation src) throws FHIRException { if (src == null) @@ -265,7 +265,7 @@ public class PaymentReconciliation extends VersionConvertor_40_50 { org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent tgt = new org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent(); copyElement(src, tgt); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); return tgt; @@ -277,7 +277,7 @@ public class PaymentReconciliation extends VersionConvertor_40_50 { org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent tgt = new org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent(); copyElement(src, tgt); if (src.hasType()) - tgt.setType(Enumerations.convertNoteType(src.getType())); + tgt.setType(Enumerations40_50.convertNoteType(src.getType())); if (src.hasText()) tgt.setTextElement(convertString(src.getTextElement())); return tgt; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person40_50.java index 49c5695e0..7a1a4ae95 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Person40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Person extends VersionConvertor_40_50 { +public class Person40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Person convertPerson(org.hl7.fhir.r4.model.Person src) throws FHIRException { if (src == null) @@ -68,7 +68,7 @@ public class Person extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasAddress()) { @@ -101,7 +101,7 @@ public class Person extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasAddress()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java index aeb2ce217..7ca74fbdd 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class PlanDefinition extends VersionConvertor_40_50 { +public class PlanDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.PlanDefinition convertPlanDefinition(org.hl7.fhir.r4.model.PlanDefinition src) throws FHIRException { if (src == null) @@ -74,7 +74,7 @@ public class PlanDefinition extends VersionConvertor_40_50 { if (src.hasType()) tgt.setType(convertCodeableConcept(src.getType())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) @@ -157,7 +157,7 @@ public class PlanDefinition extends VersionConvertor_40_50 { if (src.hasType()) tgt.setType(convertCodeableConcept(src.getType())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubject()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner40_50.java similarity index 96% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner40_50.java index 66c4c2389..10efe409d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Practitioner40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Practitioner extends VersionConvertor_40_50 { +public class Practitioner40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Practitioner convertPractitioner(org.hl7.fhir.r4.model.Practitioner src) throws FHIRException { if (src == null) @@ -73,7 +73,7 @@ public class Practitioner extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Address t : src.getAddress()) tgt.addAddress(convertAddress(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasPhoto()) { @@ -108,7 +108,7 @@ public class Practitioner extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.Address t : src.getAddress()) tgt.addAddress(convertAddress(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasPhoto()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole40_50.java index c745815cd..cb715e407 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PractitionerRole40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class PractitionerRole extends VersionConvertor_40_50 { +public class PractitionerRole40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.PractitionerRole convertPractitionerRole(org.hl7.fhir.r4.model.PractitionerRole src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure40_50.java index fa89957b9..c5b19b288 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Procedure40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Procedure extends VersionConvertor_40_50 { +public class Procedure40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Procedure convertProcedure(org.hl7.fhir.r4.model.Procedure src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance40_50.java index 4658698be..a69963334 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Provenance40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Provenance extends VersionConvertor_40_50 { +public class Provenance40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Provenance convertProvenance(org.hl7.fhir.r4.model.Provenance src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java index 0df3cbace..5e9b5c2a6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java @@ -21,8 +21,6 @@ package org.hl7.fhir.convertors.conv40_50; */ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeType; -import org.hl7.fhir.r5.model.Enumeration; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; import org.hl7.fhir.convertors.VersionConvertor_40_50; /* @@ -54,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Questionnaire extends VersionConvertor_40_50 { +public class Questionnaire40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Questionnaire convertQuestionnaire(org.hl7.fhir.r4.model.Questionnaire src) throws FHIRException { if (src == null) @@ -76,7 +74,7 @@ public class Questionnaire extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CanonicalType t : src.getDerivedFrom()) tgt.getDerivedFrom().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubjectType()) { @@ -136,7 +134,7 @@ public class Questionnaire extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.CanonicalType t : src.getDerivedFrom()) tgt.getDerivedFrom().add(convertCanonical(t)); } if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasSubjectType()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse40_50.java index f55477211..fad4eed2b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/QuestionnaireResponse40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class QuestionnaireResponse extends VersionConvertor_40_50 { +public class QuestionnaireResponse40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.QuestionnaireResponse convertQuestionnaireResponse(org.hl7.fhir.r4.model.QuestionnaireResponse src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson40_50.java similarity index 96% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson40_50.java index 85631fd1c..35834b968 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RelatedPerson40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class RelatedPerson extends VersionConvertor_40_50 { +public class RelatedPerson40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.RelatedPerson convertRelatedPerson(org.hl7.fhir.r4.model.RelatedPerson src) throws FHIRException { if (src == null) @@ -75,7 +75,7 @@ public class RelatedPerson extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasAddress()) { @@ -114,7 +114,7 @@ public class RelatedPerson extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.ContactPoint t : src.getTelecom()) tgt.addTelecom(convertContactPoint(t)); } if (src.hasGender()) - tgt.setGender(Enumerations.convertAdministrativeGender(src.getGender())); + tgt.setGender(Enumerations40_50.convertAdministrativeGender(src.getGender())); if (src.hasBirthDate()) tgt.setBirthDateElement(convertDate(src.getBirthDateElement())); if (src.hasAddress()) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java index 76c693abc..66fc2b933 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class RequestGroup extends VersionConvertor_40_50 { +public class RequestGroup40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.RequestGroup convertRequestGroup(org.hl7.fhir.r4.model.RequestGroup src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java index 5378ba25e..b56079cac 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ResearchStudy extends VersionConvertor_40_50 { +public class ResearchStudy40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ResearchStudy convertResearchStudy(org.hl7.fhir.r4.model.ResearchStudy src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java index 8d0c932ce..c02feb248 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ResearchSubject extends VersionConvertor_40_50 { +public class ResearchSubject40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ResearchSubject convertResearchSubject(org.hl7.fhir.r4.model.ResearchSubject src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment40_50.java index 82f6ae748..e63c9941f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RiskAssessment40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class RiskAssessment extends VersionConvertor_40_50 { +public class RiskAssessment40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.RiskAssessment convertRiskAssessment(org.hl7.fhir.r4.model.RiskAssessment src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule40_50.java similarity index 98% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule40_50.java index bd9da8077..045fbc908 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Schedule40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Schedule extends VersionConvertor_40_50 { +public class Schedule40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Schedule convertSchedule(org.hl7.fhir.r4.model.Schedule src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter40_50.java index 048abee91..aa5959d4d 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SearchParameter40_50.java @@ -21,9 +21,6 @@ package org.hl7.fhir.convertors.conv40_50; */ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.CodeType; -import org.hl7.fhir.r5.model.Enumeration; -import org.hl7.fhir.r5.model.Enumerations.ResourceTypeEnum; -import org.hl7.fhir.r5.model.SearchParameter.SearchModifierCodeEnumFactory; import org.hl7.fhir.convertors.VersionConvertor_40_50; /* @@ -55,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SearchParameter extends VersionConvertor_40_50 { +public class SearchParameter40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SearchParameter convertSearchParameter(org.hl7.fhir.r4.model.SearchParameter src) throws FHIRException { if (src == null) @@ -71,7 +68,7 @@ public class SearchParameter extends VersionConvertor_40_50 { if (src.hasDerivedFrom()) tgt.setDerivedFromElement(convertCanonical(src.getDerivedFromElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -97,7 +94,7 @@ public class SearchParameter extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.CodeType t : src.getBase()) tgt.getBase().add(convertResourceEnum(t)); } if (src.hasType()) - tgt.setType(Enumerations.convertSearchParamType(src.getType())); + tgt.setType(Enumerations40_50.convertSearchParamType(src.getType())); if (src.hasExpression()) tgt.setExpressionElement(convertString(src.getExpressionElement())); if (src.hasXpath()) @@ -140,7 +137,7 @@ public class SearchParameter extends VersionConvertor_40_50 { if (src.hasDerivedFrom()) tgt.setDerivedFromElement(convertCanonical(src.getDerivedFromElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -166,7 +163,7 @@ public class SearchParameter extends VersionConvertor_40_50 { for (CodeType t : src.getBase()) tgt.getBase().add(convertResourceEnum(t)); } if (src.hasType()) - tgt.setType(Enumerations.convertSearchParamType(src.getType())); + tgt.setType(Enumerations40_50.convertSearchParamType(src.getType())); if (src.hasExpression()) tgt.setExpressionElement(convertString(src.getExpressionElement())); if (src.hasXpath()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest40_50.java index 8544dbf18..d20d4c8a2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ServiceRequest40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ServiceRequest extends VersionConvertor_40_50 { +public class ServiceRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ServiceRequest convertServiceRequest(org.hl7.fhir.r4.model.ServiceRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot40_50.java index a242fd83c..2f624ed32 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Slot40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Slot extends VersionConvertor_40_50 { +public class Slot40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Slot convertSlot(org.hl7.fhir.r4.model.Slot src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen40_50.java index 295196afb..59e9da298 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Specimen40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Specimen extends VersionConvertor_40_50 { +public class Specimen40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Specimen convertSpecimen(org.hl7.fhir.r4.model.Specimen src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition40_50.java index 1cf467d2d..29c028523 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SpecimenDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SpecimenDefinition extends VersionConvertor_40_50 { +public class SpecimenDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SpecimenDefinition convertSpecimenDefinition(org.hl7.fhir.r4.model.SpecimenDefinition src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition40_50.java similarity index 97% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition40_50.java index 1aaae896d..9a703daad 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureDefinition40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class StructureDefinition extends VersionConvertor_40_50 { +public class StructureDefinition40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.StructureDefinition convertStructureDefinition(org.hl7.fhir.r4.model.StructureDefinition src) throws FHIRException { if (src == null) @@ -70,7 +70,7 @@ public class StructureDefinition extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -96,7 +96,7 @@ public class StructureDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r4.model.Coding t : src.getKeyword()) tgt.addKeyword(convertCoding(t)); } if (src.hasFhirVersion()) - tgt.setFhirVersion(Enumerations.convertFHIRVersion(src.getFhirVersion())); + tgt.setFhirVersion(Enumerations40_50.convertFHIRVersion(src.getFhirVersion())); if (src.hasMapping()) { for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionMappingComponent t : src.getMapping()) tgt.addMapping(convertStructureDefinitionMappingComponent(t)); } @@ -140,7 +140,7 @@ public class StructureDefinition extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -166,7 +166,7 @@ public class StructureDefinition extends VersionConvertor_40_50 { for (org.hl7.fhir.r5.model.Coding t : src.getKeyword()) tgt.addKeyword(convertCoding(t)); } if (src.hasFhirVersion()) - tgt.setFhirVersion(Enumerations.convertFHIRVersion(src.getFhirVersion())); + tgt.setFhirVersion(Enumerations40_50.convertFHIRVersion(src.getFhirVersion())); if (src.hasMapping()) { for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionMappingComponent t : src.getMapping()) tgt.addMapping(convertStructureDefinitionMappingComponent(t)); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java index c2873edd2..63ed88a73 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class StructureMap extends VersionConvertor_40_50 { +public class StructureMap40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.StructureMap convertStructureMap(org.hl7.fhir.r4.model.StructureMap src) throws FHIRException { if (src == null) @@ -70,7 +70,7 @@ public class StructureMap extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -121,7 +121,7 @@ public class StructureMap extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java index d348418a6..e821b0fe9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Substance extends VersionConvertor_40_50 { +public class Substance40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Substance convertSubstance(org.hl7.fhir.r4.model.Substance src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid40_50.java index badf5329f..3dce0d337 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceNucleicAcid40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SubstanceNucleicAcid extends VersionConvertor_40_50 { +public class SubstanceNucleicAcid40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SubstanceNucleicAcid convertSubstanceNucleicAcid(org.hl7.fhir.r4.model.SubstanceNucleicAcid src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java index 9b37586e1..1d250b608 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstancePolymer40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SubstancePolymer extends VersionConvertor_40_50 { +public class SubstancePolymer40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SubstancePolymer convertSubstancePolymer(org.hl7.fhir.r4.model.SubstancePolymer src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein40_50.java index 5d805529c..9e1a0d507 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceProtein40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SubstanceProtein extends VersionConvertor_40_50 { +public class SubstanceProtein40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SubstanceProtein convertSubstanceProtein(org.hl7.fhir.r4.model.SubstanceProtein src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java index 38a62793e..359b28950 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceReferenceInformation40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SubstanceReferenceInformation extends VersionConvertor_40_50 { +public class SubstanceReferenceInformation40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SubstanceReferenceInformation convertSubstanceReferenceInformation(org.hl7.fhir.r4.model.SubstanceReferenceInformation src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial40_50.java index 0bb3521aa..fd8c5b24f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SubstanceSourceMaterial40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SubstanceSourceMaterial extends VersionConvertor_40_50 { +public class SubstanceSourceMaterial40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SubstanceSourceMaterial convertSubstanceSourceMaterial(org.hl7.fhir.r4.model.SubstanceSourceMaterial src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery40_50.java index 26e7eb932..7b194e27b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyDelivery40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SupplyDelivery extends VersionConvertor_40_50 { +public class SupplyDelivery40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SupplyDelivery convertSupplyDelivery(org.hl7.fhir.r4.model.SupplyDelivery src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest40_50.java index 39eb0f01e..2c035ce04 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/SupplyRequest40_50.java @@ -52,7 +52,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class SupplyRequest extends VersionConvertor_40_50 { +public class SupplyRequest40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.SupplyRequest convertSupplyRequest(org.hl7.fhir.r4.model.SupplyRequest src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task40_50.java index 4cc12c0d0..43f247fc4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Task40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class Task extends VersionConvertor_40_50 { +public class Task40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.Task convertTask(org.hl7.fhir.r4.model.Task src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities40_50.java index bebe6b906..1a55f02e9 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TerminologyCapabilities40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class TerminologyCapabilities extends VersionConvertor_40_50 { +public class TerminologyCapabilities40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.TerminologyCapabilities convertTerminologyCapabilities(org.hl7.fhir.r4.model.TerminologyCapabilities src) throws FHIRException { if (src == null) @@ -67,7 +67,7 @@ public class TerminologyCapabilities extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -127,7 +127,7 @@ public class TerminologyCapabilities extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport40_50.java index c93165a23..259d2f56c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestReport40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class TestReport extends VersionConvertor_40_50 { +public class TestReport40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.TestReport convertTestReport(org.hl7.fhir.r4.model.TestReport src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript40_50.java index fb1c5bce0..f857b1c0e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/TestScript40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class TestScript extends VersionConvertor_40_50 { +public class TestScript40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.TestScript convertTestScript(org.hl7.fhir.r4.model.TestScript src) throws FHIRException { if (src == null) @@ -69,7 +69,7 @@ public class TestScript extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -134,7 +134,7 @@ public class TestScript extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet40_50.java index 429e7abeb..e75e48b6f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ValueSet40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class ValueSet extends VersionConvertor_40_50 { +public class ValueSet40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.ValueSet convertValueSet(org.hl7.fhir.r4.model.ValueSet src) throws FHIRException { if (src == null) @@ -70,7 +70,7 @@ public class ValueSet extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) @@ -118,7 +118,7 @@ public class ValueSet extends VersionConvertor_40_50 { if (src.hasTitle()) tgt.setTitleElement(convertString(src.getTitleElement())); if (src.hasStatus()) - tgt.setStatus(Enumerations.convertPublicationStatus(src.getStatus())); + tgt.setStatus(Enumerations40_50.convertPublicationStatus(src.getStatus())); if (src.hasExperimental()) tgt.setExperimentalElement(convertBoolean(src.getExperimentalElement())); if (src.hasDate()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult40_50.java index c797ef28b..d6c6304e4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VerificationResult40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class VerificationResult extends VersionConvertor_40_50 { +public class VerificationResult40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.VerificationResult convertVerificationResult(org.hl7.fhir.r4.model.VerificationResult src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription40_50.java similarity index 99% rename from org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription.java rename to org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription40_50.java index 0c7c9d50e..b677301d8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VisionPrescription40_50.java @@ -51,7 +51,7 @@ import org.hl7.fhir.convertors.VersionConvertor_40_50; */ // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 -public class VisionPrescription extends VersionConvertor_40_50 { +public class VisionPrescription40_50 extends VersionConvertor_40_50 { public static org.hl7.fhir.r5.model.VisionPrescription convertVisionPrescription(org.hl7.fhir.r4.model.VisionPrescription src) throws FHIRException { if (src == null) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java new file mode 100644 index 000000000..2bb1490fd --- /dev/null +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/parser/Parser.java @@ -0,0 +1,1743 @@ +package org.hl7.fhir.convertors.parser; + +import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.ast.*; +import com.github.javaparser.ast.body.*; +import com.github.javaparser.ast.comments.Comment; +import com.github.javaparser.ast.expr.Expression; +import com.github.javaparser.ast.expr.MethodCallExpr; +import com.github.javaparser.ast.expr.NameExpr; +import com.github.javaparser.ast.nodeTypes.NodeWithIdentifier; +import com.github.javaparser.ast.nodeTypes.NodeWithName; +import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName; +import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithStaticModifier; +import com.github.javaparser.ast.stmt.*; +import com.github.javaparser.ast.type.Type; +import com.github.javaparser.ast.type.VarType; +import com.github.javaparser.ast.visitor.ModifierVisitor; +import com.github.javaparser.ast.visitor.Visitable; +import com.github.javaparser.ast.visitor.VoidVisitorAdapter; +import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration; +import com.github.javaparser.symbolsolver.JavaSymbolSolver; +import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration; +import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; +import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; +import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver; +import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; +import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver; +import org.hl7.fhir.dstu3.model.Enumeration; +import org.hl7.fhir.dstu3.model.MedicationAdministration; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * TODO Line auditing function, try copying based on line numbers and based on MethodDeclr, and compare the outputs + */ +public class Parser { + + public static final String ELEMENT = "Element"; + private static final String RESOURCE_FILE_FORMAT = "_%s"; //TODO fix + private static final List VERSION_FILES = Arrays.asList("10_30", "10_40", "10_50", "14_30", "14_40", "14_50", "30_40", "30_50", "40_50"); + private static final List BASE_TYPES = Arrays.asList("Base64Binary", "Boolean", "Canonical", "Code", + "Enumeration", "Date", "DateType", "Decimal", "Id", "Instant", "Integer", "Integer64", + "Markdown", "Oid", "PositiveInt", "String", "Time", "UnsignedInt", "Uri", "Url", + "Uuid", "XhtmlNode"); + + private static org.hl7.fhir.r5.model.Enumeration + convertMedicationAdministrationStatus(org.hl7.fhir.dstu3.model.Enumeration src) { + if (src == null) + return null; + org.hl7.fhir.r5.model.Enumeration tgt + = new org.hl7.fhir.r5.model.Enumeration(); + copyElement(src, tgt); + tgt.setValue(org.hl7.fhir.r5.model.MedicationAdministration.MedicationAdministrationStatusCodes.fromCode(src.getValueAsString())); + return tgt; + } + + private static void copyElement(Enumeration src, + org.hl7.fhir.r5.model.Enumeration tgt) { + + } + + + /** + * @param args + */ + public static void main(String[] args) { + /* + * every tgt.setX(convertT(src.getX)) should be dependent on a hasX - in principle that doesn't matter when you're + * dealing with singleton elements if convertT checks for null and setX accepts null - which *should* be the case. + * But there's enough special cases and other things that I have a lot less bugs where we always do if (src.hasX()) + */ + + List listOfPrimitiveTypes = BASE_TYPES;//getListOfPrimitiveTypes(); + + try { + initializeResolver(new File("").getAbsolutePath(), DIRECTORY_WHERE_THE_CODE_LIVES); + } catch (IOException e) { + e.printStackTrace(); + } + + System.out.println("get to version AuditEvent10_30 :: " + getModelImportToVersion("AuditEvent10_30")); + System.out.println("get from version AuditEvent10_30 :: " + getModelImportFromVersion("AuditEvent10_30")); + + +// VERSION_FILES.forEach(version -> { +// //String version = "10_30"; +// List filenames = listAllJavaFilesInDirectory(new File("").getAbsolutePath() + "/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/"); +// Collections.sort(filenames); +// filenames.forEach(name -> { +// try { +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv" + version + "/", name, ".java", listOfPrimitiveTypes, version); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } +// }); +// }); +// + try { + modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/", "Account40_50", ".java", listOfPrimitiveTypes, "10_30"); +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "AuditEvent10_30", ".java", listOfPrimitiveTypes, "10_30"); +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Binary10_30", ".java", listOfPrimitiveTypes, "10_30"); +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Bundle10_30", ".java", listOfPrimitiveTypes, "10_30"); +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "ClinicalImpression10_30", ".java", listOfPrimitiveTypes, "10_30"); +// modifyElementNotField("/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/", "Communication10_30", ".java", listOfPrimitiveTypes, "10_30"); + } catch (Exception e) { + System.out.println(); + } + System.out.println(); + } + + public static void modifyElementNotField(String srcdirectory, String filename, String extension, List listOfPrimitiveTypes, String version) throws FileNotFoundException { + System.out.println("File :: " + filename); + + String projectDirectory = new File("").getAbsolutePath(); + long start = System.currentTimeMillis(); + + CompilationUnit compilationUnit = getCompilationUnit(projectDirectory + srcdirectory + filename + extension); + ClassOrInterfaceDeclaration classOrInterfaceDeclaration = initializeTypeSovlerAndParser(compilationUnit, + projectDirectory, srcdirectory, filename); + + MethodDeclaration declaration = null; + + try { + declaration = classOrInterfaceDeclaration.getMethods().stream() + .filter(md -> md.getNameAsString().equals("convert" + extractName(filename))) + .findFirst().get(); + } catch (Exception e) { + System.out.println(); + } + + String lowerVersionTypeAbsPath = getLowerVersionAbsPathFromImportStatement(declaration.getTypeAsString(), declaration.getParameter(0).getTypeAsString(), version); + String higherVersionTypeAbsPath = getHigherVersionAbsPath(declaration.getTypeAsString(), declaration.getParameter(0).getTypeAsString(), version); + + CompilationUnit lowerCU = StaticJavaParser.parse(new File(lowerVersionTypeAbsPath)); + CompilationUnit higherCU = StaticJavaParser.parse(new File(higherVersionTypeAbsPath)); + + List methods = classOrInterfaceDeclaration.getMethods(); + for (MethodDeclaration md : methods) { + + String type = resolveInnerType(md.getType()).asString(); + String param = resolveInnerType(md.getParameter(0).getType()).asString(); + if (type == "void") continue; + try { + type = !type.contains(".") ? resolveInnerType(md.getType()).resolve().asReferenceType().getQualifiedName() : type; + } catch (Exception e) { + System.out.println(); + } + + param = !param.contains(".") ? resolveInnerType(md.getParameter(0).getType()).resolve().asReferenceType().getQualifiedName() : param; + + String absFilePathOfClassMethodIsConvertingTo = importStatementToAbsolutePath(type); + String absFilePathOfClassMethodIsConvertingFrom = importStatementToAbsolutePath(param); + String classNameMethodIsConvertingTo = absFilePathOfClassMethodIsConvertingTo.substring(absFilePathOfClassMethodIsConvertingTo.lastIndexOf('/') + 1, absFilePathOfClassMethodIsConvertingTo.lastIndexOf('.')); + String classNameMethodIsConvertingFrom = absFilePathOfClassMethodIsConvertingFrom.substring(absFilePathOfClassMethodIsConvertingFrom.lastIndexOf('/') + 1, absFilePathOfClassMethodIsConvertingFrom.lastIndexOf('.')); + + ClassOrInterfaceDeclaration toTypeClass = null; + ClassOrInterfaceDeclaration fromTypeClass = null; + + String highBackupModelDirectoryToSearch = higherVersionTypeAbsPath.substring(0, higherVersionTypeAbsPath.lastIndexOf('/') + 1); + String lowBackupModelDirectoryToSearch = lowerVersionTypeAbsPath.substring(0, lowerVersionTypeAbsPath.lastIndexOf('/') + 1); + + Node declaration1 = null; + Node declaration2 = null; + boolean isEnum = false; + + try { + if (getVersionStringFromPath(lowerVersionTypeAbsPath).equals(getVersionStringFromPath(absFilePathOfClassMethodIsConvertingTo))) { + declaration1 = getDeclaration(lowerCU, classNameMethodIsConvertingTo, lowBackupModelDirectoryToSearch); + } else { + declaration1 = getDeclaration(higherCU, classNameMethodIsConvertingTo, highBackupModelDirectoryToSearch); + } + + if (getVersionStringFromPath(lowerVersionTypeAbsPath).equals(getVersionStringFromPath(absFilePathOfClassMethodIsConvertingFrom))) { + declaration2 = getDeclaration(lowerCU, classNameMethodIsConvertingFrom, lowBackupModelDirectoryToSearch); + } else { + declaration2 = getDeclaration(higherCU, classNameMethodIsConvertingFrom, highBackupModelDirectoryToSearch); + } + } catch (FileNotFoundException e) { + System.out.println(e.getMessage()); + } + + if (declaration1 instanceof ClassOrInterfaceDeclaration) { + toTypeClass = (ClassOrInterfaceDeclaration) declaration1; + } else if (declaration1 instanceof EnumDeclaration) { + isEnum = true; + System.out.println("Filename " + filename + " target String " + classNameMethodIsConvertingTo + ", is an EnumDeclaration"); + } + if (declaration2 instanceof ClassOrInterfaceDeclaration) { + fromTypeClass = (ClassOrInterfaceDeclaration) declaration2; + } else if (declaration2 instanceof EnumDeclaration) { + isEnum = true; + System.out.println("Filename " + filename + " target String " + classNameMethodIsConvertingTo + ", is an EnumDeclaration"); + } + + if ((toTypeClass == null || fromTypeClass == null) && !isEnum) { + System.out.println(); + } else if (!isEnum) { + System.out.println("FROM " + fromTypeClass.getNameAsString()); + System.out.println("TO " + toTypeClass.getNameAsString()); + } + + if (toTypeClass != null && fromTypeClass != null) { + ClassOrInterfaceDeclaration finalFromTypeClass = fromTypeClass; + ClassOrInterfaceDeclaration finalToTypeClass = toTypeClass; + md.accept(new ModifierVisitor() { + @Override + public Visitable visit(IfStmt ifStmt, Void arg) { + super.visit(ifStmt, arg); + Expression condition = ifStmt.getCondition(); + Statement thenStmt = ifStmt.getThenStmt(); + + if (thenStmt instanceof ReturnStmt) { + } else if (thenStmt instanceof IfStmt) { + } else if (thenStmt instanceof ForEachStmt) { + } else if (thenStmt instanceof BlockStmt) { + } else if (thenStmt instanceof ExpressionStmt) { + } else if (thenStmt instanceof TryStmt) { + } else if (thenStmt instanceof ThrowStmt) { +// if (thenStmt instanceof ForEachStmt) { +// System.out.println(); +// } else { +// thenStmt.accept(new VoidVisitorAdapter() { +// @Override +// public void visit(ExpressionStmt n, Void arg) { +// super.visit(n, arg); +// n.getExpression(); +// System.out.println(); +// } +// }, null); +// } + } else { + System.out.println("You haven't caught this then statement case yet."); + System.exit(0); + } + + return ifStmt; + } + }, null); + } + + //System.out.println("Execution time :: " + (System.currentTimeMillis() - start) / 1000); + + } + } + + public static Type resolveInnerType(Type type) { + Type toReturn = type; + if (type.toString().contains("List") && !type.toString().contains("List_") && !type.toString().contains("ListResource")) { + try { + toReturn = (Type) type.getChildNodes().get(1); + } catch (Exception e) { + System.out.println(); + } + } + return toReturn; + } + + public static String removeListToGetTypeString(String type) { + if (type.contains("List")) { + type = type.replaceAll("List", "").replaceAll("<", "").replaceAll(">", ""); + } + return type; + } + + public static boolean methodExistsInClass(ClassOrInterfaceDeclaration c, String methodName) { + Optional first = c.getMethods().stream() + .filter(md -> md.getNameAsString().equals(methodName)) + .findAny(); + return first.isPresent(); + } + + public static MethodDeclaration getMethod(ClassOrInterfaceDeclaration c, String methodName) { + if (!methodExistsInClass(c, methodName)) { + throw new IllegalStateException("Cannot get a method " + methodName + " in class " + c.getNameAsString() + " doesn't exist in class."); + } + return c.getMethods().stream() + .filter(md -> md.getNameAsString().equals(methodName)) + .findFirst().get(); + } + + public static TypeDeclaration getDeclaration(CompilationUnit cu, String targetNodeString, String backupModelDirectory) throws FileNotFoundException { + if (targetNodeString.contains(".")) { + return null; + // not handling this + } + + if (cu.getClassByName(targetNodeString).isPresent()) { + return (TypeDeclaration) cu.getClassByName(targetNodeString).get(); + } + + TypeDeclaration td = getClassOrEnumNodeThatExistsWithin(cu, targetNodeString); + if (td == null) { + File target = new File(backupModelDirectory + targetNodeString + ".java"); + if (!target.exists()) { + target = new File(backupModelDirectory + "Enumerations" + ".java"); + } + cu = StaticJavaParser.parse(target); + td = getClassOrEnumNodeThatExistsWithin(cu, targetNodeString); + } + if (td == null) { + System.out.println("No target with name " + targetNodeString + " found"); + } + return td; + } + + public static TypeDeclaration getClassOrEnumNodeThatExistsWithin(CompilationUnit cu, String targetName) { + List collect = cu.getChildNodes().stream() + .filter(node -> node instanceof TypeDeclaration) + .map(node -> (TypeDeclaration) node) + .collect(Collectors.toList()); + for (TypeDeclaration td : collect) { + TypeDeclaration search = getClassOrEnumNodeThatExistsWithin(td, targetName); + if (search != null) { + return search; + } + } + return null; + } + + public static TypeDeclaration getClassOrEnumNodeThatExistsWithin(TypeDeclaration c, String targetName) { + if (c.getNameAsString().equals(targetName)) return c; + List collect = c.getChildNodes().stream() + .filter(node -> node instanceof TypeDeclaration) + .map(node -> (TypeDeclaration) node) + .collect(Collectors.toList()); + for (TypeDeclaration td : collect) { + TypeDeclaration search = getClassOrEnumNodeThatExistsWithin(td, targetName); + if (search != null) { + return search; + } + } + return null; + } + + public static class ElementParserEntry { + + public boolean hasGet = false; + public boolean hasCheck = false; + public boolean hasSet = false; + public boolean hasAdd = false; + + public String baseNoun = ""; + + public String getType = ""; + public String checkType = ""; + public String setType = ""; + public String addType = ""; + + public void setGetType(String type) { + hasGet = true; + this.getType = type; + } + + public void setSetType(String type) { + hasSet = true; + this.setType = type; + } + + public void setHasCheck(String type) { + hasCheck = true; + this.checkType = type; + } + + public void setAddType(String type) { + hasAdd = true; + this.addType = type; + } + + public ElementParserEntry() { + } + + } + + + public static List getListOfPrimitiveTypes() { + String path = "/Users/markiantorno/Documents/Development/fhir/org.hl7.fhir.core/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/"; + + List result = new ArrayList<>(); + + try (Stream walk = Files.walk(Paths.get(path))) { + walk.map(Path::toString) + .filter(f -> f.endsWith(".java")) + .collect(Collectors.toCollection(() -> result)); + } catch (IOException e) { + e.printStackTrace(); + } + + List primitiveTypes = new ArrayList<>(); + result.forEach(filePath -> { + try { + CompilationUnit cu = StaticJavaParser.parse(new File(filePath)); + String className = pullFileNameFromPath(filePath); + cu.getClassByName(className).ifPresent(classOrInterfaceDeclaration -> { + if (classOrInterfaceDeclaration.getExtendedTypes().stream() + .map(NodeWithSimpleName::getNameAsString) + .collect(Collectors.toList()).contains("PrimitiveType")) { + primitiveTypes.add(className.replace("Type", "")); + } + }); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + }); + primitiveTypes.forEach(System.out::println); + return primitiveTypes; + } + + public static void cleanAccessorsForFile(String srcdirectory, String filename, String extension) { + String projectDirectory = new File("").getAbsolutePath(); + String srcFilePathWithExtension = projectDirectory + srcdirectory + filename + extension; + + CompilationUnit compilationUnit = getCompilationUnit(projectDirectory + srcdirectory + filename + extension); + ClassOrInterfaceDeclaration classOrInterfaceDeclaration = initializeTypeSovlerAndParser(compilationUnit, + projectDirectory, srcdirectory, filename); + + String ifStatementTemplate = "if(%1$s){%2$s;}"; + String ifStatementTemplate2 = "if(%1$s){%2$s}"; + + final HashMap replacementMap = new HashMap<>(); + final HashMap generatedBlockStmt = new HashMap<>(); + + List methods = classOrInterfaceDeclaration.getMethods(); + methods.forEach(md -> { + String assembledMethod = ""; + md.accept(new ModifierVisitor() { + @Override + public Visitable visit(MethodCallExpr n, String arg) { + super.visit(n, arg); + if (n.getTokenRange().toString().contains("src.get")) { + + Node getStatement = getRootGetMethodCall(n); + String topLevelMethodExpr = getTopLevelMethodExpr(n).toString(); + if (topLevelMethodExpr != null) { + String condition = "src.has" + getStatement.toString().replace("FirstRep", "").replaceFirst("get", "") + "()"; + + String statement = topLevelMethodExpr; + String ifStmt = String.format(statement.startsWith("for") ? ifStatementTemplate2 : ifStatementTemplate, condition, statement); + if (!replacementMap.containsKey(topLevelMethodExpr)) { + replacementMap.put(topLevelMethodExpr, ifStmt); + } + } + } + return n; + } + }, assembledMethod); + String body = md.getBody().get().toString(); + Set keySet = replacementMap.keySet(); + for (String key : keySet) { + if (key.startsWith("for")) { + body = body.replace(key, replacementMap.get(key)); + } else { + body = body.replace(key + ";", replacementMap.get(key)); + } + } + replacementMap.clear(); + try { + generatedBlockStmt.put(md, StaticJavaParser.parseBlock(body)); + } catch (Exception e) { + System.out.println(); + } + }); + + classOrInterfaceDeclaration.accept(new ModifierVisitor() { + @Override + public MethodDeclaration visit(MethodDeclaration md, Void arg) { + super.visit(md, arg); + if (generatedBlockStmt.containsKey(md)) { + return md.setBody(generatedBlockStmt.get(md)); + } else { + return md; + } + } + }, null); + + deleteFile(srcFilePathWithExtension); + + try { + writeStringToFile(compilationUnit.toString(), srcFilePathWithExtension); + } catch (IOException e) { + e.printStackTrace(); + } + } + + private static Node getRootGetMethodCall(Node n) { + if (n.getChildNodes().size() == 0) return n; + + Optional get = n.getChildNodes().stream() + .filter(node -> node.toString().contains("get")) + .findFirst(); + + return get.map(Parser::getRootGetMethodCall).orElse(null); + } + + private static Node getTopLevelMethodExpr(Node exp) { + Optional node = exp.getParentNode(); + if (node.isPresent() && node.get() instanceof ExpressionStmt && node.get().getParentNode().get() instanceof IfStmt) { + return null; + } else if ((node.isPresent()) && ((node.get() instanceof MethodCallExpr) || (node.get() instanceof ForEachStmt))) { + return getTopLevelMethodExpr(node.get()); + } + return exp; + } + + private static Node getTopLevelIfStatement(Node exp) { + Optional node = exp.getParentNode(); + if (!node.isPresent() || (node.get() instanceof ClassOrInterfaceDeclaration)) { + return null; + } else if (node.get() instanceof IfStmt) { + return node.get(); + } + return getTopLevelIfStatement(node.get()); + } + + // ================== OLD CODE ====================== + + + private static final String COMMON_FILENAME = "Common"; + private static final String DEST_DIRECTORY_FORMAT = "conv%s"; + private static final String SRC_FILE_FORMAT = "VersionConvertor_%s"; + + private static final String KEYWORD_CONVERT = "convert"; + private static final String KEYWORD_COPY = "copy"; + private static final String KEYWORD_FIND = "find"; + private static final String KEYWORD_GOD_METHOD = "convertResource"; + + private static final String DIRECTORY_WHERE_THE_CODE_LIVES = "/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/"; + private static final String COMMENT_REPORT = "comment_report%s.txt"; + + //Exception case variables + public static final String DSTU = "dstu"; + public static final String R = "r"; + + public static final String MODEL_RESOURCE = "org.hl7.fhir.%1$s%2$s.model.Resource"; + public static final String MODEL_VALUESET = "org.hl7.fhir.%1$s%2$s.model.ValueSet"; + public static final String MODEL_BUNDLECOMP = "org.hl7.fhir.%1$s%2$s.model.Bundle.BundleEntryComponent"; + public static final String MODEL_BUNDLE = "org.hl7.fhir.%1$s%2$s.model.Bundle"; + public static final String VERSION_CONVERTOR_IMPORT = "org.hl7.fhir.convertors.VersionConvertorAdvisor%s0"; + public static final String VERSION_CONVERTOR = "VersionConvertorAdvisor%s0"; + public static final String ADVISOR_VARIABLE = "advisor"; + + public static String convertPath(String path, String version) { + String versionloc = (version.equals("2") || version.equals("3")) ? DSTU : R; + return String.format(path, versionloc, version); + } + + public static void parseAllTheCodes() { + String projectDirectory = new File("").getAbsolutePath(); + + VERSION_FILES.forEach(version -> { + + String srcFilePathWithExtension = projectDirectory + DIRECTORY_WHERE_THE_CODE_LIVES + String.format(SRC_FILE_FORMAT, version) + ".java"; + String destDirectoryName = String.format(DEST_DIRECTORY_FORMAT, version); + + CompilationUnit compilationUnit = getCompilationUnit(srcFilePathWithExtension); + ClassOrInterfaceDeclaration classOrInterfaceDeclaration + = initializeTypeSovlerAndParser(compilationUnit, projectDirectory, DIRECTORY_WHERE_THE_CODE_LIVES, String.format(SRC_FILE_FORMAT, version)); + + if (version.contains("10")) + dealWithV2ExceptionCasesPreProcessing(compilationUnit, classOrInterfaceDeclaration, version); + + List externalClassNames = getAdditionalClassDeclarations(classOrInterfaceDeclaration).stream() + .filter(c -> !c.getNameAsString().equals(classOrInterfaceDeclaration.getNameAsString())) + .map(NodeWithSimpleName::getNameAsString) + .collect(Collectors.toList()); + + HashMap> generatedTopLevelMethodMap = generateMapOfTopLevelMethods(classOrInterfaceDeclaration); + HashMap generatedMethodMap = new HashMap<>(); + HashMap> generatedStaticFieldMappings = new HashMap<>(); + populateMethodAndFieldMaps(classOrInterfaceDeclaration, generatedTopLevelMethodMap, generatedMethodMap, generatedStaticFieldMappings); + + if (version.equals("10_40") || version.equals("10_50")) { + generatedMethodMap.keySet().stream() + .filter(methodDeclaration -> methodDeclaration.getNameAsString().equals("hasConcept")) + .collect(Collectors.toList()) + .forEach(methodDeclaration -> { + generatedMethodMap.put(methodDeclaration, COMMON_FILENAME); + }); + } + + populateClassMappings(generatedTopLevelMethodMap, generatedMethodMap); + + createCommentReport(srcFilePathWithExtension, + projectDirectory + DIRECTORY_WHERE_THE_CODE_LIVES + String.format(COMMENT_REPORT, version)); + + modifySourceFile(compilationUnit, classOrInterfaceDeclaration, srcFilePathWithExtension, + generatedTopLevelMethodMap, generatedStaticFieldMappings, version); + + String packageDeclaration = compilationUnit.getPackageDeclaration().get().getNameAsString() + "." + + destDirectoryName; + System.out.println("Files will be generated with the package :: " + packageDeclaration); + NodeList imports = compilationUnit.getImports(); + System.out.println("Imports will be taken from the top level file <" + String.format(SRC_FILE_FORMAT, version) + ".java>, you will have to " + + "optimize imports on the generated files. Import list as follows :: \n-----"); + imports.stream().map(NodeWithName::getNameAsString).forEach(System.out::println); + System.out.println("-----\n"); + String directoryPath = projectDirectory + DIRECTORY_WHERE_THE_CODE_LIVES + destDirectoryName + "/"; + createDirectory(directoryPath); + System.out.println("Generated type conversion files will be stored in :: " + directoryPath); + + createJavaFiles(classOrInterfaceDeclaration, generatedTopLevelMethodMap, generatedStaticFieldMappings, + String.format(SRC_FILE_FORMAT, version), packageDeclaration, imports, directoryPath, externalClassNames, version); + }); + + + } + + private static List getAdditionalClassDeclarations(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration) { + List collect = new ArrayList<>(); + classOrInterfaceDeclaration.accept(new VoidVisitorAdapter() { + @Override + public void visit(ClassOrInterfaceDeclaration n, Void arg) { + super.visit(n, arg); + collect.add(n); + } + }, null); + return collect; + } + + private static CompilationUnit getCompilationUnit(String filePathWithExtension) { + Optional compilationUnit = initializeParser(filePathWithExtension); + if (!compilationUnit.isPresent()) { + System.out.println("\nNo compilation unit generated during class parsing...aborting."); + System.exit(0); + } + return compilationUnit.get(); + } + + private static ClassOrInterfaceDeclaration initializeTypeSovlerAndParser(CompilationUnit compilationUnit, + String projectDirectory, + String codeDirectory, + String filename) { +// System.out.println("==================== Initializing TypeSolver and Parser ====================\n"); + + try { + initializeResolver(projectDirectory, codeDirectory); + } catch (IOException e) { + System.out.println("Error initializing typesolver, exiting process..."); + e.printStackTrace(); + System.exit(0); + } + +// System.out.println("Loading class: " + filename); + Optional classOrInterfaceDeclaration = loadClass(compilationUnit, filename); + if (!classOrInterfaceDeclaration.isPresent()) { + System.out.println("\nNo class or interface declaration loaded during parsing...aborting."); + System.exit(0); + } + +// System.out.println("\n"); + + return classOrInterfaceDeclaration.get(); + } + + private static HashMap> generateMapOfTopLevelMethods(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration) { + System.out.println("==================== Generating List of Parsable Types ====================\n"); + + HashMap> mapToReturn = new HashMap<>(); + + System.out.println("Fetching list of top level parsing methods..."); + System.out.println("---------------------------------------------"); + List listOfParsableMethodCalls = getListOfParsableTypes(classOrInterfaceDeclaration).stream() + .map(methodCallExpr -> methodCallExpr.getName().toString()) + .sorted(Comparator.comparing(Function.identity())) + .distinct() + .collect(Collectors.toList()); + listOfParsableMethodCalls.forEach(System.out::println); + System.out.println("---------------------------------------------"); + System.out.println("\n"); + + System.out.println("==================== Generate Map of Top Level Method Names ====================\n"); + System.out.println("Pulling all top level methods from the parsed class --> " + classOrInterfaceDeclaration.getNameAsString()); + List topLevelMethods = getTopLevelMethods(classOrInterfaceDeclaration, listOfParsableMethodCalls); + System.out.println("\nFetched the following top level methods:"); + System.out.println("------------------------------------------"); + topLevelMethods.forEach(md -> System.out.println(md.getSignature().toString())); + System.out.println("------------------------------------------\n"); + System.out.println("\n"); + + for (String type : listOfParsableMethodCalls) { + topLevelMethods.stream() + .filter(methodDeclaration -> type.equals(methodDeclaration.getName().asString())) + .forEach(md -> { + if (!mapToReturn.containsKey(type.replaceFirst(KEYWORD_CONVERT, ""))) { + mapToReturn.put(type.replaceFirst(KEYWORD_CONVERT, ""), new ArrayList<>()); + } + mapToReturn.get(type.replaceFirst(KEYWORD_CONVERT, "")).add(md); + }); + } + return mapToReturn; + } + + public static void populateMethodAndFieldMaps(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + HashMap> generatedTopLevelMethodMap, + HashMap methodMapToPopulate, + HashMap> fieldMapToPopulate) { + + System.out.println("==================== Generate Method and Field Maps ====================\n"); + + HashMap fieldDeclarationMap = new HashMap<>(); + + List fieldDeclarations = classOrInterfaceDeclaration.getFields().stream() + .filter(NodeWithStaticModifier::isStatic) + .collect(Collectors.toList()); + + for (String key : generatedTopLevelMethodMap.keySet()) { + for (MethodDeclaration md : generatedTopLevelMethodMap.get(key)) { + recursiveSearchAndAdd(classOrInterfaceDeclaration, methodMapToPopulate, fieldDeclarationMap, fieldDeclarations, md, key); + } + } + + fieldDeclarationMap.keySet().forEach(key -> { + if (!fieldMapToPopulate.containsKey(fieldDeclarationMap.get(key))) { + fieldMapToPopulate.put(fieldDeclarationMap.get(key), new ArrayList<>()); + } + fieldMapToPopulate.get(fieldDeclarationMap.get(key)).add(key); + }); + } + + public static void populateClassMappings(HashMap> generatedTopLevelMethodMap, + HashMap generatedMethodMap) { + System.out.println("==================== Generate Method to Class Mappings ====================\n"); + + generatedTopLevelMethodMap.put(COMMON_FILENAME, new ArrayList<>()); + generatedTopLevelMethodMap.clear(); + generatedMethodMap.keySet().forEach(md -> { + if (!generatedTopLevelMethodMap.containsKey(generatedMethodMap.get(md))) { + generatedTopLevelMethodMap.put(generatedMethodMap.get(md), new ArrayList<>()); + } + generatedTopLevelMethodMap.get(generatedMethodMap.get(md)).add(md); + }); + + for (String className : generatedTopLevelMethodMap.keySet()) { + System.out.println("Class :: " + className); + generatedTopLevelMethodMap.get(className).stream() + .sorted(Comparator.comparing(methodDeclaration -> methodDeclaration.getName().toString())) + .forEach(md -> System.out.println("\t" + md.getSignature())); + System.out.println("\n"); + } + } + + public static void createCommentReport(String fullSrcFilePath, String fullDstFilePath) { + try { + List commentReportEntries = generateCommentReportData(fullSrcFilePath); + String report = commentReportEntries.stream() + .map(Object::toString).collect(Collectors.joining("\n")); + writeStringToFile(report, fullDstFilePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void dealWithV2ExceptionCasesPreProcessing(CompilationUnit cu, ClassOrInterfaceDeclaration + classOrInterfaceDeclaration, String version) { + String from = "2";//version.substring(0, version.indexOf('_')); + String to = version.substring(version.indexOf('_') + 1, version.indexOf('_') + 2); + + + modifyConvertResourceCalls(classOrInterfaceDeclaration, to, from, to, MODEL_VALUESET, "convertValueSet"); + modifyConvertResourceCalls(classOrInterfaceDeclaration, from, to, to, MODEL_VALUESET, "convertValueSet"); + modifyConvertResourceCalls(classOrInterfaceDeclaration, to, from, to, MODEL_BUNDLECOMP, "convertBundleEntryComponent"); + modifyConvertResourceCalls(classOrInterfaceDeclaration, to, from, to, MODEL_BUNDLE, "convertBundle"); + + addAdvisorToMethodCalls(classOrInterfaceDeclaration, "convertBundle", MODEL_BUNDLE, from, "convertBundleEntryComponent"); + + } + + public static void dealWithV2ExceptionCasesPostProcessing(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration, String version) { + String from = "2";//version.substring(0, version.indexOf('_')); + String to = version.substring(version.indexOf('_') + 1, version.indexOf('_') + 2); + + Optional advisorOptional = classOrInterfaceDeclaration.getFields().stream() + .map(FieldDeclaration::getVariables) + .flatMap(Collection::stream) + .filter(v -> v.getNameAsString().equals(ADVISOR_VARIABLE)) + .findFirst(); + + if (advisorOptional.isPresent()) { + VariableDeclarator advisorVariable = advisorOptional.get(); + Type advisorType = advisorVariable.getType(); + advisorOptional.get().getParentNode().ifPresent(Node::remove); + + modifyConvertResourceCalls(classOrInterfaceDeclaration, from, to, to, MODEL_RESOURCE, "convertResource"); + modifyConvertResourceCalls(classOrInterfaceDeclaration, to, from, to, MODEL_RESOURCE, "convertResource"); + + addAdvisorToMethodCalls(classOrInterfaceDeclaration, "convertResource", MODEL_RESOURCE, from, "convertBundle"); + addAdvisorToMethodCalls(classOrInterfaceDeclaration, "convertResource", MODEL_RESOURCE, from, "convertValueSet"); + addAdvisorToMethodCalls(classOrInterfaceDeclaration, "convertResource", MODEL_RESOURCE, to, "convertValueSet"); + + classOrInterfaceDeclaration.getConstructors().forEach(Node::remove); + + System.out.println(); +// classOrInterfaceDeclaration.addMethod(); + + } + + System.out.println(); + } + + public static void modifyConvertResourceCalls(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + String parameterVersionNo, + String typeVersionNo, + String convertorVersionNumber, + String typeFormat, + String methodName) { + MethodDeclaration oldConvertResource = getConvertResourceMethodForVersion(classOrInterfaceDeclaration, methodName, typeFormat, typeVersionNo); + oldConvertResource.addParameter(String.format(VERSION_CONVERTOR, convertorVersionNumber), ADVISOR_VARIABLE); + + MethodDeclaration newConvertResource = classOrInterfaceDeclaration.addMethod(methodName); + newConvertResource.setModifier(Modifier.Keyword.PUBLIC, true); + newConvertResource.setModifier(Modifier.Keyword.STATIC, true); + newConvertResource.setType(convertPath(typeFormat, typeVersionNo)); + newConvertResource.setThrownExceptions(oldConvertResource.getThrownExceptions()); + newConvertResource.addParameter(convertPath(typeFormat, parameterVersionNo), "src"); + newConvertResource.setBody(new BlockStmt().addStatement("return " + methodName + "(src, null);")); + } + + public static void addAdvisorToMethodCalls(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + String parentMethodName, + String modelType, + String version, + String subMethodCall) { + + Optional methodDeclaration = classOrInterfaceDeclaration.getMethods().stream() + .filter(md -> md.getNameAsString().equals(parentMethodName)) + .filter(md -> md.getType().toString().equals(convertPath(modelType, version))) + .findAny(); + + methodDeclaration.ifPresent(declaration -> declaration.accept(new ModifierVisitor() { + @Override + public Visitable visit(MethodCallExpr n, Void arg) { + super.visit(n, arg); + if (n.getNameAsString().contains(subMethodCall)) { + n.addArgument("advisor"); + } + return n; + } + }, null)); + + } + + public static MethodDeclaration getConvertResourceMethodForVersion(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration, + String methodName, + String modelType, + String version) { + Optional methodDeclaration = classOrInterfaceDeclaration.getMethods().stream() + .filter(md -> md.getNameAsString().equals(methodName)) + .filter(md -> md.getType().toString().equals(convertPath(modelType, version))) + .findAny(); + + if (methodDeclaration.isPresent()) { + return methodDeclaration.get(); + } else { + System.out.println("Cannot find method " + methodName + " that returns type " + convertPath(modelType, version)); + System.exit(0); + } + return null; + } + + public static void modifySourceFile(CompilationUnit compilationUnit, + ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + String srcFilePathWithExtension, + HashMap> generatedTopLevelMethodMap, + HashMap> generatedStaticFieldMappings, + String version) { + + + List listOfParsableMethodCalls = getListOfParsableTypes(classOrInterfaceDeclaration).stream() + .map(methodCallExpr -> methodCallExpr.getName().toString()) + .sorted(Comparator.comparing(Function.identity())) + .distinct() + .collect(Collectors.toList()); + + modifyMainFile(compilationUnit, + classOrInterfaceDeclaration, + generatedTopLevelMethodMap.get(COMMON_FILENAME), + generatedTopLevelMethodMap.keySet().stream() + .filter(key -> !key.equals(COMMON_FILENAME)) + .map(generatedTopLevelMethodMap::get) + .flatMap(Collection::stream) + .collect(Collectors.toList()), + listOfParsableMethodCalls, + generatedStaticFieldMappings.keySet().stream() + .filter(key -> !key.equals(COMMON_FILENAME)) + .map(generatedStaticFieldMappings::get) + .flatMap(Collection::stream) + .collect(Collectors.toList()), + generatedStaticFieldMappings.keySet().stream() + .filter(key -> key.equals(COMMON_FILENAME)) + .map(generatedStaticFieldMappings::get) + .flatMap(Collection::stream) + .collect(Collectors.toList()), + version); + + deleteFile(srcFilePathWithExtension); + + try { + writeStringToFile(compilationUnit.toString(), srcFilePathWithExtension); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void modifyMainFile(CompilationUnit compilationUnit, + ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + List methodsToExpose, + List methodsToDelete, + List methodsToAddStaticAccess, + List fieldsToDelete, + List fieldsToExpose, + String versionCode) { + + compilationUnit.getAllContainedComments().stream() + .filter(Comment::isLineComment) + .forEach(Comment::remove); + + compilationUnit.accept(new MethodDeleter(methodsToDelete), null); + compilationUnit.accept(new MethodExposer(methodsToExpose), null); + + compilationUnit.addImport("org.hl7.fhir.convertors." + String.format(DEST_DIRECTORY_FORMAT, versionCode), false, true); + + fieldsToDelete.forEach(classOrInterfaceDeclaration::remove); + classOrInterfaceDeclaration.getFields().stream() + .filter(NodeWithStaticModifier::isStatic) + .filter(fieldsToExpose::contains) + .forEach(fd -> { + fd.setModifier(Modifier.Keyword.PRIVATE, false); + fd.setModifier(Modifier.Keyword.PUBLIC, true); + }); + + List listOfClassMethods = getListOfClassMethods(KEYWORD_GOD_METHOD, classOrInterfaceDeclaration); + listOfClassMethods.forEach(md -> { + md.accept(new MethodStaticCallAdder(methodsToAddStaticAccess, versionCode), null); + }); + + //Deal with the old, non static access convertors (1-3, 1-4, 1-5) + compilationUnit.accept(new ModifierVisitor() { + @Override + public MethodDeclaration visit(MethodDeclaration md, Void arg) { + super.visit(md, arg); + + md.setModifier(Modifier.Keyword.PRIVATE, false); + md.setModifier(Modifier.Keyword.STATIC, true); + md.setModifier(Modifier.Keyword.PUBLIC, true); + + return md; + } + }, null); + + classOrInterfaceDeclaration.accept(new ModifierVisitor() { + @Override + public ClassOrInterfaceDeclaration visit(ClassOrInterfaceDeclaration n, Void arg) { + super.visit(n, arg); + if (!n.getNameAsString().equals(String.format(SRC_FILE_FORMAT, versionCode))) { + n.setModifier(Modifier.Keyword.PRIVATE, false); + n.setModifier(Modifier.Keyword.STATIC, true); + n.setModifier(Modifier.Keyword.PUBLIC, true); + n.accept(new ModifierVisitor() { + @Override + public FieldDeclaration visit(FieldDeclaration md, Void arg) { + super.visit(md, arg); + md.setModifier(Modifier.Keyword.PRIVATE, false); + md.setModifier(Modifier.Keyword.STATIC, false); + md.setModifier(Modifier.Keyword.PUBLIC, true); + return md; + } + }, null); + } + return n; + } + }, null); + + if (versionCode.contains("10")) dealWithV2ExceptionCasesPostProcessing(classOrInterfaceDeclaration, versionCode); + + } + + public static void createJavaFiles(ClassOrInterfaceDeclaration classOrInterfaceDeclaration, + HashMap> generatedTopLevelMethodMap, + HashMap> generatedStaticFieldMappings, + String filename, + String packageDeclaration, + NodeList imports, + String outputDirectoryPath, + List externalClassNames, + String version) { + System.out.println("==================== Create Java Files ====================\n"); + + generatedTopLevelMethodMap.keySet().stream() + .filter(s -> !s.equals(COMMON_FILENAME)) + .forEach(s -> { + String generatedCode = generateFileContents(classOrInterfaceDeclaration, + filename, + s + version, + packageDeclaration, + imports, + generatedStaticFieldMappings.get(s), + generatedStaticFieldMappings.get(COMMON_FILENAME), + generatedTopLevelMethodMap.get(s).stream() + .sorted(Comparator.comparing(methodDeclaration -> methodDeclaration.getName().toString())) + .collect(Collectors.toList()), + externalClassNames, + version); + + try { + String filePath = outputDirectoryPath + s + version + ".java"; + System.out.println("Attempting to write file -> " + filePath); + writeStringToFile(generatedCode, filePath); + } catch (IOException e) { + e.printStackTrace(); + } + }); + } + + public static void writeStringToFile(String string, String filepath) throws IOException { + BufferedWriter writer = new BufferedWriter(new FileWriter(filepath)); + writer.write(string); + writer.close(); + } + + public static String generateFileContents(ClassOrInterfaceDeclaration oldInterfaceDec, + String commonMethodClassName, + String className, + String packageDeclaration, + NodeList imports, + List fieldDeclarations, + List externalFieldDeclarations, + List methods, + List externalClassNames, + String version) { + + CompilationUnit cu = new CompilationUnit(); + + + cu.setPackageDeclaration(packageDeclaration); + cu.setImports(imports); + cu.addImport("org.hl7.fhir.convertors." + String.format(SRC_FILE_FORMAT, version)); + cu.addImport("org.hl7.fhir.convertors.VersionConvertorConstants"); + if (version.contains("10")) + cu.addImport(String.format(VERSION_CONVERTOR_IMPORT, version.substring(version.indexOf('_') + 1, version.indexOf('_') + 2))); + + ClassOrInterfaceDeclaration generatedClass = cu.addClass(className); + if (fieldDeclarations != null) { + fieldDeclarations.forEach(generatedClass::addMember); + } + + methods.forEach(method -> { + + MethodDeclaration methodDeclaration = generatedClass.addMethod(method.getNameAsString()); + + if (method.getBody().isPresent()) { + BlockStmt blockStmt = method.getBody().get(); + if (externalFieldDeclarations != null) { + blockStmt.accept(new VarAccessChanger(externalFieldDeclarations.stream() + .map(fd -> fd.getVariable(0).getNameAsString()) + .collect(Collectors.toList()), String.format(SRC_FILE_FORMAT, version)), null); + } + List allCalledMethods = getAllCalledMethods(oldInterfaceDec, method); + + allCalledMethods.stream() + .filter(md -> !methods.contains(md)) + .map(NodeWithSimpleName::getNameAsString) + .distinct() + .forEach(methodName -> { + List methodCallExprs = new ArrayList<>(); + blockStmt.accept(new MethodCallVisitor(methodName, true), methodCallExprs); + methodCallExprs.stream() + .distinct() + .forEach(methodCallExpr -> { + methodCallExpr.setName(commonMethodClassName + "." + methodCallExpr.getNameAsString()); + }); + }); + methodDeclaration.setBody(blockStmt); + + } + + methodDeclaration.setParameters(method.getParameters()); + methodDeclaration.setModifiers(method.getModifiers()); + methodDeclaration.addModifier(Modifier.Keyword.STATIC); + methodDeclaration.setModifier(Modifier.Keyword.PRIVATE, false); + methodDeclaration.setModifier(Modifier.Keyword.PUBLIC, true); + methodDeclaration.setThrownExceptions(method.getThrownExceptions()); + methodDeclaration.setType(method.getType()); + methodDeclaration.setTypeParameters(method.getTypeParameters()); + }); + + + generatedClass.walk(node -> { + String identifier = ""; + if (node instanceof NodeWithIdentifier) + if (externalClassNames.contains(((NodeWithIdentifier) node).getIdentifier())) { + ((NodeWithIdentifier) node).setIdentifier(String.format(SRC_FILE_FORMAT, version) + "." + ((NodeWithIdentifier) node).getIdentifier()); + } + }); + + return cu.toString(); + } + + public static Predicate distinctByKey(Function keyExtractor) { + Set seen = ConcurrentHashMap.newKeySet(); + return t -> seen.add(keyExtractor.apply(t)); + } + + private static void recursiveSearchAndAdd(ClassOrInterfaceDeclaration cd, + HashMap methodDeclarationMap, + HashMap fieldDeclarationMap, + List globalStaticFields, + MethodDeclaration key, + String value) { + if (methodDeclarationMap.containsKey(key) && (methodDeclarationMap.get(key).equals(COMMON_FILENAME) || methodDeclarationMap.get(key).equals(value))) + return; + if (key.getName().toString().equals("convertResource")) return; + + addMethodDeclarationToMap(methodDeclarationMap, value, key); + searchAndSortMethodFields(key, value, fieldDeclarationMap, globalStaticFields); + + getAllCalledMethods(cd, key).forEach(md -> { + recursiveSearchAndAdd(cd, methodDeclarationMap, fieldDeclarationMap, globalStaticFields, md, value); + }); + + } + + private static void searchAndSortMethodFields(MethodDeclaration md, + String classKey, + HashMap fieldToClassMap, + List fieldDeclarations) { + + List collector = new ArrayList<>(); + md.accept(new MethodFieldVisitor(), collector); + + md.accept(new VoidVisitorAdapter() { + @Override + public void visit(VarType n, Void arg) { + super.visit(n, arg); + } + }, null); + + List staticFieldLabels = fieldDeclarations.stream() + .map(fd -> fd.getVariable(0).getName().asString()) + .collect(Collectors.toList()); + + collector.stream() + .filter(ne -> staticFieldLabels.contains(ne.getNameAsString())) + .map(ne -> fieldDeclarations.stream() + .filter(fd -> fd.getVariable(0).getName().asString().equals(ne.getNameAsString())) + .findFirst() + .get()) + .forEach(fd -> { + if (!fieldToClassMap.containsKey(fd)) { + fieldToClassMap.put(fd, classKey); + } else if (!fieldToClassMap.get(fd).equals(classKey)) { + fieldToClassMap.put(fd, COMMON_FILENAME); + } + }); + } + + + private static void createDirectory(String path) { + File file = new File(path); + //Creating the directory + boolean bool = file.mkdir(); + if (bool) { + System.out.println("Directory created successfully"); + } else { + System.out.println("Sorry couldn’t create specified directory"); + } + } + + /** + * Attempts to delete the file at the given path.) + * + * @param path + */ + public static void deleteFile(String path) { + File file = new File(path); + if (file.delete()) { + System.out.println("File <" + path + "> deleted successfully"); + } else { + System.out.println("Failed to delete the file <" + path + ">"); + } + } + + /** + * Finds the god method in the given convertor, and parses out all the method calls that method makes. + * + * @param classOrInterfaceDeclaration + * @return + */ + protected static List getListOfParsableTypes(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration) { + List listOfClassMethods = getListOfClassMethods(KEYWORD_GOD_METHOD, classOrInterfaceDeclaration); + List calledMethods = new ArrayList<>(); + listOfClassMethods.forEach(md -> md.accept(new MethodCallVisitor(KEYWORD_CONVERT), calledMethods)); + return calledMethods; + } + + /** + * Pulls all internal conversion method calls out of the passed in method and maps those calls to the corresponding + * {@link MethodDeclaration} and returns those as a list. + * + * @param classOrInterfaceDeclaration + * @param method + * @return List of all {@link MethodDeclaration} + */ + public static List getAllCalledMethods(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration, MethodDeclaration method) { + List result = new ArrayList<>(); + + List methodCallExprs = new ArrayList<>(); + method.accept(new VoidVisitorAdapter>() { + @Override + public void visit(MethodCallExpr methodCallExpr, List collector) { + collector.add(methodCallExpr); + super.visit(methodCallExpr, collector); + } + }, methodCallExprs); + + Set methodExpressionNames = methodCallExprs.stream() + .filter(methodCallExpr -> !methodCallExpr.getScope().isPresent()) + .map(me -> me.getName().toString()) + .collect(Collectors.toSet()); + + classOrInterfaceDeclaration.getMethods().stream() + .filter(e -> methodExpressionNames.contains(e.getName().toString())) + .collect(Collectors.toCollection(() -> result)); + + return result; + } + + /** + * Searches the passed in {@link ClassOrInterfaceDeclaration} for any method declaration matching any of the method + * names in the passed in List. + * + * @param classOrInterfaceDeclaration {@link ClassOrInterfaceDeclaration} to search + * @param methodNames {@link List} of method names + * @return {@link List } containing any of the keywords + */ + protected static List getTopLevelMethods(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration, List methodNames) { + List toReturn = new ArrayList<>(); + methodNames.stream() + .map(s -> getListOfClassMethods(s, classOrInterfaceDeclaration)) + .flatMap(List::stream) + .collect(Collectors.toCollection(() -> toReturn)); + return toReturn; + } + + /** + * Searched the generated declaration map for the matching {@link MethodDeclaration}, if it already exists within the + * map and is not currently pointing the class label we pass in, it will mark it with the {@link Parser#COMMON_FILENAME} + * + * @param className {@link String} class label we want to associate the method with + * @param methodDeclaration {@link MethodDeclaration} + */ + protected static void addMethodDeclarationToMap(HashMap map, + String className, MethodDeclaration methodDeclaration) { + if (!map.containsKey(methodDeclaration)) { + map.put(methodDeclaration, className); + } else if (!map.get(methodDeclaration).equals(className)) { + map.put(methodDeclaration, COMMON_FILENAME); + } + } + + /** + * Returns a list of all java files within the passed in directory path, without extension. + * + * @param path {@link String} filepath + * @return {@link List < String >} of all filenames + */ + protected static List listAllJavaFilesInDirectory(String path) { + List result = new ArrayList<>(); + + try (Stream walk = Files.walk(Paths.get(path))) { + walk.map(Path::toString) + .filter(f -> f.endsWith(".java")) + .map(Parser::pullFileNameFromPath) + .collect(Collectors.toCollection(() -> result)); + } catch (IOException e) { + e.printStackTrace(); + } + + return result; + } + + /** + * Takes the passed in file path and extracts the filename without extension. + * + * @param path + * @return + */ + protected static String pullFileNameFromPath(String path) { + int lastSlashIndex = path.lastIndexOf('/'); + int lastPeriodIndex = path.lastIndexOf('.'); + return path.substring(lastSlashIndex + 1, lastPeriodIndex); + } + + /** + * The parser works by listing method calls within the individual resource conversion methods as + * {@link MethodCallExpr}. To extract the information we need to refactor the code, + * such as method body, references, signature, etc, we rely on the javaparser {@link TypeSolver} to parse the code + * library and convert the expressions to concrete {@link MethodDeclaration}. + *

+ * NB. The more source files in the directory you pass in (this will search recursively), the longer the + * MethodDeclaration lookups will take. Be smart, choose S-Mart. + * + * @param rootProjectDirectory + * @param projectDirectory {@link String} path to the directory that contains the souce files we want to be available for + */ + public static void initializeResolver(String rootProjectDirectory, String projectDirectory) throws IOException { + System.out.println("Initializing resolver against the following root directory:\n" + rootProjectDirectory); + System.out.println("Project codebase located here:\n" + projectDirectory); + + TypeSolver myTypeSolver = new CombinedTypeSolver( + new ReflectionTypeSolver(), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.convertors/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.utilities/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.dstu2/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.dstu3/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.dstu2016may/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.r4/src/main/java/")), + new JavaParserTypeSolver(new File(rootProjectDirectory + "/org.hl7.fhir.r5/src/main/java/")), + new JarTypeSolver("/Users/markiantorno/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-structures-r4/4.1.0/hapi-fhir-structures-r4-4.1.0.jar"), + new JarTypeSolver("/Users/markiantorno/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-base/4.1.0/hapi-fhir-base-4.1.0.jar") + ); + + JavaSymbolSolver symbolSolver = new JavaSymbolSolver(myTypeSolver); + StaticJavaParser.getConfiguration().setSymbolResolver(symbolSolver); + } + + /** + * Initializes the parser and runs it against the file located at the passed in path. + * + * @param path {@link String} path to the file. + * @return {@link Optional } + */ + public static Optional initializeParser(String path) { + System.out.println("Initializing parser, and parsing the following file:\n" + path); + CompilationUnit compilationUnit = null; + try { + compilationUnit = StaticJavaParser.parse(new File(path)); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + return Optional.ofNullable(compilationUnit); + } + + /** + * Loads a class using the {@link CompilationUnit} passed in and returns the resulting declaration for parsing. This + * class must exist within the directory parsed originally in {@link #initializeParser(String)} + * + * @param cu {@link CompilationUnit} + * @param classname {@link String} The name of the class to load. + * @return {@link Optional } for the named class. + */ + protected static Optional loadClass(CompilationUnit cu, String classname) { + return cu.getClassByName(classname); + } + + /** + * Takes a given {@link MethodCallExpr} and uses the initialized {@link JavaSymbolSolver} to search the source code + * for the appropriate {@link MethodDeclaration}. + * + * @param methodCallExpr {@link MethodCallExpr} + * @return An {@link Optional}, containing the corresponding {@link MethodDeclaration} + */ + protected static Optional resolveMethodDeclaration(MethodCallExpr methodCallExpr) { + MethodDeclaration wrappedDeclaration = null; + ResolvedMethodDeclaration correspondingDeclaration = methodCallExpr.resolve(); + + if (correspondingDeclaration instanceof JavaParserMethodDeclaration) { + JavaParserMethodDeclaration declaration = (JavaParserMethodDeclaration) correspondingDeclaration; + Node wrappedNode = declaration.getWrappedNode(); + wrappedDeclaration = (MethodDeclaration) wrappedNode; + System.out.println(); + } + + return Optional.ofNullable(wrappedDeclaration); + } + + /** + * Takes the content {@link String} passed in, and writes it to a java file with the provided name, in the provided + * directory location. + * + * @param filename Name of the file, including extension, ex: "Book.java" + * @param directory Path to directory to create the file + * @param content {@link String} content of the file + * @throws IOException + */ + public static void writeJavaCodeToFile(String filename, String directory, String content) throws IOException { + BufferedWriter writer = new BufferedWriter(new FileWriter(directory + filename)); + writer.write(content); + writer.close(); + } + + /** + * Returns the list of class methods. + * + * @param classOrInterfaceDeclaration {@link ClassOrInterfaceDeclaration} + * @return {@link List} of all {@link MethodDeclaration} + */ + protected static List getListOfClassMethods(ClassOrInterfaceDeclaration + classOrInterfaceDeclaration) { + return getListOfClassMethods("", classOrInterfaceDeclaration); + } + + /** + * Returns the list of class methods containing the passed in method name. + * + * @param methodName {@link String} method name to search for + * @param classOrInterfaceDeclaration {@link ClassOrInterfaceDeclaration} + * @return {@link List} of all matching {@link MethodDeclaration} + */ + protected static List getListOfClassMethods(String methodName, ClassOrInterfaceDeclaration + classOrInterfaceDeclaration) { + List result = new ArrayList<>(); + classOrInterfaceDeclaration.getMethods().stream() + .filter(method -> method.getName().toString().equals(methodName)) + .collect(Collectors.toCollection(() -> result)); + return result; + } + + private static List generateCommentReportData(String filepath) throws FileNotFoundException { + + CompilationUnit cu = StaticJavaParser.parse(new File(filepath)); + + return cu.getAllContainedComments().stream() + .filter(Comment::isOrphan) + .filter(Comment::isLineComment) + .map(p -> new CommentReportEntry(filepath.substring(filepath.lastIndexOf('/') + 1), + p.getClass().getSimpleName(), p.getContent(), p.getRange().get().begin.line, + !p.getCommentedNode().isPresent())) + .collect(Collectors.toList()); + } + + /** + * Class that visits all method calls within a given method and returns the results as a list. + */ + public static class MethodCallVisitor extends VoidVisitorAdapter> { + + private final String keyword; + private final boolean strict; + + public MethodCallVisitor(String keywords) { + super(); + this.keyword = keywords; + this.strict = false; + } + + public MethodCallVisitor(String keywords, boolean strict) { + super(); + this.keyword = keywords; + this.strict = strict; + } + + @Override + public void visit(MethodCallExpr methodCallExpr, List collector) { + if (strict) { + if (methodCallExpr.getName().asString().equals(keyword)) { + collector.add(methodCallExpr); + } + } else { + if (methodCallExpr.getName().asString().contains(keyword)) { + collector.add(methodCallExpr); + } + } + super.visit(methodCallExpr, collector); + } + } + + /** + * Class that visits all method calls within a given method and returns the results as a list. + */ + public static class MethodFieldVisitor extends VoidVisitorAdapter> { + + public MethodFieldVisitor() { + super(); + } + + @Override + public void visit(NameExpr fieldAccessExpr, List collector) { + super.visit(fieldAccessExpr, collector); + collector.add(fieldAccessExpr); + } + } + + /** + * Class that visits all method calls within a given method and returns the results as a list. + */ + public static class VarAccessChanger extends ModifierVisitor { + + private final List varsToAccessInMainFile; + private final String parentClassName; + + public VarAccessChanger(List varsToAccessInMainFile, String parentClassName) { + super(); + this.varsToAccessInMainFile = varsToAccessInMainFile; + this.parentClassName = parentClassName; + } + + @Override + public NameExpr visit(NameExpr nameExpr, Void arg) { + super.visit(nameExpr, arg); + if (varsToAccessInMainFile.contains(nameExpr.getNameAsString())) { + nameExpr.setName(parentClassName + "." + nameExpr.getNameAsString()); + } + return nameExpr; + } + } + + /** + * Class that visits all methods and deletes them if they are in the list of passed in MethodDeclarations + */ + public static class MethodDeleter extends ModifierVisitor { + + private List toDelete; + + public MethodDeleter(List toDelete) { + this.toDelete = toDelete; + } + + @Override + public MethodDeclaration visit(MethodDeclaration md, Void arg) { + super.visit(md, arg); + if (toDelete.contains(md)) { + return null; + } + return md; + } + } + + /** + * Class that visits all methods and deletes them if they are in the list of passed in MethodDeclarations + */ + public static class MethodExposer extends ModifierVisitor { + + private List toModify; + + public MethodExposer(List toModify) { + this.toModify = toModify; + } + + @Override + public MethodDeclaration visit(MethodDeclaration md, Void arg) { + super.visit(md, arg); + if (toModify.contains(md)) { + md.setModifier(Modifier.Keyword.PRIVATE, false); + md.setModifier(Modifier.Keyword.STATIC, true); + md.setModifier(Modifier.Keyword.PUBLIC, true); + } + return md; + } + } + + /** + * Class that visits all calls in calls and changes the access to an external class if it matches one of the passed + * in labels. + */ + public static class MethodStaticCallAdder extends ModifierVisitor { + + private List methodNames; + private String versionCode; + + public MethodStaticCallAdder(List methodNames, String versionCode) { + this.methodNames = methodNames; + this.versionCode = versionCode; + } + + @Override + public MethodCallExpr visit(MethodCallExpr methodCallExpr, Void arg) { + super.visit(methodCallExpr, arg); + if (methodNames.contains(methodCallExpr.getNameAsString())) { + //eg. convertPatient -> Patient30_50.convertPatient + methodCallExpr.setName(methodCallExpr.getNameAsString().replace(KEYWORD_CONVERT, "") + + versionCode + "." + methodCallExpr.getNameAsString()); + } + return methodCallExpr; + } + } + + private static class CommentReportEntry { + public String filename; + public String type; + public String text; + public int lineNumber; + public boolean isOrphan; + + CommentReportEntry(String filename, String type, String text, int lineNumber, + boolean isOrphan) { + this.filename = filename; + this.type = type; + this.text = text; + this.lineNumber = lineNumber; + this.isOrphan = isOrphan; + } + + @Override + public String toString() { + return filename + " | " + lineNumber + " | " + type + " | " + text.replaceAll("\\n", "").trim(); + } + } + + // ------------- Version String Manipulation Stuff + + public static final String MODEL_IMPORT_PATH = "org.hl7.fhir.%1$s.model.%2$s"; + public static final String MODEL_ABSOLUTE_PATH = "/org.hl7.fhir.%1$s/src/main/java/org/hl7/fhir/%1$s/model/%2$s.java"; + public static final String MODEL_PATH_WITHOUT_IMPORT = "/org.hl7.fhir.%1$s/src/main/java/"; + + public static String getVersionStringFromPath(String path) { + if (path.contains("dstu2")) return "dstu2"; + if (path.contains("dstu2016may")) return "dstu2016may"; + if (path.contains("dstu3")) return "dstu3"; + if (path.contains("r4")) return "r4"; + if (path.contains("r5")) return "r5"; + + return null; + } + + public static String getVersionString(String version) { + switch (version) { + case ("10"): + return "dstu2"; + case ("14"): + return "dstu2016may"; + case ("30"): + return "dstu3"; + case ("40"): + return "r4"; + case ("50"): + return "r5"; + default: + throw new IllegalArgumentException("Passed in version " + version + ", no such mapping exists..."); + } + } + + public static String getModelAbsolutePathFromVersion(String convertorClassName) { + String projectDirectory = new File("").getAbsolutePath(); + String version = getFromVersion(convertorClassName); + return projectDirectory + String.format(MODEL_ABSOLUTE_PATH, getVersionString(version), extractName(convertorClassName)); + } + + public static String getModelAbsolutePathToVersion(String convertorClassName) { + String projectDirectory = new File("").getAbsolutePath(); + String version = getToVersion(convertorClassName); + return projectDirectory + String.format(MODEL_ABSOLUTE_PATH, getVersionString(version), extractName(convertorClassName)); + } + + public static String importStatementToAbsolutePath(String importStatement) { + String projectDirectory = new File("").getAbsolutePath(); + + String placeholder = null; + if (importStatement.contains("dstu2")) { + placeholder = "dstu2"; + } else if (importStatement.contains("dstu2016may")) { + placeholder = "dstu2016may"; + } else if (importStatement.contains("dstu3")) { + placeholder = "dstu3"; + } else if (importStatement.contains("r4")) { + placeholder = "r4"; + } else if (importStatement.contains("r5")) { + placeholder = "r5"; + } + + return projectDirectory + String.format(MODEL_PATH_WITHOUT_IMPORT, placeholder) + importStatement.replace('.', '/') + ".java"; + } + + private static String extractName(String convertorClassName) { + return convertorClassName.substring(0, convertorClassName.length() - 5); + } + + public static String getModelImportToVersion(String convertorClassName) { + String version = getToVersion(convertorClassName); + return String.format(MODEL_IMPORT_PATH, getVersionString(version), extractName(convertorClassName)); + } + + public static String getModelImportFromVersion(String convertorClassName) { + String version = getFromVersion(convertorClassName); + return String.format(MODEL_IMPORT_PATH, getVersionString(version), extractName(convertorClassName)); + } + + public static String getFromVersion(String className) { + String version = className.substring(className.length() - 5); + return version.substring(0, version.indexOf('_')); + } + + public static String getToVersion(String className) { + String version = className.substring(className.length() - 5); + return version.substring(version.indexOf('_') + 1, version.indexOf('_') + 3); + } + + public static String getLowerVersionAbsPathFromAbsPath(String type1Path, String type2Path, String version) { + String lowVersionString = getVersionString(version.substring(0, version.indexOf('_'))); + if (type1Path.contains(lowVersionString)) { + return type1Path; + } else { + return type2Path; + } + } + + public static String getDirectoryOfOppositeModel(String importStatement, String version) { + String lowVersionString = getVersionString(version.substring(0, version.indexOf('_'))); + String highVersionString = getVersionString(version.substring(version.indexOf('_') + 1, version.indexOf('_') + 3)); + + if (importStatement.contains(lowVersionString)) { + String temp = String.format(MODEL_IMPORT_PATH, highVersionString, ""); + return temp.substring(0, temp.lastIndexOf("model.") + "model.".length()); + } else { + String temp = String.format(MODEL_IMPORT_PATH, lowVersionString, ""); + return temp.substring(0, temp.lastIndexOf("model.") + "model.".length()); + } + } + + public static String getLowerVersionAbsPathFromImportStatement(String type1ImportStatement, String + type2ImportStatement, String version) { + String type1Path = importStatementToAbsolutePath(type1ImportStatement); + String type2Path = importStatementToAbsolutePath(type2ImportStatement); + return getLowerVersionAbsPathFromAbsPath(type1Path, type2Path, version); + } + + public static String getHigherVersionAbsPath(String type1ImportStatement, String type2ImportStatement, String + version) { + String type1Path = importStatementToAbsolutePath(type1ImportStatement); + String type2Path = importStatementToAbsolutePath(type2ImportStatement); + + String lowVersionString = getVersionString(version.substring(0, version.indexOf('_'))); + if (type1Path.contains(lowVersionString)) { + return type2Path; + } else { + return type1Path; + } + } +} + diff --git a/org.hl7.fhir.convertors/src/test/java/org/hl7/fhir/convertors/parser/ParserTest.java b/org.hl7.fhir.convertors/src/test/java/org/hl7/fhir/convertors/parser/ParserTest.java new file mode 100644 index 000000000..5a38c98da --- /dev/null +++ b/org.hl7.fhir.convertors/src/test/java/org/hl7/fhir/convertors/parser/ParserTest.java @@ -0,0 +1,12 @@ +package org.hl7.fhir.convertors.parser; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class ParserTest { + + @Test + public void parseAllTheCodes() { + } +} \ No newline at end of file