From 32daeb6f589947879ba44f0b93ef95f0608f52c0 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Mon, 1 Feb 2016 08:55:58 -0500 Subject: [PATCH] Switch DSTU2.1 to DSTU3 per FMB's decision --- examples/pom.xml | 2 +- .../main/java/example/FhirContextIntro.java | 6 +- .../java/ca/uhn/fhir/context/FhirContext.java | 6 +- .../ca/uhn/fhir/context/FhirVersionEnum.java | 2 +- hapi-fhir-cli/hapi-fhir-cli-app/pom.xml | 4 +- .../java/ca/uhn/fhir/cli/BaseCommand.java | 5 +- .../ca/uhn/fhir/cli/ExampleDataUploader.java | 2 +- ...ava => LoadingValidationSupportDstu3.java} | 14 +- .../ca/uhn/fhir/cli/RunServerCommand.java | 8 +- .../java/ca/uhn/fhir/cli/ValidateCommand.java | 12 +- .../ca/uhn/fhir/jpa/demo/ContextHolder.java | 4 +- ...Dstu21.java => FhirServerConfigDstu3.java} | 10 +- .../ca/uhn/fhir/jpa/demo/JpaServerDemo.java | 22 +-- hapi-fhir-cobertura/pom.xml | 8 +- hapi-fhir-jpaserver-base/pom.xml | 16 +- .../ca/uhn/fhir/jpa/config/BaseConfig.java | 62 +++--- .../BaseDstu3Config.java} | 57 +++--- .../WebsocketDstu3Config.java} | 12 +- .../ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 13 +- .../fhir/jpa/dao/BaseHapiFhirResourceDao.java | 2 +- .../fhir/jpa/dao/ISearchParamExtractor.java | 2 +- .../FhirResourceDaoBundleDstu3.java} | 10 +- .../FhirResourceDaoDstu3.java} | 21 ++- .../FhirResourceDaoEncounterDstu3.java} | 8 +- .../FhirResourceDaoPatientDstu3.java} | 9 +- ...esourceDaoQuestionnaireResponseDstu3.java} | 19 +- .../FhirResourceDaoSearchParameterDstu3.java} | 13 +- .../FhirResourceDaoSubscriptionDstu3.java} | 14 +- .../FhirResourceDaoValueSetDstu3.java} | 37 ++-- .../FhirSystemDaoDstu3.java} | 29 +-- .../IJpaValidationSupportDstu3.java} | 6 +- .../JpaValidationSupportDstu3.java} | 33 ++-- .../SearchParamExtractorDstu3.java} | 49 ++--- ...aseJpaResourceProviderEncounterDstu3.java} | 10 +- .../BaseJpaResourceProviderPatientDstu3.java} | 12 +- ...ceProviderQuestionnaireResponseDstu3.java} | 6 +- ...BaseJpaResourceProviderValueSetDstu3.java} | 22 +-- .../JpaConformanceProviderDstu3.java} | 30 +-- .../JpaResourceProviderDstu3.java} | 15 +- .../JpaSystemProviderDstu3.java} | 21 ++- ...=> SubscriptionWebsocketHandlerDstu3.java} | 14 +- ...criptionWebsocketHandlerFactoryDstu3.java} | 6 +- ...uireManualActivationInterceptorDstu3.java} | 14 +- ...va => JpaValidationSupportChainDstu3.java} | 14 +- ...Dstu21Config.java => TestDstu3Config.java} | 4 +- .../java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java | 4 +- .../BaseJpaDstu3SystemTest.java} | 6 +- .../BaseJpaDstu3Test.java} | 116 ++++++------ .../FhirResourceDaoDstu3InterceptorTest.java} | 8 +- .../FhirResourceDaoDstu3SearchFtTest.java} | 22 +-- .../FhirResourceDaoDstu3SearchNoFtTest.java} | 64 +++---- ...FhirResourceDaoDstu3SubscriptionTest.java} | 18 +- .../FhirResourceDaoDstu3Test.java} | 75 ++++---- .../FhirResourceDaoDstu3UpdateTest.java} | 20 +- .../FhirResourceDaoDstu3ValidateTest.java} | 32 ++-- .../FhirResourceDaoValueSetDstu3Test.java} | 20 +- .../FhirSearchDaoDstu3Test.java} | 8 +- .../FhirSystemDaoDstu3SearchTest.java} | 4 +- .../FhirSystemDaoDstu3Test.java} | 44 ++--- .../QuestionnaireResourceProviderDstu21.java | 15 -- .../BaseResourceProviderDstu3Test.java} | 29 ++- .../QuestionnaireResourceProviderDstu3.java | 13 ++ .../ResourceProviderDstu3Test.java} | 112 +++++------ .../ResourceProviderDstu3ValueSetTest.java} | 20 +- ...oviderQuestionnaireResponseDstu3Test.java} | 18 +- .../SubscriptionsDstu3Test.java} | 24 +-- .../SystemProviderDstu3Test.java} | 58 +++--- .../{bundle-dstu21.xml => bundle-dstu3.xml} | 0 ...ire_dstu21.xml => questionnaire_dstu3.xml} | 0 ...Dstu21.java => FhirServerConfigDstu3.java} | 10 +- .../ca/uhn/fhir/jpa/demo/JpaServerDemo.java | 22 +-- hapi-fhir-jpaserver-uhnfhirtest/.classpath | 2 +- .../ca/uhn/fhirtest/TestRestfulServer.java | 30 +-- ...Dstu21Config.java => TestDstu3Config.java} | 24 +-- .../WEB-INF/hapi-fhir-tester-config.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 10 +- .../java/ca/uhn/fhirtest/UhnFhirTestApp.java | 6 +- hapi-fhir-osgi-core/pom.xml | 14 +- .../fhir/context/FhirContextDstu1Test.java | 4 +- .../AdditionalmaterialsEnumFactory.java | 78 -------- .../valuesets/AdjudicationEnumFactory.java | 82 -------- .../AdjudicationErrorEnumFactory.java | 62 ------ .../AdjudicationReasonEnumFactory.java | 62 ------ .../valuesets/AnimalBreedsEnumFactory.java | 70 ------- .../AnimalGenderstatusEnumFactory.java | 66 ------- .../valuesets/AnimalSpeciesEnumFactory.java | 66 ------- .../valuesets/AuditSourceTypeEnumFactory.java | 90 --------- .../valuesets/BenefitCategoryEnumFactory.java | 70 ------- .../valuesets/BenefitNetworkEnumFactory.java | 62 ------ .../valuesets/BenefitTermEnumFactory.java | 62 ------ .../valuesets/BenefitTypeEnumFactory.java | 86 --------- .../valuesets/BenefitUnitEnumFactory.java | 62 ------ .../CarePlanActivityCategoryEnumFactory.java | 82 -------- .../ChoiceListOrientationEnumFactory.java | 62 ------ .../valuesets/ClaimExceptionEnumFactory.java | 62 ------ .../valuesets/ClaimModifiersEnumFactory.java | 74 -------- .../ClassificationOrContextEnumFactory.java | 62 ------ .../ConditionCategoryEnumFactory.java | 70 ------- .../ConditionClinicalEnumFactory.java | 70 ------- .../valuesets/ConditionStateEnumFactory.java | 66 ------- .../ConformanceExpectationEnumFactory.java | 70 ------- .../ContactentityTypeEnumFactory.java | 78 -------- .../valuesets/ContractActionEnumFactory.java | 62 ------ .../ContractActorroleEnumFactory.java | 62 ------ .../valuesets/ContractSubtypeEnumFactory.java | 62 ------ .../ContractTermSubtypeEnumFactory.java | 66 ------- .../ContractTermTypeEnumFactory.java | 62 ------ .../valuesets/ContractTypeEnumFactory.java | 62 ------ .../valuesets/DeviceActionEnumFactory.java | 66 ------- .../valuesets/EncounterDietEnumFactory.java | 82 -------- .../EncounterPriorityEnumFactory.java | 74 -------- ...counterSpecialArrangementsEnumFactory.java | 74 -------- .../valuesets/EncounterTypeEnumFactory.java | 70 ------- .../EntformulaAdditiveEnumFactory.java | 74 -------- .../valuesets/FlagCategoryEnumFactory.java | 74 -------- .../valuesets/FlagPriorityEnumFactory.java | 70 ------- .../valuesets/FmConditionsEnumFactory.java | 58 ------ .../model/valuesets/FormsEnumFactory.java | 62 ------ .../valuesets/FundsreserveEnumFactory.java | 66 ------- .../GoalAcceptanceStatusEnumFactory.java | 66 ------- .../valuesets/GoalCategoryEnumFactory.java | 74 -------- .../valuesets/GoalPriorityEnumFactory.java | 66 ------- .../GoalRelationshipTypeEnumFactory.java | 74 -------- .../GoalStatusReasonEnumFactory.java | 70 ------- ...ecommendationDateCriterionEnumFactory.java | 74 -------- ...zationRecommendationStatusEnumFactory.java | 62 ------ .../valuesets/InterventionEnumFactory.java | 62 ------ .../LOINC480020AnswerlistEnumFactory.java | 82 -------- .../LOINC480194AnswerlistEnumFactory.java | 82 -------- .../LOINC530345AnswerlistEnumFactory.java | 74 -------- .../LOINC530378AnswerlistEnumFactory.java | 74 -------- .../valuesets/ListEmptyReasonEnumFactory.java | 78 -------- .../valuesets/ListItemFlagEnumFactory.java | 78 -------- .../model/valuesets/ListOrderEnumFactory.java | 86 --------- .../MessageReasonEncounterEnumFactory.java | 78 -------- .../MessageTransportEnumFactory.java | 66 ------- .../MissingToothReasonEnumFactory.java | 70 ------- .../valuesets/ObjectTypeEnumFactory.java | 70 ------- .../ObservationCategoryEnumFactory.java | 86 --------- .../OralProsthodonticMaterialEnumFactory.java | 70 ------- .../valuesets/PatientMpiMatchEnumFactory.java | 70 ------- .../model/valuesets/PayeetypeEnumFactory.java | 66 ------- .../PaymentAdjustmentReasonEnumFactory.java | 62 ------ .../valuesets/PaymentStatusEnumFactory.java | 62 ------ .../valuesets/PaymentTypeEnumFactory.java | 66 ------- .../PractitionerRoleEnumFactory.java | 78 -------- .../PractitionerSpecialtyEnumFactory.java | 74 -------- ...ocedureProgressStatusCodesEnumFactory.java | 78 -------- .../ProcedureRelationshipTypeEnumFactory.java | 62 ------ .../valuesets/ProcessOutcomeEnumFactory.java | 66 ------- .../valuesets/ProcessPriorityEnumFactory.java | 66 ------- .../ProvenanceAgentTypeEnumFactory.java | 82 -------- .../QuestionMaxOccursEnumFactory.java | 58 ------ ...estionnaireDisplayCategoryEnumFactory.java | 62 ------ ...ReasonMedicationGivenCodesEnumFactory.java | 66 ------- ...sonMedicationNotGivenCodesEnumFactory.java | 70 ------- .../valuesets/RelationshipEnumFactory.java | 74 -------- .../ResourceValidationModeEnumFactory.java | 66 ------- .../RestfulSecurityServiceEnumFactory.java | 78 -------- .../valuesets/RiskProbabilityEnumFactory.java | 74 -------- .../model/valuesets/RulesetEnumFactory.java | 78 -------- .../valuesets/ServicePharmacyEnumFactory.java | 62 ------ .../valuesets/ServicePlaceEnumFactory.java | 62 ------ .../valuesets/ServiceProductEnumFactory.java | 62 ------ ...ServiceProvisionConditionsEnumFactory.java | 66 ------- .../ServiceReferralMethodEnumFactory.java | 74 -------- .../valuesets/SubscriptionTagEnumFactory.java | 62 ------ .../SubstanceCategoryEnumFactory.java | 82 -------- .../SupplydeliveryTypeEnumFactory.java | 62 ------ .../SupplyrequestKindEnumFactory.java | 62 ------ .../SupplyrequestReasonEnumFactory.java | 62 ------ .../model/valuesets/SurfaceEnumFactory.java | 98 ---------- .../model/valuesets/UdiEnumFactory.java | 58 ------ ...V3AcknowledgementConditionEnumFactory.java | 70 ------- ...3AcknowledgementDetailTypeEnumFactory.java | 78 -------- .../V3AcknowledgementTypeEnumFactory.java | 78 -------- .../V3ActExposureLevelCodeEnumFactory.java | 70 ------- ...3ActInvoiceElementModifierEnumFactory.java | 70 ------- ...3ActRelationshipCheckpointEnumFactory.java | 74 -------- .../V3ActRelationshipJoinEnumFactory.java | 70 ------- .../V3ActRelationshipSplitEnumFactory.java | 70 ------- .../V3ActUSPrivacyLawEnumFactory.java | 82 -------- .../V3ActUncertaintyEnumFactory.java | 62 ------ .../V3AdministrativeGenderEnumFactory.java | 66 ------- .../valuesets/V3CalendarEnumFactory.java | 58 ------ .../valuesets/V3CalendarTypeEnumFactory.java | 58 ------ .../V3CodingRationaleEnumFactory.java | 86 --------- ...3CommunicationFunctionTypeEnumFactory.java | 66 ------- .../V3CompressionAlgorithmEnumFactory.java | 78 -------- .../valuesets/V3ContainerCapEnumFactory.java | 82 -------- .../V3ContainerSeparatorEnumFactory.java | 62 ------ .../V3ContentProcessingModeEnumFactory.java | 62 ------ .../V3DeviceAlertLevelEnumFactory.java | 70 ------- .../V3DocumentCompletionEnumFactory.java | 90 --------- .../V3DocumentStorageEnumFactory.java | 70 ------- .../V3EducationLevelEnumFactory.java | 90 --------- .../V3EmployeeJobClassEnumFactory.java | 62 ------ ...V3EncounterAdmissionSourceEnumFactory.java | 66 ------- ...V3EncounterSpecialCourtesyEnumFactory.java | 74 -------- .../V3EntityDeterminerEnumFactory.java | 74 -------- .../V3EntityNamePartTypeEnumFactory.java | 74 -------- .../V3EntityNamePartTypeR2EnumFactory.java | 70 ------- .../valuesets/V3EntityRiskEnumFactory.java | 98 ---------- .../valuesets/V3EntityStatusEnumFactory.java | 74 -------- .../V3EquipmentAlertLevelEnumFactory.java | 70 ------- .../valuesets/V3ExposureModeEnumFactory.java | 74 -------- .../valuesets/V3GenderStatusEnumFactory.java | 62 ------ .../V3Hl7V3ConformanceEnumFactory.java | 78 -------- .../V3IdentifierReliabilityEnumFactory.java | 66 ------- .../V3IdentifierScopeEnumFactory.java | 70 ------- .../V3IntegrityCheckAlgorithmEnumFactory.java | 62 ------ .../V3LanguageAbilityModeEnumFactory.java | 78 -------- ...LanguageAbilityProficiencyEnumFactory.java | 70 ------- .../V3LocalMarkupIgnoreEnumFactory.java | 62 ------ .../V3LocalRemoteControlStateEnumFactory.java | 62 ------ ...ManagedParticipationStatusEnumFactory.java | 78 -------- .../V3MapRelationshipEnumFactory.java | 66 ------- .../valuesets/V3MaritalStatusEnumFactory.java | 94 --------- .../V3MessageWaitingPriorityEnumFactory.java | 66 ------- .../V3ModifyIndicatorEnumFactory.java | 62 ------ .../V3ParticipationSignatureEnumFactory.java | 66 ------- .../V3PatientImportanceEnumFactory.java | 90 --------- .../valuesets/V3PaymentTermsEnumFactory.java | 70 ------- .../valuesets/V3ProcessingIDEnumFactory.java | 66 ------- .../V3ProcessingModeEnumFactory.java | 70 ------- .../valuesets/V3QueryPriorityEnumFactory.java | 62 ------ .../V3QueryRequestLimitEnumFactory.java | 62 ------ .../valuesets/V3QueryResponseEnumFactory.java | 70 ------- .../V3QueryStatusCodeEnumFactory.java | 74 -------- .../V3RelationalOperatorEnumFactory.java | 86 --------- .../V3RelationshipConjunctionEnumFactory.java | 66 ------- .../valuesets/V3ResponseLevelEnumFactory.java | 82 -------- .../V3ResponseModalityEnumFactory.java | 66 ------- .../valuesets/V3ResponseModeEnumFactory.java | 66 ------- .../V3RoleLinkStatusEnumFactory.java | 78 -------- .../valuesets/V3RoleLinkTypeEnumFactory.java | 86 --------- .../valuesets/V3RoleStatusEnumFactory.java | 82 -------- .../valuesets/V3SequencingEnumFactory.java | 66 ------- .../valuesets/V3SetOperatorEnumFactory.java | 78 -------- .../V3SubstitutionConditionEnumFactory.java | 74 -------- ...V3TableCellHorizontalAlignEnumFactory.java | 74 -------- .../V3TableCellScopeEnumFactory.java | 70 ------- .../V3TableCellVerticalAlignEnumFactory.java | 70 ------- .../valuesets/V3TableFrameEnumFactory.java | 90 --------- .../valuesets/V3TableRulesEnumFactory.java | 74 -------- .../V3TargetAwarenessEnumFactory.java | 78 -------- ...ecommunicationCapabilitiesEnumFactory.java | 74 -------- ...issionRelationshipTypeCodeEnumFactory.java | 58 ------ ...cinationProtocolDoseStatusEnumFactory.java | 62 ------ ...onProtocolDoseStatusReasonEnumFactory.java | 74 -------- .../valuesets/VariantStateEnumFactory.java | 66 ------- .../valuesets/VisionProductEnumFactory.java | 62 ------ .../XdsRelationshipTypeEnumFactory.java | 74 -------- .../dstu21/terminologies/ValueSetChecker.java | 10 - .../fhir/dstu21/model/fhirversion.properties | 151 --------------- hapi-fhir-structures-dstu3/.gitignore | 1 + .../differences.txt | 0 .../pom.xml | 6 +- .../exceptions/DefinitionException.java | 2 +- .../fhir/dstu3}/exceptions/FHIRException.java | 2 +- .../dstu3}/exceptions/FHIRFormatError.java | 2 +- .../exceptions/PathEngineException.java | 2 +- .../TerminologyServiceException.java | 2 +- .../fhir/dstu3}/exceptions/UcumException.java | 2 +- .../fhir/dstu3}/formats/FormatUtilities.java | 2 +- .../org/hl7/fhir/dstu3}/formats/IParser.java | 8 +- .../hl7/fhir/dstu3}/formats/ParserType.java | 2 +- .../hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java | 36 ++-- .../hapi/rest/server/Dstu3BundleFactory.java | 24 +-- .../server/ServerConformanceProvider.java | 40 ++-- .../rest/server/ServerProfileProvider.java | 6 +- .../hapi/validation/BaseValidatorBridge.java | 4 +- .../DefaultProfileValidationSupport.java | 26 +-- .../validation/FhirInstanceValidator.java | 12 +- .../FhirQuestionnaireResponseValidator.java | 10 +- .../hapi/validation/HapiWorkerContext.java | 42 ++--- .../hapi/validation/IValidationSupport.java | 12 +- .../validation/ValidationSupportChain.java | 8 +- .../org/hl7/fhir/dstu3}/model/Account.java | 5 +- .../org/hl7/fhir/dstu3}/model/Address.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Age.java | 5 +- .../fhir/dstu3}/model/AllergyIntolerance.java | 5 +- .../org/hl7/fhir/dstu3}/model/Annotation.java | 5 +- .../hl7/fhir/dstu3}/model/Appointment.java | 5 +- .../dstu3}/model/AppointmentResponse.java | 5 +- .../org/hl7/fhir/dstu3}/model/Attachment.java | 8 +- .../org/hl7/fhir/dstu3}/model/AuditEvent.java | 8 +- .../fhir/dstu3}/model/BackboneElement.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Base.java | 4 +- .../fhir/dstu3}/model/Base64BinaryType.java | 2 +- .../org/hl7/fhir/dstu3}/model/BaseBinary.java | 2 +- .../fhir/dstu3}/model/BaseDateTimeType.java | 8 +- .../hl7/fhir/dstu3}/model/BaseExtension.java | 2 +- .../hl7/fhir/dstu3}/model/BaseNarrative.java | 2 +- .../hl7/fhir/dstu3}/model/BaseReference.java | 2 +- .../hl7/fhir/dstu3}/model/BaseResource.java | 2 +- .../java/org/hl7/fhir/dstu3}/model/Basic.java | 5 +- .../org/hl7/fhir/dstu3}/model/Binary.java | 8 +- .../org/hl7/fhir/dstu3}/model/BodySite.java | 5 +- .../hl7/fhir/dstu3}/model/BooleanType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Bundle.java | 5 +- .../org/hl7/fhir/dstu3}/model/CarePlan.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Claim.java | 8 +- .../hl7/fhir/dstu3}/model/ClaimResponse.java | 8 +- .../fhir/dstu3}/model/ClinicalImpression.java | 5 +- .../org/hl7/fhir/dstu3}/model/CodeSystem.java | 8 +- .../org/hl7/fhir/dstu3}/model/CodeType.java | 2 +- .../fhir/dstu3}/model/CodeableConcept.java | 5 +- .../org/hl7/fhir/dstu3}/model/Coding.java | 5 +- .../hl7/fhir/dstu3}/model/Communication.java | 5 +- .../dstu3}/model/CommunicationRequest.java | 5 +- .../org/hl7/fhir/dstu3}/model/Comparison.java | 4 +- .../hl7/fhir/dstu3}/model/Composition.java | 5 +- .../org/hl7/fhir/dstu3}/model/ConceptMap.java | 8 +- .../org/hl7/fhir/dstu3}/model/Condition.java | 5 +- .../hl7/fhir/dstu3}/model/Configuration.java | 2 +- .../hl7/fhir/dstu3}/model/Conformance.java | 8 +- .../org/hl7/fhir/dstu3}/model/Constants.java | 2 +- .../hl7/fhir/dstu3}/model/ContactPoint.java | 5 +- .../org/hl7/fhir/dstu3}/model/Contract.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Count.java | 5 +- .../org/hl7/fhir/dstu3}/model/Coverage.java | 5 +- .../hl7/fhir/dstu3}/model/DataElement.java | 8 +- .../hl7/fhir/dstu3}/model/DateTimeType.java | 2 +- .../org/hl7/fhir/dstu3}/model/DateType.java | 2 +- .../hl7/fhir/dstu3}/model/DecimalType.java | 2 +- .../dstu3}/model/DecisionSupportRule.java | 5 +- .../model/DecisionSupportServiceModule.java | 5 +- .../hl7/fhir/dstu3}/model/DetectedIssue.java | 5 +- .../org/hl7/fhir/dstu3}/model/Device.java | 5 +- .../fhir/dstu3}/model/DeviceComponent.java | 8 +- .../hl7/fhir/dstu3}/model/DeviceMetric.java | 5 +- .../fhir/dstu3}/model/DeviceUseRequest.java | 5 +- .../fhir/dstu3}/model/DeviceUseStatement.java | 5 +- .../fhir/dstu3}/model/DiagnosticOrder.java | 5 +- .../fhir/dstu3}/model/DiagnosticReport.java | 5 +- .../org/hl7/fhir/dstu3}/model/Distance.java | 5 +- .../fhir/dstu3}/model/DocumentManifest.java | 8 +- .../fhir/dstu3}/model/DocumentReference.java | 8 +- .../hl7/fhir/dstu3}/model/DomainResource.java | 5 +- .../org/hl7/fhir/dstu3}/model/Duration.java | 5 +- .../org/hl7/fhir/dstu3}/model/Element.java | 5 +- .../fhir/dstu3}/model/ElementDefinition.java | 56 +++--- .../fhir/dstu3}/model/EligibilityRequest.java | 8 +- .../dstu3}/model/EligibilityResponse.java | 8 +- .../org/hl7/fhir/dstu3}/model/Encounter.java | 5 +- .../fhir/dstu3}/model/EnrollmentRequest.java | 7 +- .../fhir/dstu3}/model/EnrollmentResponse.java | 8 +- .../hl7/fhir/dstu3}/model/EnumFactory.java | 2 +- .../hl7/fhir/dstu3}/model/Enumeration.java | 2 +- .../hl7/fhir/dstu3}/model/Enumerations.java | 5 +- .../hl7/fhir/dstu3}/model/EpisodeOfCare.java | 5 +- .../fhir/dstu3}/model/ExpansionProfile.java | 8 +- .../dstu3}/model/ExplanationOfBenefit.java | 8 +- .../hl7/fhir/dstu3}/model/ExpressionNode.java | 2 +- .../org/hl7/fhir/dstu3}/model/Extension.java | 13 +- .../fhir/dstu3}/model/ExtensionHelper.java | 4 +- .../org/hl7/fhir/dstu3}/model/Factory.java | 8 +- .../dstu3}/model/FamilyMemberHistory.java | 8 +- .../java/org/hl7/fhir/dstu3}/model/Flag.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Goal.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Group.java | 5 +- .../fhir/dstu3}/model/GuidanceResponse.java | 5 +- .../fhir/dstu3}/model/HealthcareService.java | 5 +- .../org/hl7/fhir/dstu3}/model/HumanName.java | 5 +- .../org/hl7/fhir/dstu3}/model/IdType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Identifier.java | 8 +- .../dstu3}/model/ImagingObjectSelection.java | 5 +- .../hl7/fhir/dstu3}/model/ImagingStudy.java | 5 +- .../hl7/fhir/dstu3}/model/Immunization.java | 5 +- .../model/ImmunizationRecommendation.java | 5 +- .../dstu3}/model/ImplementationGuide.java | 8 +- .../hl7/fhir/dstu3}/model/InstantType.java | 2 +- .../hl7/fhir/dstu3}/model/IntegerType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Library.java | 5 +- .../org/hl7/fhir/dstu3}/model/Linkage.java | 5 +- .../hl7/fhir/dstu3}/model/ListResource.java | 5 +- .../org/hl7/fhir/dstu3}/model/Location.java | 5 +- .../hl7/fhir/dstu3}/model/MarkdownType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Measure.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Media.java | 5 +- .../org/hl7/fhir/dstu3}/model/Medication.java | 5 +- .../model/MedicationAdministration.java | 5 +- .../fhir/dstu3}/model/MedicationDispense.java | 5 +- .../fhir/dstu3}/model/MedicationOrder.java | 5 +- .../dstu3}/model/MedicationStatement.java | 5 +- .../hl7/fhir/dstu3}/model/MessageHeader.java | 8 +- .../java/org/hl7/fhir/dstu3}/model/Meta.java | 8 +- .../fhir/dstu3}/model/ModuleDefinition.java | 5 +- .../hl7/fhir/dstu3}/model/ModuleMetadata.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Money.java | 5 +- .../hl7/fhir/dstu3}/model/NamingSystem.java | 8 +- .../org/hl7/fhir/dstu3}/model/Narrative.java | 5 +- .../hl7/fhir/dstu3}/model/NutritionOrder.java | 5 +- .../hl7/fhir/dstu3}/model/Observation.java | 5 +- .../org/hl7/fhir/dstu3}/model/OidType.java | 2 +- .../dstu3}/model/OperationDefinition.java | 8 +- .../fhir/dstu3}/model/OperationOutcome.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Order.java | 5 +- .../hl7/fhir/dstu3}/model/OrderResponse.java | 5 +- .../org/hl7/fhir/dstu3}/model/OrderSet.java | 5 +- .../hl7/fhir/dstu3}/model/Organization.java | 5 +- .../org/hl7/fhir/dstu3}/model/Parameters.java | 13 +- .../org/hl7/fhir/dstu3}/model/Patient.java | 8 +- .../hl7/fhir/dstu3}/model/PaymentNotice.java | 7 +- .../dstu3}/model/PaymentReconciliation.java | 8 +- .../org/hl7/fhir/dstu3}/model/Period.java | 5 +- .../org/hl7/fhir/dstu3}/model/Person.java | 8 +- .../fhir/dstu3}/model/PositiveIntType.java | 2 +- .../hl7/fhir/dstu3}/model/Practitioner.java | 8 +- .../hl7/fhir/dstu3}/model/PrimitiveType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Procedure.java | 5 +- .../fhir/dstu3}/model/ProcedureRequest.java | 5 +- .../hl7/fhir/dstu3}/model/ProcessRequest.java | 8 +- .../fhir/dstu3}/model/ProcessResponse.java | 8 +- .../org/hl7/fhir/dstu3}/model/Property.java | 2 +- .../org/hl7/fhir/dstu3}/model/Protocol.java | 5 +- .../org/hl7/fhir/dstu3}/model/Provenance.java | 5 +- .../org/hl7/fhir/dstu3}/model/Quantity.java | 5 +- .../hl7/fhir/dstu3}/model/Questionnaire.java | 8 +- .../dstu3}/model/QuestionnaireResponse.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Range.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Ratio.java | 5 +- .../org/hl7/fhir/dstu3}/model/Reference.java | 5 +- .../fhir/dstu3}/model/ReferralRequest.java | 5 +- .../hl7/fhir/dstu3}/model/RelatedPerson.java | 8 +- .../org/hl7/fhir/dstu3}/model/Resource.java | 6 +- .../fhir/dstu3}/model/ResourceFactory.java | 35 +--- .../hl7/fhir/dstu3}/model/ResourceType.java | 4 +- .../hl7/fhir/dstu3}/model/RiskAssessment.java | 5 +- .../hl7/fhir/dstu3}/model/SampledData.java | 5 +- .../org/hl7/fhir/dstu3}/model/Schedule.java | 5 +- .../fhir/dstu3}/model/SearchParameter.java | 8 +- .../org/hl7/fhir/dstu3}/model/Sequence.java | 5 +- .../org/hl7/fhir/dstu3}/model/SidType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Signature.java | 8 +- .../hl7/fhir/dstu3}/model/SimpleQuantity.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Slot.java | 5 +- .../org/hl7/fhir/dstu3}/model/Specimen.java | 5 +- .../org/hl7/fhir/dstu3}/model/StringType.java | 2 +- .../dstu3}/model/StructureDefinition.java | 8 +- .../hl7/fhir/dstu3}/model/Subscription.java | 5 +- .../org/hl7/fhir/dstu3}/model/Substance.java | 5 +- .../hl7/fhir/dstu3}/model/SupplyDelivery.java | 5 +- .../hl7/fhir/dstu3}/model/SupplyRequest.java | 5 +- .../dstu3}/model/TemporalPrecisionEnum.java | 2 +- .../org/hl7/fhir/dstu3}/model/TestScript.java | 8 +- .../org/hl7/fhir/dstu3}/model/TimeType.java | 2 +- .../org/hl7/fhir/dstu3}/model/Timing.java | 5 +- .../java/org/hl7/fhir/dstu3}/model/Type.java | 2 +- .../fhir/dstu3}/model/UnsignedIntType.java | 2 +- .../org/hl7/fhir/dstu3}/model/UriType.java | 2 +- .../org/hl7/fhir/dstu3}/model/UuidType.java | 2 +- .../org/hl7/fhir/dstu3}/model/ValueSet.java | 8 +- .../fhir/dstu3}/model/VisionPrescription.java | 5 +- .../model/valuesets/Additionalmaterials.java | 4 +- .../AdditionalmaterialsEnumFactory.java | 46 +++++ .../dstu3}/model/valuesets/Adjudication.java | 4 +- .../valuesets/AdjudicationEnumFactory.java | 50 +++++ .../model/valuesets/AdjudicationError.java | 4 +- .../AdjudicationErrorEnumFactory.java | 30 +++ .../model/valuesets/AdjudicationReason.java | 4 +- .../AdjudicationReasonEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/AnimalBreeds.java | 4 +- .../valuesets/AnimalBreedsEnumFactory.java | 38 ++++ .../model/valuesets/AnimalGenderstatus.java | 4 +- .../AnimalGenderstatusEnumFactory.java | 34 ++++ .../dstu3}/model/valuesets/AnimalSpecies.java | 4 +- .../valuesets/AnimalSpeciesEnumFactory.java | 34 ++++ .../model/valuesets/AnzscoOccupations.java | 4 +- .../AnzscoOccupationsEnumFactory.java | 36 +--- .../model/valuesets/AuditSourceType.java | 4 +- .../valuesets/AuditSourceTypeEnumFactory.java | 58 ++++++ .../model/valuesets/BasicResourceType.java | 4 +- .../BasicResourceTypeEnumFactory.java | 36 +--- .../model/valuesets/BenefitCategory.java | 4 +- .../valuesets/BenefitCategoryEnumFactory.java | 38 ++++ .../model/valuesets/BenefitNetwork.java | 4 +- .../valuesets/BenefitNetworkEnumFactory.java | 30 +++ .../model/valuesets/BenefitSubcategory.java | 4 +- .../BenefitSubcategoryEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/BenefitTerm.java | 4 +- .../valuesets/BenefitTermEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/BenefitType.java | 4 +- .../valuesets/BenefitTypeEnumFactory.java | 54 ++++++ .../dstu3}/model/valuesets/BenefitUnit.java | 4 +- .../valuesets/BenefitUnitEnumFactory.java | 30 +++ .../valuesets/CarePlanActivityCategory.java | 4 +- .../CarePlanActivityCategoryEnumFactory.java | 50 +++++ .../valuesets/ChoiceListOrientation.java | 4 +- .../ChoiceListOrientationEnumFactory.java | 30 +++ .../model/valuesets/ClaimException.java | 4 +- .../valuesets/ClaimExceptionEnumFactory.java | 30 +++ .../model/valuesets/ClaimModifiers.java | 4 +- .../valuesets/ClaimModifiersEnumFactory.java | 42 +++++ .../valuesets/ClassificationOrContext.java | 4 +- .../ClassificationOrContextEnumFactory.java | 30 +++ .../model/valuesets/ConditionCategory.java | 4 +- .../ConditionCategoryEnumFactory.java | 38 ++++ .../model/valuesets/ConditionClinical.java | 4 +- .../ConditionClinicalEnumFactory.java | 38 ++++ .../model/valuesets/ConditionState.java | 4 +- .../valuesets/ConditionStateEnumFactory.java | 34 ++++ .../valuesets/ConformanceExpectation.java | 4 +- .../ConformanceExpectationEnumFactory.java | 38 ++++ .../model/valuesets/ContactentityType.java | 4 +- .../ContactentityTypeEnumFactory.java | 46 +++++ .../model/valuesets/ContractAction.java | 4 +- .../valuesets/ContractActionEnumFactory.java | 30 +++ .../model/valuesets/ContractActorrole.java | 4 +- .../ContractActorroleEnumFactory.java | 30 +++ .../model/valuesets/ContractSignerType.java | 4 +- .../ContractSignerTypeEnumFactory.java | 36 +--- .../model/valuesets/ContractSubtype.java | 4 +- .../valuesets/ContractSubtypeEnumFactory.java | 30 +++ .../model/valuesets/ContractTermSubtype.java | 4 +- .../ContractTermSubtypeEnumFactory.java | 34 ++++ .../model/valuesets/ContractTermType.java | 4 +- .../ContractTermTypeEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/ContractType.java | 4 +- .../valuesets/ContractTypeEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/DeviceAction.java | 4 +- .../valuesets/DeviceActionEnumFactory.java | 34 ++++ .../model/valuesets/EncounterAdmitSource.java | 4 +- .../EncounterAdmitSourceEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/EncounterDiet.java | 4 +- .../valuesets/EncounterDietEnumFactory.java | 50 +++++ .../EncounterDischargeDisposition.java | 4 +- ...ounterDischargeDispositionEnumFactory.java | 36 +--- .../model/valuesets/EncounterPriority.java | 4 +- .../EncounterPriorityEnumFactory.java | 42 +++++ .../EncounterSpecialArrangements.java | 4 +- ...counterSpecialArrangementsEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/EncounterType.java | 4 +- .../valuesets/EncounterTypeEnumFactory.java | 38 ++++ .../model/valuesets/EntformulaAdditive.java | 4 +- .../EntformulaAdditiveEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/FlagCategory.java | 4 +- .../valuesets/FlagCategoryEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/FlagPriority.java | 4 +- .../valuesets/FlagPriorityEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/FmConditions.java | 4 +- .../valuesets/FmConditionsEnumFactory.java | 26 +++ .../fhir/dstu3}/model/valuesets/Forms.java | 4 +- .../model/valuesets/FormsEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/Fundsreserve.java | 4 +- .../valuesets/FundsreserveEnumFactory.java | 34 ++++ .../model/valuesets/GoalAcceptanceStatus.java | 4 +- .../GoalAcceptanceStatusEnumFactory.java | 34 ++++ .../dstu3}/model/valuesets/GoalCategory.java | 4 +- .../valuesets/GoalCategoryEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/GoalPriority.java | 4 +- .../valuesets/GoalPriorityEnumFactory.java | 34 ++++ .../model/valuesets/GoalRelationshipType.java | 4 +- .../GoalRelationshipTypeEnumFactory.java | 42 +++++ .../model/valuesets/GoalStatusReason.java | 4 +- .../GoalStatusReasonEnumFactory.java | 38 ++++ ...munizationRecommendationDateCriterion.java | 4 +- ...ecommendationDateCriterionEnumFactory.java | 42 +++++ .../ImmunizationRecommendationStatus.java | 4 +- ...zationRecommendationStatusEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/Intervention.java | 4 +- .../valuesets/InterventionEnumFactory.java | 30 +++ .../valuesets/LOINC480020Answerlist.java | 4 +- .../LOINC480020AnswerlistEnumFactory.java | 50 +++++ .../valuesets/LOINC480194Answerlist.java | 4 +- .../LOINC480194AnswerlistEnumFactory.java | 50 +++++ .../valuesets/LOINC530345Answerlist.java | 4 +- .../LOINC530345AnswerlistEnumFactory.java | 42 +++++ .../valuesets/LOINC530378Answerlist.java | 4 +- .../LOINC530378AnswerlistEnumFactory.java | 42 +++++ .../model/valuesets/ListEmptyReason.java | 4 +- .../valuesets/ListEmptyReasonEnumFactory.java | 46 +++++ .../model/valuesets/ListExampleCodes.java | 4 +- .../ListExampleCodesEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/ListItemFlag.java | 4 +- .../valuesets/ListItemFlagEnumFactory.java | 46 +++++ .../dstu3}/model/valuesets/ListOrder.java | 4 +- .../model/valuesets/ListOrderEnumFactory.java | 54 ++++++ .../model/valuesets/LocationPhysicalType.java | 4 +- .../LocationPhysicalTypeEnumFactory.java | 36 +--- .../valuesets/MessageReasonEncounter.java | 4 +- .../MessageReasonEncounterEnumFactory.java | 46 +++++ .../model/valuesets/MessageTransport.java | 4 +- .../MessageTransportEnumFactory.java | 34 ++++ .../model/valuesets/MissingToothReason.java | 4 +- .../MissingToothReasonEnumFactory.java | 38 ++++ .../model/valuesets/ObjectLifecycle.java | 4 +- .../valuesets/ObjectLifecycleEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/ObjectRole.java | 4 +- .../valuesets/ObjectRoleEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/ObjectType.java | 4 +- .../valuesets/ObjectTypeEnumFactory.java | 38 ++++ .../model/valuesets/ObservationCategory.java | 4 +- .../ObservationCategoryEnumFactory.java | 54 ++++++ .../model/valuesets/OperationOutcome.java | 4 +- .../OperationOutcomeEnumFactory.java | 36 +--- .../valuesets/OralProsthodonticMaterial.java | 4 +- .../OralProsthodonticMaterialEnumFactory.java | 38 ++++ .../model/valuesets/OrganizationType.java | 4 +- .../OrganizationTypeEnumFactory.java | 36 +--- .../valuesets/PatientContactRelationship.java | 4 +- ...PatientContactRelationshipEnumFactory.java | 36 +--- .../model/valuesets/PatientMpiMatch.java | 4 +- .../valuesets/PatientMpiMatchEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/Payeetype.java | 4 +- .../model/valuesets/PayeetypeEnumFactory.java | 34 ++++ .../valuesets/PaymentAdjustmentReason.java | 4 +- .../PaymentAdjustmentReasonEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/PaymentStatus.java | 4 +- .../valuesets/PaymentStatusEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/PaymentType.java | 4 +- .../valuesets/PaymentTypeEnumFactory.java | 34 ++++ .../model/valuesets/PractitionerRole.java | 4 +- .../PractitionerRoleEnumFactory.java | 46 +++++ .../valuesets/PractitionerSpecialty.java | 4 +- .../PractitionerSpecialtyEnumFactory.java | 42 +++++ .../ProcedureProgressStatusCodes.java | 4 +- ...ocedureProgressStatusCodesEnumFactory.java | 46 +++++ .../valuesets/ProcedureRelationshipType.java | 4 +- .../ProcedureRelationshipTypeEnumFactory.java | 30 +++ .../model/valuesets/ProcessOutcome.java | 4 +- .../valuesets/ProcessOutcomeEnumFactory.java | 34 ++++ .../model/valuesets/ProcessPriority.java | 4 +- .../valuesets/ProcessPriorityEnumFactory.java | 34 ++++ .../model/valuesets/ProvenanceAgentRole.java | 4 +- .../ProvenanceAgentRoleEnumFactory.java | 36 +--- .../model/valuesets/ProvenanceAgentType.java | 4 +- .../ProvenanceAgentTypeEnumFactory.java | 50 +++++ .../model/valuesets/QuestionMaxOccurs.java | 4 +- .../QuestionMaxOccursEnumFactory.java | 26 +++ .../QuestionnaireDisplayCategory.java | 4 +- ...estionnaireDisplayCategoryEnumFactory.java | 30 +++ .../valuesets/QuestionnaireItemControl.java | 4 +- .../QuestionnaireItemControlEnumFactory.java | 36 +--- .../valuesets/ReasonMedicationGivenCodes.java | 4 +- ...ReasonMedicationGivenCodesEnumFactory.java | 34 ++++ .../ReasonMedicationNotGivenCodes.java | 4 +- ...sonMedicationNotGivenCodesEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/Relationship.java | 4 +- .../valuesets/RelationshipEnumFactory.java | 42 +++++ .../valuesets/ResourceValidationMode.java | 4 +- .../ResourceValidationModeEnumFactory.java | 34 ++++ .../valuesets/RestfulSecurityService.java | 4 +- .../RestfulSecurityServiceEnumFactory.java | 46 +++++ .../model/valuesets/RiskProbability.java | 4 +- .../valuesets/RiskProbabilityEnumFactory.java | 42 +++++ .../fhir/dstu3}/model/valuesets/Ruleset.java | 4 +- .../model/valuesets/RulesetEnumFactory.java | 46 +++++ .../model/valuesets/ServicePharmacy.java | 4 +- .../valuesets/ServicePharmacyEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/ServicePlace.java | 4 +- .../valuesets/ServicePlaceEnumFactory.java | 30 +++ .../model/valuesets/ServiceProduct.java | 4 +- .../valuesets/ServiceProductEnumFactory.java | 30 +++ .../valuesets/ServiceProvisionConditions.java | 4 +- ...ServiceProvisionConditionsEnumFactory.java | 34 ++++ .../valuesets/ServiceReferralMethod.java | 4 +- .../ServiceReferralMethodEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/ServiceUscls.java | 4 +- .../valuesets/ServiceUsclsEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/SignatureType.java | 4 +- .../valuesets/SignatureTypeEnumFactory.java | 36 +--- .../model/valuesets/SubscriptionTag.java | 4 +- .../valuesets/SubscriptionTagEnumFactory.java | 30 +++ .../model/valuesets/SubstanceCategory.java | 4 +- .../SubstanceCategoryEnumFactory.java | 50 +++++ .../model/valuesets/SupplydeliveryType.java | 4 +- .../SupplydeliveryTypeEnumFactory.java | 30 +++ .../model/valuesets/SupplyrequestKind.java | 4 +- .../SupplyrequestKindEnumFactory.java | 30 +++ .../model/valuesets/SupplyrequestReason.java | 4 +- .../SupplyrequestReasonEnumFactory.java | 30 +++ .../fhir/dstu3}/model/valuesets/Surface.java | 4 +- .../model/valuesets/SurfaceEnumFactory.java | 66 +++++++ .../fhir/dstu3}/model/valuesets/Teeth.java | 4 +- .../model/valuesets/TeethEnumFactory.java | 36 +--- .../valuesets/TestscriptOperationCodes.java | 4 +- .../TestscriptOperationCodesEnumFactory.java | 36 +--- .../fhir/dstu3}/model/valuesets/Tooth.java | 4 +- .../model/valuesets/ToothEnumFactory.java | 36 +--- .../hl7/fhir/dstu3}/model/valuesets/Udi.java | 4 +- .../dstu3/model/valuesets/UdiEnumFactory.java | 26 +++ .../valuesets/V3AcknowledgementCondition.java | 4 +- ...V3AcknowledgementConditionEnumFactory.java | 38 ++++ .../V3AcknowledgementDetailCode.java | 4 +- ...3AcknowledgementDetailCodeEnumFactory.java | 36 +--- .../V3AcknowledgementDetailType.java | 4 +- ...3AcknowledgementDetailTypeEnumFactory.java | 46 +++++ .../valuesets/V3AcknowledgementType.java | 4 +- .../V3AcknowledgementTypeEnumFactory.java | 46 +++++ .../dstu3}/model/valuesets/V3ActClass.java | 4 +- .../valuesets/V3ActClassEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3ActCode.java | 4 +- .../model/valuesets/V3ActCodeEnumFactory.java | 36 +--- .../valuesets/V3ActExposureLevelCode.java | 4 +- .../V3ActExposureLevelCodeEnumFactory.java | 38 ++++ .../V3ActInvoiceElementModifier.java | 4 +- ...3ActInvoiceElementModifierEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/V3ActMood.java | 4 +- .../model/valuesets/V3ActMoodEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3ActPriority.java | 4 +- .../valuesets/V3ActPriorityEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3ActReason.java | 4 +- .../valuesets/V3ActReasonEnumFactory.java | 36 +--- .../V3ActRelationshipCheckpoint.java | 4 +- ...3ActRelationshipCheckpointEnumFactory.java | 42 +++++ .../valuesets/V3ActRelationshipJoin.java | 4 +- .../V3ActRelationshipJoinEnumFactory.java | 38 ++++ .../valuesets/V3ActRelationshipSplit.java | 4 +- .../V3ActRelationshipSplitEnumFactory.java | 38 ++++ .../valuesets/V3ActRelationshipSubset.java | 4 +- .../V3ActRelationshipSubsetEnumFactory.java | 36 +--- .../valuesets/V3ActRelationshipType.java | 4 +- .../V3ActRelationshipTypeEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3ActSite.java | 4 +- .../model/valuesets/V3ActSiteEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3ActStatus.java | 4 +- .../valuesets/V3ActStatusEnumFactory.java | 36 +--- .../model/valuesets/V3ActUSPrivacyLaw.java | 4 +- .../V3ActUSPrivacyLawEnumFactory.java | 50 +++++ .../model/valuesets/V3ActUncertainty.java | 4 +- .../V3ActUncertaintyEnumFactory.java | 30 +++ .../model/valuesets/V3AddressPartType.java | 4 +- .../V3AddressPartTypeEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3AddressUse.java | 4 +- .../valuesets/V3AddressUseEnumFactory.java | 36 +--- .../valuesets/V3AdministrativeGender.java | 4 +- .../V3AdministrativeGenderEnumFactory.java | 34 ++++ ...V3AmericanIndianAlaskaNativeLanguages.java | 4 +- ...ndianAlaskaNativeLanguagesEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3Calendar.java | 4 +- .../model/valuesets/V3CalendarCycle.java | 4 +- .../valuesets/V3CalendarCycleEnumFactory.java | 36 +--- .../valuesets/V3CalendarEnumFactory.java | 26 +++ .../model/valuesets/V3CalendarType.java | 4 +- .../valuesets/V3CalendarTypeEnumFactory.java | 26 +++ .../dstu3}/model/valuesets/V3Charset.java | 4 +- .../model/valuesets/V3CharsetEnumFactory.java | 36 +--- .../model/valuesets/V3CodingRationale.java | 4 +- .../V3CodingRationaleEnumFactory.java | 54 ++++++ .../V3CommunicationFunctionType.java | 4 +- ...3CommunicationFunctionTypeEnumFactory.java | 34 ++++ .../valuesets/V3CompressionAlgorithm.java | 4 +- .../V3CompressionAlgorithmEnumFactory.java | 46 +++++ .../model/valuesets/V3Confidentiality.java | 4 +- .../V3ConfidentialityEnumFactory.java | 36 +--- .../model/valuesets/V3ContainerCap.java | 4 +- .../valuesets/V3ContainerCapEnumFactory.java | 50 +++++ .../model/valuesets/V3ContainerSeparator.java | 4 +- .../V3ContainerSeparatorEnumFactory.java | 30 +++ .../valuesets/V3ContentProcessingMode.java | 4 +- .../V3ContentProcessingModeEnumFactory.java | 30 +++ .../model/valuesets/V3ContextControl.java | 4 +- .../V3ContextControlEnumFactory.java | 36 +--- .../model/valuesets/V3DataOperation.java | 4 +- .../valuesets/V3DataOperationEnumFactory.java | 36 +--- .../model/valuesets/V3DeviceAlertLevel.java | 4 +- .../V3DeviceAlertLevelEnumFactory.java | 38 ++++ .../model/valuesets/V3DocumentCompletion.java | 4 +- .../V3DocumentCompletionEnumFactory.java | 58 ++++++ .../model/valuesets/V3DocumentStorage.java | 4 +- .../V3DocumentStorageEnumFactory.java | 38 ++++ .../model/valuesets/V3EducationLevel.java | 4 +- .../V3EducationLevelEnumFactory.java | 58 ++++++ .../model/valuesets/V3EmployeeJobClass.java | 4 +- .../V3EmployeeJobClassEnumFactory.java | 30 +++ .../valuesets/V3EncounterAdmissionSource.java | 4 +- ...V3EncounterAdmissionSourceEnumFactory.java | 34 ++++ .../valuesets/V3EncounterSpecialCourtesy.java | 4 +- ...V3EncounterSpecialCourtesyEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/V3EntityClass.java | 4 +- .../valuesets/V3EntityClassEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3EntityCode.java | 4 +- .../valuesets/V3EntityCodeEnumFactory.java | 36 +--- .../model/valuesets/V3EntityDeterminer.java | 4 +- .../V3EntityDeterminerEnumFactory.java | 42 +++++ .../model/valuesets/V3EntityHandling.java | 4 +- .../V3EntityHandlingEnumFactory.java | 36 +--- .../valuesets/V3EntityNamePartQualifier.java | 4 +- .../V3EntityNamePartQualifierEnumFactory.java | 36 +--- .../V3EntityNamePartQualifierR2.java | 4 +- ...3EntityNamePartQualifierR2EnumFactory.java | 36 +--- .../model/valuesets/V3EntityNamePartType.java | 4 +- .../V3EntityNamePartTypeEnumFactory.java | 42 +++++ .../valuesets/V3EntityNamePartTypeR2.java | 4 +- .../V3EntityNamePartTypeR2EnumFactory.java | 38 ++++ .../model/valuesets/V3EntityNameUse.java | 4 +- .../valuesets/V3EntityNameUseEnumFactory.java | 36 +--- .../model/valuesets/V3EntityNameUseR2.java | 4 +- .../V3EntityNameUseR2EnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3EntityRisk.java | 4 +- .../valuesets/V3EntityRiskEnumFactory.java | 66 +++++++ .../model/valuesets/V3EntityStatus.java | 4 +- .../valuesets/V3EntityStatusEnumFactory.java | 42 +++++ .../valuesets/V3EquipmentAlertLevel.java | 4 +- .../V3EquipmentAlertLevelEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/V3Ethnicity.java | 4 +- .../valuesets/V3EthnicityEnumFactory.java | 36 +--- .../model/valuesets/V3ExposureMode.java | 4 +- .../valuesets/V3ExposureModeEnumFactory.java | 42 +++++ .../model/valuesets/V3GTSAbbreviation.java | 4 +- .../V3GTSAbbreviationEnumFactory.java | 36 +--- .../model/valuesets/V3GenderStatus.java | 4 +- .../valuesets/V3GenderStatusEnumFactory.java | 30 +++ .../model/valuesets/V3HL7UpdateMode.java | 4 +- .../valuesets/V3HL7UpdateModeEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3Hl7Realm.java | 4 +- .../valuesets/V3Hl7RealmEnumFactory.java | 36 +--- .../model/valuesets/V3Hl7V3Conformance.java | 4 +- .../V3Hl7V3ConformanceEnumFactory.java | 46 +++++ .../model/valuesets/V3HtmlLinkType.java | 4 +- .../valuesets/V3HtmlLinkTypeEnumFactory.java | 36 +--- .../valuesets/V3IdentifierReliability.java | 4 +- .../V3IdentifierReliabilityEnumFactory.java | 34 ++++ .../model/valuesets/V3IdentifierScope.java | 4 +- .../V3IdentifierScopeEnumFactory.java | 38 ++++ .../valuesets/V3IntegrityCheckAlgorithm.java | 4 +- .../V3IntegrityCheckAlgorithmEnumFactory.java | 30 +++ .../valuesets/V3LanguageAbilityMode.java | 4 +- .../V3LanguageAbilityModeEnumFactory.java | 46 +++++ .../V3LanguageAbilityProficiency.java | 4 +- ...LanguageAbilityProficiencyEnumFactory.java | 38 ++++ .../model/valuesets/V3LivingArrangement.java | 4 +- .../V3LivingArrangementEnumFactory.java | 36 +--- .../model/valuesets/V3LocalMarkupIgnore.java | 4 +- .../V3LocalMarkupIgnoreEnumFactory.java | 30 +++ .../valuesets/V3LocalRemoteControlState.java | 4 +- .../V3LocalRemoteControlStateEnumFactory.java | 30 +++ .../V3ManagedParticipationStatus.java | 4 +- ...ManagedParticipationStatusEnumFactory.java | 46 +++++ .../model/valuesets/V3MapRelationship.java | 4 +- .../V3MapRelationshipEnumFactory.java | 34 ++++ .../model/valuesets/V3MaritalStatus.java | 4 +- .../valuesets/V3MaritalStatusEnumFactory.java | 62 ++++++ .../valuesets/V3MessageWaitingPriority.java | 4 +- .../V3MessageWaitingPriorityEnumFactory.java | 34 ++++ .../model/valuesets/V3ModifyIndicator.java | 4 +- .../V3ModifyIndicatorEnumFactory.java | 30 +++ .../dstu3}/model/valuesets/V3NullFlavor.java | 4 +- .../valuesets/V3NullFlavorEnumFactory.java | 36 +--- .../V3ObservationInterpretation.java | 4 +- ...3ObservationInterpretationEnumFactory.java | 36 +--- .../model/valuesets/V3ObservationMethod.java | 4 +- .../V3ObservationMethodEnumFactory.java | 36 +--- .../model/valuesets/V3ObservationValue.java | 4 +- .../V3ObservationValueEnumFactory.java | 36 +--- .../model/valuesets/V3OrderableDrugForm.java | 4 +- .../V3OrderableDrugFormEnumFactory.java | 36 +--- .../valuesets/V3ParticipationFunction.java | 4 +- .../V3ParticipationFunctionEnumFactory.java | 36 +--- .../model/valuesets/V3ParticipationMode.java | 4 +- .../V3ParticipationModeEnumFactory.java | 36 +--- .../valuesets/V3ParticipationSignature.java | 4 +- .../V3ParticipationSignatureEnumFactory.java | 34 ++++ .../model/valuesets/V3ParticipationType.java | 4 +- .../V3ParticipationTypeEnumFactory.java | 36 +--- .../model/valuesets/V3PatientImportance.java | 4 +- .../V3PatientImportanceEnumFactory.java | 58 ++++++ .../model/valuesets/V3PaymentTerms.java | 4 +- .../valuesets/V3PaymentTermsEnumFactory.java | 38 ++++ .../valuesets/V3PersonDisabilityType.java | 4 +- .../V3PersonDisabilityTypeEnumFactory.java | 36 +--- .../V3ProbabilityDistributionType.java | 4 +- ...robabilityDistributionTypeEnumFactory.java | 36 +--- .../model/valuesets/V3ProcessingID.java | 4 +- .../valuesets/V3ProcessingIDEnumFactory.java | 34 ++++ .../model/valuesets/V3ProcessingMode.java | 4 +- .../V3ProcessingModeEnumFactory.java | 38 ++++ .../valuesets/V3QueryParameterValue.java | 4 +- .../V3QueryParameterValueEnumFactory.java | 36 +--- .../model/valuesets/V3QueryPriority.java | 4 +- .../valuesets/V3QueryPriorityEnumFactory.java | 30 +++ .../model/valuesets/V3QueryRequestLimit.java | 4 +- .../V3QueryRequestLimitEnumFactory.java | 30 +++ .../model/valuesets/V3QueryResponse.java | 4 +- .../valuesets/V3QueryResponseEnumFactory.java | 38 ++++ .../model/valuesets/V3QueryStatusCode.java | 4 +- .../V3QueryStatusCodeEnumFactory.java | 42 +++++ .../fhir/dstu3}/model/valuesets/V3Race.java | 4 +- .../model/valuesets/V3RaceEnumFactory.java | 36 +--- .../model/valuesets/V3RelationalOperator.java | 4 +- .../V3RelationalOperatorEnumFactory.java | 54 ++++++ .../valuesets/V3RelationshipConjunction.java | 4 +- .../V3RelationshipConjunctionEnumFactory.java | 34 ++++ .../valuesets/V3ReligiousAffiliation.java | 4 +- .../V3ReligiousAffiliationEnumFactory.java | 36 +--- .../model/valuesets/V3ResponseLevel.java | 4 +- .../valuesets/V3ResponseLevelEnumFactory.java | 50 +++++ .../model/valuesets/V3ResponseModality.java | 4 +- .../V3ResponseModalityEnumFactory.java | 34 ++++ .../model/valuesets/V3ResponseMode.java | 4 +- .../valuesets/V3ResponseModeEnumFactory.java | 34 ++++ .../dstu3}/model/valuesets/V3RoleClass.java | 4 +- .../valuesets/V3RoleClassEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3RoleCode.java | 4 +- .../valuesets/V3RoleCodeEnumFactory.java | 36 +--- .../model/valuesets/V3RoleLinkStatus.java | 4 +- .../V3RoleLinkStatusEnumFactory.java | 46 +++++ .../model/valuesets/V3RoleLinkType.java | 4 +- .../valuesets/V3RoleLinkTypeEnumFactory.java | 54 ++++++ .../dstu3}/model/valuesets/V3RoleStatus.java | 4 +- .../valuesets/V3RoleStatusEnumFactory.java | 50 +++++ .../valuesets/V3RouteOfAdministration.java | 4 +- .../V3RouteOfAdministrationEnumFactory.java | 36 +--- .../dstu3}/model/valuesets/V3Sequencing.java | 4 +- .../valuesets/V3SequencingEnumFactory.java | 34 ++++ .../dstu3}/model/valuesets/V3SetOperator.java | 4 +- .../valuesets/V3SetOperatorEnumFactory.java | 46 +++++ .../model/valuesets/V3SpecimenType.java | 4 +- .../valuesets/V3SpecimenTypeEnumFactory.java | 36 +--- .../V3SubstanceAdminSubstitution.java | 4 +- ...SubstanceAdminSubstitutionEnumFactory.java | 36 +--- .../valuesets/V3SubstitutionCondition.java | 4 +- .../V3SubstitutionConditionEnumFactory.java | 42 +++++ .../valuesets/V3TableCellHorizontalAlign.java | 4 +- ...V3TableCellHorizontalAlignEnumFactory.java | 42 +++++ .../model/valuesets/V3TableCellScope.java | 4 +- .../V3TableCellScopeEnumFactory.java | 38 ++++ .../valuesets/V3TableCellVerticalAlign.java | 4 +- .../V3TableCellVerticalAlignEnumFactory.java | 38 ++++ .../dstu3}/model/valuesets/V3TableFrame.java | 4 +- .../valuesets/V3TableFrameEnumFactory.java | 58 ++++++ .../dstu3}/model/valuesets/V3TableRules.java | 4 +- .../valuesets/V3TableRulesEnumFactory.java | 42 +++++ .../model/valuesets/V3TargetAwareness.java | 4 +- .../V3TargetAwarenessEnumFactory.java | 46 +++++ .../V3TelecommunicationCapabilities.java | 4 +- ...ecommunicationCapabilitiesEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/V3TimingEvent.java | 4 +- .../valuesets/V3TimingEventEnumFactory.java | 36 +--- .../V3TransmissionRelationshipTypeCode.java | 4 +- ...issionRelationshipTypeCodeEnumFactory.java | 26 +++ .../model/valuesets/V3TribalEntityUS.java | 4 +- .../V3TribalEntityUSEnumFactory.java | 36 +--- .../valuesets/V3VaccineManufacturer.java | 4 +- .../V3VaccineManufacturerEnumFactory.java | 36 +--- .../VaccinationProtocolDoseStatus.java | 4 +- ...cinationProtocolDoseStatusEnumFactory.java | 30 +++ .../VaccinationProtocolDoseStatusReason.java | 4 +- ...onProtocolDoseStatusReasonEnumFactory.java | 42 +++++ .../dstu3}/model/valuesets/VariantState.java | 4 +- .../valuesets/VariantStateEnumFactory.java | 34 ++++ .../dstu3}/model/valuesets/VisionProduct.java | 4 +- .../valuesets/VisionProductEnumFactory.java | 30 +++ .../model/valuesets/XdsRelationshipType.java | 4 +- .../XdsRelationshipTypeEnumFactory.java | 42 +++++ .../fhir/dstu3}/model/valuesets/holder.txt | 0 .../dstu3/terminologies/ValueSetChecker.java | 10 + .../terminologies/ValueSetCheckerSimple.java | 24 +-- .../terminologies/ValueSetExpander.java | 4 +- .../ValueSetExpanderFactory.java | 2 +- .../terminologies/ValueSetExpanderSimple.java | 38 ++-- .../fhir/dstu3}/utils/EOperationOutcome.java | 4 +- .../hl7/fhir/dstu3}/utils/FHIRPathEngine.java | 48 ++--- .../dstu3}/utils/INarrativeGenerator.java | 2 +- .../hl7/fhir/dstu3}/utils/IWorkerContext.java | 28 +-- .../fhir/dstu3}/utils/ToolingExtensions.java | 52 ++--- .../fhir/dstu3}/validation/BaseValidator.java | 8 +- .../validation/ExtensionLocatorService.java | 6 +- .../dstu3}/validation/IResourceValidator.java | 4 +- .../dstu3}/validation/InstanceValidator.java | 178 +++++++++--------- .../QuestionnaireResponseValidator.java | 54 +++--- .../validation/ValidationErrorHandler.java | 8 +- .../dstu3}/validation/ValidationMessage.java | 12 +- .../validation/XmlLocationAnnotator.java | 2 +- .../dstu3}/validation/XmlLocationData.java | 2 +- .../hl7/fhir/exceptions/FHIRException.java | 0 .../hl7/fhir/exceptions/FHIRFormatError.java | 0 .../java/org/hl7/fhir/utilities/CSFile.java | 0 .../CommaSeparatedStringBuilder.java | 0 .../org/hl7/fhir/utilities/FileNotifier.java | 0 .../org/hl7/fhir/utilities/Inflector.java | 0 .../org/hl7/fhir/utilities/MyURIResolver.java | 0 .../java/org/hl7/fhir/utilities/Table.java | 0 .../org/hl7/fhir/utilities/Utilities.java | 0 .../hl7/fhir/utilities/ZipURIResolver.java | 0 .../hl7/fhir/utilities/xhtml/NodeType.java | 0 .../fhir/utilities/xhtml/XhtmlComposer.java | 0 .../fhir/utilities/xhtml/XhtmlDocument.java | 0 .../hl7/fhir/utilities/xhtml/XhtmlNode.java | 0 .../hl7/fhir/utilities/xhtml/XhtmlParser.java | 0 .../hl7/fhir/utilities/xml/IXMLWriter.java | 0 .../org/hl7/fhir/utilities/xml/XMLUtil.java | 0 .../fhir/dstu3/model/fhirversion.properties | 151 +++++++++++++++ .../RuntimeResourceDefinitionDstu3Test.java | 8 +- .../fhir/model/BaseDateTimeTypeDstu3Test.java | 10 +- .../java/ca/uhn/fhir/model/DateTypeTest.java | 2 +- ...tThymeleafNarrativeGeneratorDstu3Test.java | 46 ++--- .../uhn/fhir/parser/CustomTypeDstu3Test.java | 12 +- .../uhn/fhir/parser/JsonParserDstu3Test.java | 72 +++---- .../fhir/parser/ReportObservationDstu3.java | 16 +- .../uhn/fhir/parser/RoundTripDstu3Test.java | 6 +- .../uhn/fhir/parser/XmlParserDstu3Test.java | 108 +++++------ ...RequestValidatingInterceptorDstu3Test.java | 14 +- ...esponseValidatingInterceptorDstu3Test.java | 14 +- .../server/ServerUsingOldTypesDstu3Test.java | 6 +- .../FhirInstanceValidatorDstu3Test.java | 42 ++--- ...estionnaireResponseValidatorDstu3Test.java | 40 ++-- ...ResponseValidatorIntegrationDstu3Test.java | 30 +-- .../rest/server/PatientResourceProvider.java | 8 +- .../ServerConformanceProviderDstu3Test.java | 35 ++-- .../src/test/resources/bundle_orion.xml | 0 .../src/test/resources/conformance.json.gz | Bin .../src/test/resources/logback-test.xml | 0 .../medicationstatement_invalidelement.xml | 0 .../src/test/resources/q_jon.json | 0 .../src/test/resources/qr_jon.xml | 4 +- ...tionnaire-sdc-profile-example-ussg-fht.xml | 0 .../src/test/resources/smart-conf.xml | 0 hapi-fhir-testpage-overlay/pom.xml | 5 + .../java/ca/uhn/fhir/to/BaseController.java | 20 +- .../main/java/ca/uhn/fhir/to/Controller.java | 22 +-- .../.gitignore | 0 .../pom.xml | 4 +- .../model/dstu3}/profile/account.profile.xml | 0 .../model/dstu3}/profile/address.profile.xml | 0 .../model/dstu3}/profile/age.profile.xml | 0 .../profile/allergyintolerance.profile.xml | 0 .../dstu3}/profile/annotation.profile.xml | 0 .../dstu3}/profile/appointment.profile.xml | 0 .../profile/appointmentresponse.profile.xml | 0 .../dstu3}/profile/attachment.profile.xml | 0 .../dstu3}/profile/auditevent.profile.xml | 0 .../profile/backboneelement.profile.xml | 0 .../model/dstu3}/profile/basic.profile.xml | 0 .../model/dstu3}/profile/binary.profile.xml | 0 .../model/dstu3}/profile/bodysite.profile.xml | 0 .../model/dstu3}/profile/boolean.profile.xml | 0 .../model/dstu3}/profile/bundle.profile.xml | 0 .../model/dstu3}/profile/careplan.profile.xml | 0 .../dstu3}/profile/cholesterol.profile.xml | 0 .../model/dstu3}/profile/claim.profile.xml | 0 .../dstu3}/profile/claimresponse.profile.xml | 0 .../profile/clinicaldocument.profile.xml | 0 .../profile/clinicalimpression.profile.xml | 0 .../model/dstu3}/profile/code.profile.xml | 0 .../profile/codeableconcept.profile.xml | 0 .../model/dstu3}/profile/coding.profile.xml | 0 .../dstu3}/profile/communication.profile.xml | 0 .../profile/communicationrequest.profile.xml | 0 .../dstu3}/profile/composition.profile.xml | 0 .../dstu3}/profile/conceptmap.profile.xml | 0 .../dstu3}/profile/condition.profile.xml | 0 .../dstu3}/profile/conformance.profile.xml | 0 .../profile/consentdirective.profile.xml | 0 .../dstu3}/profile/contactpoint.profile.xml | 0 .../model/dstu3}/profile/contract.profile.xml | 0 .../model/dstu3}/profile/count.profile.xml | 0 .../model/dstu3}/profile/coverage.profile.xml | 0 .../dstu3}/profile/dataelement.profile.xml | 0 .../model/dstu3}/profile/date.profile.xml | 0 .../model/dstu3}/profile/datetime.profile.xml | 0 .../model/dstu3}/profile/decimal.profile.xml | 0 .../profile/decisionsupportrule.profile.xml | 0 .../decisionsupportservicemodule.profile.xml | 0 .../dstu3}/profile/detectedissue.profile.xml | 0 .../model/dstu3}/profile/device.profile.xml | 0 .../profile/devicecomponent.profile.xml | 0 .../dstu3}/profile/devicemetric.profile.xml | 0 .../devicemetricobservation.profile.xml | 0 .../profile/deviceuserequest.profile.xml | 0 .../profile/deviceusestatement.profile.xml | 0 .../profile/diagnosticorder.profile.xml | 0 .../profile/diagnosticreport.profile.xml | 0 .../model/dstu3}/profile/distance.profile.xml | 0 .../profile/documentmanifest.profile.xml | 0 .../profile/documentreference.profile.xml | 0 .../dstu3}/profile/domainresource.profile.xml | 0 .../model/dstu3}/profile/duration.profile.xml | 0 .../model/dstu3}/profile/element.profile.xml | 0 .../profile/elementdefinition.profile.xml | 0 .../profile/eligibilityrequest.profile.xml | 0 .../profile/eligibilityresponse.profile.xml | 0 .../dstu3}/profile/encounter.profile.xml | 0 .../profile/enrollmentrequest.profile.xml | 0 .../profile/enrollmentresponse.profile.xml | 0 .../dstu3}/profile/episodeofcare.profile.xml | 0 .../profile/expansionprofile.profile.xml | 0 .../profile/explanationofbenefit.profile.xml | 0 .../dstu3}/profile/extension.profile.xml | 0 .../profile/familymemberhistory.profile.xml | 0 .../model/dstu3}/profile/flag.profile.xml | 0 .../model/dstu3}/profile/genetics.profile.xml | 0 .../model/dstu3}/profile/goal.profile.xml | 0 .../model/dstu3}/profile/group.profile.xml | 0 .../profile/guidancerequest.profile.xml | 0 .../profile/guidanceresponse.profile.xml | 0 .../dstu3}/profile/hdlcholesterol.profile.xml | 0 .../profile/healthcareservice.profile.xml | 0 .../dstu3}/profile/hlaresult.profile.xml | 0 .../dstu3}/profile/humanname.profile.xml | 0 .../model/dstu3}/profile/id.profile.xml | 0 .../dstu3}/profile/identifier.profile.xml | 0 .../imagingobjectselection.profile.xml | 0 .../dstu3}/profile/imagingstudy.profile.xml | 0 .../dstu3}/profile/immunization.profile.xml | 0 .../immunizationrecommendation.profile.xml | 0 .../profile/implementationguide.profile.xml | 0 .../model/dstu3}/profile/instant.profile.xml | 0 .../model/dstu3}/profile/integer.profile.xml | 0 .../dstu3}/profile/ldlcholesterol.profile.xml | 0 .../model/dstu3}/profile/library.profile.xml | 0 .../model/dstu3}/profile/linkage.profile.xml | 0 .../dstu3}/profile/lipidprofile.profile.xml | 0 .../model/dstu3}/profile/list.profile.xml | 0 .../model/dstu3}/profile/location.profile.xml | 0 .../model/dstu3}/profile/markdown.profile.xml | 0 .../model/dstu3}/profile/measure.profile.xml | 0 .../dstu3}/profile/measurereport.profile.xml | 0 .../model/dstu3}/profile/media.profile.xml | 0 .../dstu3}/profile/medication.profile.xml | 0 .../medicationadministration.profile.xml | 0 .../profile/medicationdispense.profile.xml | 0 .../profile/medicationorder.profile.xml | 0 .../profile/medicationstatement.profile.xml | 0 .../dstu3}/profile/messageheader.profile.xml | 0 .../model/dstu3}/profile/meta.profile.xml | 0 .../profile/moduledefinition.profile.xml | 0 .../dstu3}/profile/modulemetadata.profile.xml | 0 .../model/dstu3}/profile/money.profile.xml | 0 .../dstu3}/profile/namingsystem.profile.xml | 0 .../dstu3}/profile/narrative.profile.xml | 0 .../dstu3}/profile/nutritionorder.profile.xml | 0 .../dstu3}/profile/observation.profile.xml | 0 .../observationforgenetics.profile.xml | 0 .../model/dstu3}/profile/oid.profile.xml | 0 .../profile/operationdefinition.profile.xml | 0 .../profile/operationoutcome.profile.xml | 0 .../model/dstu3}/profile/order.profile.xml | 0 .../profile/orderforgenetics.profile.xml | 0 .../dstu3}/profile/orderresponse.profile.xml | 0 .../model/dstu3}/profile/orderset.profile.xml | 0 .../dstu3}/profile/organization.profile.xml | 0 .../dstu3}/profile/parameters.profile.xml | 0 .../model/dstu3}/profile/patient.profile.xml | 0 .../dstu3}/profile/paymentnotice.profile.xml | 0 .../profile/paymentreconciliation.profile.xml | 0 .../model/dstu3}/profile/period.profile.xml | 0 .../model/dstu3}/profile/person.profile.xml | 0 .../dstu3}/profile/positiveint.profile.xml | 0 .../dstu3}/profile/practitioner.profile.xml | 0 .../dstu3}/profile/procedure.profile.xml | 0 .../profile/procedurerequest.profile.xml | 0 .../dstu3}/profile/processrequest.profile.xml | 0 .../profile/processresponse.profile.xml | 0 .../dstu3}/profile/provenance.profile.xml | 0 .../model/dstu3}/profile/quantity.profile.xml | 0 .../dstu3}/profile/questionnaire.profile.xml | 0 .../profile/questionnaireresponse.profile.xml | 0 .../model/dstu3}/profile/range.profile.xml | 0 .../model/dstu3}/profile/ratio.profile.xml | 0 .../dstu3}/profile/reference.profile.xml | 0 .../profile/referralrequest.profile.xml | 0 .../dstu3}/profile/relatedperson.profile.xml | 0 .../profile/reportforgenetics.profile.xml | 0 .../model/dstu3}/profile/resource.profile.xml | 0 .../dstu3}/profile/riskassessment.profile.xml | 0 .../dstu3}/profile/sampleddata.profile.xml | 0 .../model/dstu3}/profile/schedule.profile.xml | 0 .../profile/searchparameter.profile.xml | 0 .../model/dstu3}/profile/sequence.profile.xml | 0 .../profile/shareablevalueset.profile.xml | 0 .../dstu3}/profile/signature.profile.xml | 0 .../dstu3}/profile/simplequantity.profile.xml | 0 .../model/dstu3}/profile/slot.profile.xml | 0 .../model/dstu3}/profile/specimen.profile.xml | 0 .../model/dstu3}/profile/string.profile.xml | 0 .../profile/structuredefinition.profile.xml | 0 .../dstu3}/profile/subscription.profile.xml | 0 .../dstu3}/profile/substance.profile.xml | 0 .../dstu3}/profile/supplydelivery.profile.xml | 0 .../dstu3}/profile/supplyrequest.profile.xml | 0 .../dstu3}/profile/testscript.profile.xml | 0 .../model/dstu3}/profile/time.profile.xml | 0 .../model/dstu3}/profile/timing.profile.xml | 0 .../dstu3}/profile/triglyceride.profile.xml | 0 .../dstu3}/profile/unsignedint.profile.xml | 0 .../model/dstu3}/profile/uri.profile.xml | 0 .../model/dstu3}/profile/uuid.profile.xml | 0 .../model/dstu3}/profile/valueset.profile.xml | 0 .../profile/visionprescription.profile.xml | 0 .../profile/xdsdocumentmanifest.profile.xml | 0 .../profile/xdsdocumentreference.profile.xml | 0 .../instance/model/dstu3}/schema/account.sch | 0 .../dstu3}/schema/allergyintolerance.sch | 0 .../model/dstu3}/schema/appointment.sch | 0 .../dstu3}/schema/appointmentresponse.sch | 0 .../model/dstu3}/schema/auditevent.sch | 0 .../instance/model/dstu3}/schema/basic.sch | 0 .../instance/model/dstu3}/schema/binary.sch | 0 .../instance/model/dstu3}/schema/bodysite.sch | 0 .../instance/model/dstu3}/schema/bundle.sch | 0 .../instance/model/dstu3}/schema/careplan.sch | 0 .../model/dstu3}/schema/cholesterol.sch | 0 .../instance/model/dstu3}/schema/claim.sch | 0 .../model/dstu3}/schema/claimresponse.sch | 0 .../model/dstu3}/schema/clinicaldocument.sch | 0 .../dstu3}/schema/clinicalimpression.sch | 0 .../model/dstu3}/schema/communication.sch | 0 .../dstu3}/schema/communicationrequest.sch | 0 .../model/dstu3}/schema/composition.sch | 0 .../model/dstu3}/schema/conceptmap.sch | 0 .../model/dstu3}/schema/condition.sch | 0 .../model/dstu3}/schema/conformance.sch | 0 .../model/dstu3}/schema/consentdirective.sch | 0 .../instance/model/dstu3}/schema/contract.sch | 0 .../instance/model/dstu3}/schema/coverage.sch | 0 .../model/dstu3}/schema/dataelement.sch | 0 .../dstu3}/schema/decisionsupportrule.sch | 0 .../schema/decisionsupportservicemodule.sch | 0 .../model/dstu3}/schema/detectedissue.sch | 0 .../instance/model/dstu3}/schema/device.sch | 0 .../model/dstu3}/schema/devicecomponent.sch | 0 .../model/dstu3}/schema/devicemetric.sch | 0 .../dstu3}/schema/devicemetricobservation.sch | 0 .../model/dstu3}/schema/deviceuserequest.sch | 0 .../dstu3}/schema/deviceusestatement.sch | 0 .../model/dstu3}/schema/diagnosticorder.sch | 0 .../model/dstu3}/schema/diagnosticreport.sch | 0 .../model/dstu3}/schema/documentmanifest.sch | 0 .../model/dstu3}/schema/documentreference.sch | 0 .../dstu3}/schema/eligibilityrequest.sch | 0 .../dstu3}/schema/eligibilityresponse.sch | 0 .../model/dstu3}/schema/encounter.sch | 0 .../model/dstu3}/schema/enrollmentrequest.sch | 0 .../dstu3}/schema/enrollmentresponse.sch | 0 .../model/dstu3}/schema/episodeofcare.sch | 0 .../model/dstu3}/schema/expansionprofile.sch | 0 .../dstu3}/schema/explanationofbenefit.sch | 0 .../dstu3}/schema/familymemberhistory.sch | 0 .../model/dstu3}/schema/fhir-single.xsd | 0 .../model/dstu3}/schema/fhir-xhtml.xsd | 0 .../instance/model/dstu3}/schema/flag.sch | 0 .../instance/model/dstu3}/schema/genetics.sch | 0 .../instance/model/dstu3}/schema/goal.sch | 0 .../instance/model/dstu3}/schema/group.sch | 0 .../model/dstu3}/schema/guidancerequest.sch | 0 .../model/dstu3}/schema/guidanceresponse.sch | 0 .../model/dstu3}/schema/hdlcholesterol.sch | 0 .../model/dstu3}/schema/healthcareservice.sch | 0 .../model/dstu3}/schema/hlaresult.sch | 0 .../dstu3}/schema/imagingobjectselection.sch | 0 .../model/dstu3}/schema/imagingstudy.sch | 0 .../model/dstu3}/schema/immunization.sch | 0 .../schema/immunizationrecommendation.sch | 0 .../dstu3}/schema/implementationguide.sch | 0 .../model/dstu3}/schema/ldlcholesterol.sch | 0 .../instance/model/dstu3}/schema/library.sch | 0 .../instance/model/dstu3}/schema/linkage.sch | 0 .../model/dstu3}/schema/lipidprofile.sch | 0 .../instance/model/dstu3}/schema/list.sch | 0 .../instance/model/dstu3}/schema/location.sch | 0 .../instance/model/dstu3}/schema/measure.sch | 0 .../model/dstu3}/schema/measurereport.sch | 0 .../instance/model/dstu3}/schema/media.sch | 0 .../model/dstu3}/schema/medication.sch | 0 .../schema/medicationadministration.sch | 0 .../dstu3}/schema/medicationdispense.sch | 0 .../model/dstu3}/schema/medicationorder.sch | 0 .../dstu3}/schema/medicationstatement.sch | 0 .../model/dstu3}/schema/messageheader.sch | 0 .../model/dstu3}/schema/moduledefinition.sch | 0 .../model/dstu3}/schema/modulemetadata.sch | 0 .../model/dstu3}/schema/namingsystem.sch | 0 .../model/dstu3}/schema/nutritionorder.sch | 0 .../model/dstu3}/schema/observation.sch | 0 .../dstu3}/schema/observationforgenetics.sch | 0 .../dstu3}/schema/operationdefinition.sch | 0 .../model/dstu3}/schema/operationoutcome.sch | 0 .../instance/model/dstu3}/schema/order.sch | 0 .../model/dstu3}/schema/orderforgenetics.sch | 0 .../model/dstu3}/schema/orderresponse.sch | 0 .../instance/model/dstu3}/schema/orderset.sch | 0 .../model/dstu3}/schema/organization.sch | 0 .../instance/model/dstu3}/schema/patient.sch | 0 .../model/dstu3}/schema/paymentnotice.sch | 0 .../dstu3}/schema/paymentreconciliation.sch | 0 .../instance/model/dstu3}/schema/person.sch | 0 .../model/dstu3}/schema/practitioner.sch | 0 .../model/dstu3}/schema/procedure.sch | 0 .../model/dstu3}/schema/procedurerequest.sch | 0 .../model/dstu3}/schema/processrequest.sch | 0 .../model/dstu3}/schema/processresponse.sch | 0 .../model/dstu3}/schema/provenance.sch | 0 .../model/dstu3}/schema/questionnaire.sch | 0 .../dstu3}/schema/questionnaireresponse.sch | 0 .../model/dstu3}/schema/referralrequest.sch | 0 .../model/dstu3}/schema/relatedperson.sch | 0 .../model/dstu3}/schema/reportforgenetics.sch | 0 .../model/dstu3}/schema/riskassessment.sch | 0 .../instance/model/dstu3}/schema/schedule.sch | 0 .../model/dstu3}/schema/searchparameter.sch | 0 .../instance/model/dstu3}/schema/sequence.sch | 0 .../model/dstu3}/schema/shareablevalueset.sch | 0 .../instance/model/dstu3}/schema/slot.sch | 0 .../instance/model/dstu3}/schema/specimen.sch | 0 .../dstu3}/schema/structuredefinition.sch | 0 .../model/dstu3}/schema/subscription.sch | 0 .../model/dstu3}/schema/substance.sch | 0 .../model/dstu3}/schema/supplydelivery.sch | 0 .../model/dstu3}/schema/supplyrequest.sch | 0 .../model/dstu3}/schema/testscript.sch | 0 .../model/dstu3}/schema/triglyceride.sch | 0 .../instance/model/dstu3}/schema/valueset.sch | 0 .../dstu3}/schema/visionprescription.sch | 0 .../dstu3}/schema/xdsdocumentmanifest.sch | 0 .../dstu3}/schema/xdsdocumentreference.sch | 0 .../fhir/instance/model/dstu3}/schema/xml.xsd | 0 .../model/dstu3}/valueset/v2-tables.xml | 0 .../model/dstu3}/valueset/v3-codesystems.xml | 0 .../model/dstu3}/valueset/valuesets.xml | 0 hapi-tinder-plugin/.classpath | 1 - hapi-tinder-plugin/pom.xml | 4 +- .../{dstu21 => dstu3}/composite/AgeDt.java | 4 +- .../composite/BoundCodeableConceptDt.java | 6 +- .../composite/CodeableConceptDt.java | 2 +- .../{dstu21 => dstu3}/composite/CodingDt.java | 2 +- .../composite/ContainedDt.java | 2 +- .../{dstu21 => dstu3}/composite/CountDt.java | 4 +- .../composite/DistanceDt.java | 4 +- .../composite/DurationDt.java | 4 +- .../{dstu21 => dstu3}/composite/MoneyDt.java | 4 +- .../composite/NarrativeDt.java | 2 +- .../composite/QuantityDt.java | 2 +- .../composite/ResourceReferenceDt.java | 2 +- .../composite/SimpleQuantityDt.java | 2 +- .../fhir/tinder/TinderJpaRestServerMojo.java | 9 +- .../ca/uhn/fhir/tinder/ValueSetGenerator.java | 4 +- .../VersionPropertyFileGeneratorMojo.java | 4 +- .../tinder/parser/BaseStructureParser.java | 23 ++- .../{dstu21 => dstu3}/activitydefinition.xml | 0 .../dt/{dstu21 => dstu3}/address.xml | 0 .../dt/{dstu21 => dstu3}/annotation.xml | 0 .../dt/{dstu21 => dstu3}/attachment.xml | 0 .../dt/{dstu21 => dstu3}/backboneelement.xml | 0 .../dt/{dstu21 => dstu3}/codeableconcept.xml | 0 .../resources/dt/{dstu21 => dstu3}/coding.xml | 0 .../dt/{dstu21 => dstu3}/contactpoint.xml | 0 .../dt/{dstu21 => dstu3}/element.xml | 0 .../{dstu21 => dstu3}/elementdefinition.xml | 0 .../dt/{dstu21 => dstu3}/extension.xml | 0 .../dt/{dstu21 => dstu3}/humanname.xml | 0 .../dt/{dstu21 => dstu3}/identifier.xml | 0 .../resources/dt/{dstu21 => dstu3}/meta.xml | 0 .../dt/{dstu21 => dstu3}/narrative.xml | 0 .../resources/dt/{dstu21 => dstu3}/period.xml | 0 .../dt/{dstu21 => dstu3}/primitives.xml | 0 .../dt/{dstu21 => dstu3}/quantity.xml | 0 .../resources/dt/{dstu21 => dstu3}/range.xml | 0 .../resources/dt/{dstu21 => dstu3}/ratio.xml | 0 .../dt/{dstu21 => dstu3}/reference.xml | 0 .../dt/{dstu21 => dstu3}/sampleddata.xml | 0 .../dt/{dstu21 => dstu3}/signature.xml | 0 .../resources/dt/{dstu21 => dstu3}/timing.xml | 0 .../{dstu21 => dstu3}/account-spreadsheet.xml | 0 .../allergyintolerance-spreadsheet.xml | 0 .../appointment-spreadsheet.xml | 0 .../appointmentresponse-spreadsheet.xml | 0 .../auditevent-spreadsheet.xml | 0 .../{dstu21 => dstu3}/basic-spreadsheet.xml | 0 .../{dstu21 => dstu3}/binary-spreadsheet.xml | 0 .../bodysite-spreadsheet.xml | 0 .../{dstu21 => dstu3}/bundle-spreadsheet.xml | 0 .../careplan-spreadsheet.xml | 0 .../{dstu21 => dstu3}/claim-spreadsheet.xml | 0 .../claimresponse-spreadsheet.xml | 0 .../clinicalimpression-spreadsheet.xml | 0 .../codesystem-spreadsheet.xml | 0 .../communication-spreadsheet.xml | 0 .../communicationrequest-spreadsheet.xml | 0 .../composition-spreadsheet.xml | 0 .../conceptmap-spreadsheet.xml | 0 .../condition-spreadsheet.xml | 0 .../conformance-spreadsheet.xml | 0 .../contract-spreadsheet.xml | 0 .../coverage-spreadsheet.xml | 0 .../dataelement-spreadsheet.xml | 0 .../decisionsupportrule-spreadsheet.xml | 0 ...cisionsupportservicemodule-spreadsheet.xml | 0 .../detectedissue-spreadsheet.xml | 0 .../{dstu21 => dstu3}/device-spreadsheet.xml | 0 .../devicecomponent-spreadsheet.xml | 0 .../devicemetric-spreadsheet.xml | 0 .../deviceuserequest-spreadsheet.xml | 0 .../deviceusestatement-spreadsheet.xml | 0 .../diagnosticorder-spreadsheet.xml | 0 .../diagnosticreport-spreadsheet.xml | 0 .../documentation-spreadsheet.xml | 0 .../documentmanifest-spreadsheet.xml | 0 .../documentreference-spreadsheet.xml | 0 .../domainresource-spreadsheet.xml | 0 .../eligibilityrequest-spreadsheet.xml | 0 .../eligibilityresponse-spreadsheet.xml | 0 .../encounter-spreadsheet.xml | 0 .../enrollmentrequest-spreadsheet.xml | 0 .../enrollmentresponse-spreadsheet.xml | 0 .../episodeofcare-spreadsheet.xml | 0 .../expansionprofile-spreadsheet.xml | 0 .../explanationofbenefit-spreadsheet.xml | 0 .../familymemberhistory-spreadsheet.xml | 0 .../{dstu21 => dstu3}/flag-spreadsheet.xml | 0 .../{dstu21 => dstu3}/goal-spreadsheet.xml | 0 .../{dstu21 => dstu3}/group-spreadsheet.xml | 0 .../guidancerequest-spreadsheet.xml | 0 .../guidanceresponse-spreadsheet.xml | 0 .../healthcareservice-spreadsheet.xml | 0 .../imagingobjectselection-spreadsheet.xml | 0 .../imagingstudy-spreadsheet.xml | 0 .../immunization-spreadsheet.xml | 0 ...immunizationrecommendation-spreadsheet.xml | 0 .../implementationguide-spreadsheet.xml | 0 .../{dstu21 => dstu3}/library-spreadsheet.xml | 0 .../{dstu21 => dstu3}/linkage-spreadsheet.xml | 0 .../{dstu21 => dstu3}/list-spreadsheet.xml | 0 .../location-spreadsheet.xml | 0 .../{dstu21 => dstu3}/measure-spreadsheet.xml | 0 .../{dstu21 => dstu3}/media-spreadsheet.xml | 0 .../medication-spreadsheet.xml | 0 .../medicationadministration-spreadsheet.xml | 0 .../medicationdispense-spreadsheet.xml | 0 .../medicationorder-spreadsheet.xml | 0 .../medicationstatement-spreadsheet.xml | 0 .../messageheader-spreadsheet.xml | 0 .../moduledefinition-spreadsheet.xml | 0 .../modulemetadata-spreadsheet.xml | 0 .../namingsystem-spreadsheet.xml | 0 .../nutritionorder-spreadsheet.xml | 0 .../observation-spreadsheet.xml | 0 .../operationdefinition-spreadsheet.xml | 0 .../operationoutcome-spreadsheet.xml | 0 .../{dstu21 => dstu3}/order-spreadsheet.xml | 0 .../orderresponse-spreadsheet.xml | 0 .../orderset-spreadsheet.xml | 0 .../organization-spreadsheet.xml | 0 .../parameters-spreadsheet.xml | 0 .../{dstu21 => dstu3}/patient-spreadsheet.xml | 0 .../paymentnotice-spreadsheet.xml | 0 .../paymentreconciliation-spreadsheet.xml | 0 .../{dstu21 => dstu3}/person-spreadsheet.xml | 0 .../practitioner-spreadsheet.xml | 0 .../procedure-spreadsheet.xml | 0 .../procedurerequest-spreadsheet.xml | 0 .../processrequest-spreadsheet.xml | 0 .../processresponse-spreadsheet.xml | 0 .../protocol-spreadsheet.xml | 0 .../provenance-spreadsheet.xml | 0 .../questionnaire-spreadsheet.xml | 0 .../questionnaireresponse-spreadsheet.xml | 0 .../referralrequest-spreadsheet.xml | 0 .../relatedperson-spreadsheet.xml | 0 .../remittance-spreadsheet.xml | 0 .../resource-spreadsheet.xml | 0 .../riskassessment-spreadsheet.xml | 0 .../schedule-spreadsheet.xml | 0 .../searchparameter-spreadsheet.xml | 0 .../sequence-spreadsheet.xml | 0 .../{dstu21 => dstu3}/slot-spreadsheet.xml | 0 .../specimen-spreadsheet.xml | 0 .../structuredefinition-spreadsheet.xml | 0 .../subscription-spreadsheet.xml | 0 .../substance-spreadsheet.xml | 0 .../supplydelivery-spreadsheet.xml | 0 .../supplyrequest-spreadsheet.xml | 0 .../supportingdocumentation-spreadsheet.xml | 0 .../template-spreadsheet.xml | 0 .../{dstu21 => dstu3}/test-spreadsheet.xml | 0 .../testscript-spreadsheet.xml | 0 .../{dstu21 => dstu3}/user-spreadsheet.xml | 0 .../valueset-spreadsheet.xml | 0 .../visionprescription-spreadsheet.xml | 0 .../resources/vm/jpa_resource_provider.vm | 4 +- .../resources/vm/jpa_spring_beans_java.vm | 8 +- pom.xml | 4 +- src/changes/changes.xml | 2 +- src/site/xdoc/doc_dstu2.xml | 8 +- 1476 files changed, 9607 insertions(+), 17292 deletions(-) rename hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/{LoadingValidationSupportDstu21.java => LoadingValidationSupportDstu3.java} (78%) rename hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/{FhirServerConfigDstu21.java => FhirServerConfigDstu3.java} (94%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/{BaseDstu21Config.java => dstu3/BaseDstu3Config.java} (50%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/{WebsocketDstu21Config.java => dstu3/WebsocketDstu3Config.java} (91%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoBundleDstu21.java => dstu3/FhirResourceDaoBundleDstu3.java} (83%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoDstu21.java => dstu3/FhirResourceDaoDstu3.java} (90%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoEncounterDstu21.java => dstu3/FhirResourceDaoEncounterDstu3.java} (88%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoPatientDstu21.java => dstu3/FhirResourceDaoPatientDstu3.java} (91%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoQuestionnaireResponseDstu21.java => dstu3/FhirResourceDaoQuestionnaireResponseDstu3.java} (88%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoSearchParameterDstu21.java => dstu3/FhirResourceDaoSearchParameterDstu3.java} (80%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoSubscriptionDstu21.java => dstu3/FhirResourceDaoSubscriptionDstu3.java} (96%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirResourceDaoValueSetDstu21.java => dstu3/FhirResourceDaoValueSetDstu3.java} (91%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{FhirSystemDaoDstu21.java => dstu3/FhirSystemDaoDstu3.java} (97%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{IJpaValidationSupportDstu21.java => dstu3/IJpaValidationSupportDstu3.java} (79%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{JpaValidationSupportDstu21.java => dstu3/JpaValidationSupportDstu3.java} (78%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/{SearchParamExtractorDstu21.java => dstu3/SearchParamExtractorDstu3.java} (94%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{BaseJpaResourceProviderEncounterDstu21.java => dstu3/BaseJpaResourceProviderEncounterDstu3.java} (92%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{BaseJpaResourceProviderPatientDstu21.java => dstu3/BaseJpaResourceProviderPatientDstu3.java} (94%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{BaseJpaResourceProviderQuestionnaireResponseDstu21.java => dstu3/BaseJpaResourceProviderQuestionnaireResponseDstu3.java} (76%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{BaseJpaResourceProviderValueSetDstu21.java => dstu3/BaseJpaResourceProviderValueSetDstu3.java} (92%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{JpaConformanceProviderDstu21.java => dstu3/JpaConformanceProviderDstu3.java} (79%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{JpaResourceProviderDstu21.java => dstu3/JpaResourceProviderDstu3.java} (93%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/{JpaSystemProviderDstu21.java => dstu3/JpaSystemProviderDstu3.java} (95%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/{SubscriptionWebsocketHandlerDstu21.java => SubscriptionWebsocketHandlerDstu3.java} (95%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/{SubscriptionWebsocketHandlerFactoryDstu21.java => SubscriptionWebsocketHandlerFactoryDstu3.java} (83%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/{SubscriptionsRequireManualActivationInterceptorDstu21.java => SubscriptionsRequireManualActivationInterceptorDstu3.java} (92%) rename hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/{JpaValidationSupportChainDstu21.java => JpaValidationSupportChainDstu3.java} (54%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/{TestDstu21Config.java => TestDstu3Config.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/BaseJpaDstu21SystemTest.java => dstu3/BaseJpaDstu3SystemTest.java} (88%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/BaseJpaDstu21Test.java => dstu3/BaseJpaDstu3Test.java} (78%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21InterceptorTest.java => dstu3/FhirResourceDaoDstu3InterceptorTest.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21SearchFtTest.java => dstu3/FhirResourceDaoDstu3SearchFtTest.java} (97%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21SearchNoFtTest.java => dstu3/FhirResourceDaoDstu3SearchNoFtTest.java} (98%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21SubscriptionTest.java => dstu3/FhirResourceDaoDstu3SubscriptionTest.java} (97%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21Test.java => dstu3/FhirResourceDaoDstu3Test.java} (98%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21UpdateTest.java => dstu3/FhirResourceDaoDstu3UpdateTest.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoDstu21ValidateTest.java => dstu3/FhirResourceDaoDstu3ValidateTest.java} (91%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirResourceDaoValueSetDstu21Test.java => dstu3/FhirResourceDaoValueSetDstu3Test.java} (94%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirSearchDaoDstu21Test.java => dstu3/FhirSearchDaoDstu3Test.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirSystemDaoDstu21SearchTest.java => dstu3/FhirSystemDaoDstu3SearchTest.java} (95%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/{dstu21/FhirSystemDaoDstu21Test.java => dstu3/FhirSystemDaoDstu3Test.java} (98%) delete mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/BaseResourceProviderDstu21Test.java => dstu3/BaseResourceProviderDstu3Test.java} (85%) create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/ResourceProviderDstu21Test.java => dstu3/ResourceProviderDstu3Test.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/ResourceProviderDstu21ValueSetTest.java => dstu3/ResourceProviderDstu3ValueSetTest.java} (96%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/ResourceProviderQuestionnaireResponseDstu21Test.java => dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java} (84%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/SubscriptionsDstu21Test.java => dstu3/SubscriptionsDstu3Test.java} (95%) rename hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/{dstu21/SystemProviderDstu21Test.java => dstu3/SystemProviderDstu3Test.java} (90%) rename hapi-fhir-jpaserver-base/src/test/resources/{bundle-dstu21.xml => bundle-dstu3.xml} (100%) rename hapi-fhir-jpaserver-base/src/test/resources/{questionnaire_dstu21.xml => questionnaire_dstu3.xml} (100%) rename hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/{FhirServerConfigDstu21.java => FhirServerConfigDstu3.java} (94%) rename hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/{TestDstu21Config.java => TestDstu3Config.java} (92%) delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdditionalmaterialsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationErrorEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreedsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpeciesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetworkEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTermEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnitEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientationEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimExceptionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiersEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContextEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinicalEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionStateEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectationEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorroleEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceActionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDietEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangementsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditiveEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditionsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FormsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FundsreserveEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/InterventionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020AnswerlistEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194AnswerlistEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345AnswerlistEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378AnswerlistEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlagEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrderEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounterEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransportEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterialEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatchEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PayeetypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRoleEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialtyEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcomeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccursEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RelationshipEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityServiceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbabilityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RulesetEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacyEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlaceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProductEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditionsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethodEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTagEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategoryEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKindEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SurfaceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/UdiEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementConditionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCodeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoinEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplitEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLawEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertaintyEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGenderEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationaleEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithmEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCapEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparatorEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevelEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorageEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevelEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClassEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminerEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRiskEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevelEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3ConformanceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliabilityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScopeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlStateEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationshipEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicatorEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignatureEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportanceEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTermsEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingIDEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriorityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimitEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponseEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCodeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperatorEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunctionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevelEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModalityEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SequencingEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperatorEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionConditionEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScopeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlignEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrameEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRulesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwarenessEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantStateEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProductEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipTypeEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetChecker.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu21/model/fhirversion.properties create mode 100644 hapi-fhir-structures-dstu3/.gitignore rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/differences.txt (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/pom.xml (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/DefinitionException.java (84%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/FHIRException.java (86%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/FHIRFormatError.java (85%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/PathEngineException.java (84%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/TerminologyServiceException.java (86%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/exceptions/UcumException.java (83%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/formats/FormatUtilities.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/formats/IParser.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/formats/ParserType.java (86%) rename hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java (73%) rename hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/rest/server/ServerConformanceProvider.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/rest/server/ServerProfileProvider.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/BaseValidatorBridge.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/DefaultProfileValidationSupport.java (88%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/FhirInstanceValidator.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/FhirQuestionnaireResponseValidator.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/HapiWorkerContext.java (84%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/IValidationSupport.java (90%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/hapi/validation/ValidationSupportChain.java (91%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Account.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Address.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Age.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/AllergyIntolerance.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Annotation.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Appointment.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/AppointmentResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Attachment.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/AuditEvent.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BackboneElement.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Base.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Base64BinaryType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseBinary.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseDateTimeType.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseExtension.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseNarrative.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseReference.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BaseResource.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Basic.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Binary.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BodySite.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/BooleanType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Bundle.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/CarePlan.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Claim.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ClaimResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ClinicalImpression.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/CodeSystem.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/CodeType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/CodeableConcept.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Coding.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Communication.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/CommunicationRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Comparison.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Composition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ConceptMap.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Condition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Configuration.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Conformance.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Constants.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ContactPoint.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Contract.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Count.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Coverage.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DataElement.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DateTimeType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DateType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DecimalType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DecisionSupportRule.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DecisionSupportServiceModule.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DetectedIssue.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Device.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DeviceComponent.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DeviceMetric.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DeviceUseRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DeviceUseStatement.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DiagnosticOrder.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DiagnosticReport.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Distance.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DocumentManifest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DocumentReference.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/DomainResource.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Duration.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Element.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ElementDefinition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EligibilityRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EligibilityResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Encounter.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EnrollmentRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EnrollmentResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EnumFactory.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Enumeration.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Enumerations.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/EpisodeOfCare.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ExpansionProfile.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ExplanationOfBenefit.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ExpressionNode.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Extension.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ExtensionHelper.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Factory.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/FamilyMemberHistory.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Flag.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Goal.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Group.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/GuidanceResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/HealthcareService.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/HumanName.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/IdType.java (99%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Identifier.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ImagingObjectSelection.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ImagingStudy.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Immunization.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ImmunizationRecommendation.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ImplementationGuide.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/InstantType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/IntegerType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Library.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Linkage.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ListResource.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Location.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MarkdownType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Measure.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Media.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Medication.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MedicationAdministration.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MedicationDispense.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MedicationOrder.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MedicationStatement.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/MessageHeader.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Meta.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ModuleDefinition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ModuleMetadata.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Money.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/NamingSystem.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Narrative.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/NutritionOrder.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Observation.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/OidType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/OperationDefinition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/OperationOutcome.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Order.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/OrderResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/OrderSet.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Organization.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Parameters.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Patient.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/PaymentNotice.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/PaymentReconciliation.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Period.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Person.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/PositiveIntType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Practitioner.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/PrimitiveType.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Procedure.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ProcedureRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ProcessRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ProcessResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Property.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Protocol.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Provenance.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Quantity.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Questionnaire.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/QuestionnaireResponse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Range.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Ratio.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Reference.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ReferralRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/RelatedPerson.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Resource.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ResourceFactory.java (84%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ResourceType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/RiskAssessment.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SampledData.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Schedule.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SearchParameter.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Sequence.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SidType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Signature.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SimpleQuantity.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Slot.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Specimen.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/StringType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/StructureDefinition.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Subscription.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Substance.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SupplyDelivery.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/SupplyRequest.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/TemporalPrecisionEnum.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/TestScript.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/TimeType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Timing.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/Type.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/UnsignedIntType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/UriType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/UuidType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/ValueSet.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/VisionPrescription.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Additionalmaterials.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdditionalmaterialsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Adjudication.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AdjudicationError.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationErrorEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AdjudicationReason.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AnimalBreeds.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreedsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AnimalGenderstatus.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AnimalSpecies.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpeciesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AnzscoOccupations.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AnzscoOccupationsEnumFactory.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/AuditSourceType.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BasicResourceType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BasicResourceTypeEnumFactory.java (61%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitCategory.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitNetwork.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetworkEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitSubcategory.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitSubcategoryEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitTerm.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTermEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitType.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/BenefitUnit.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnitEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/CarePlanActivityCategory.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ChoiceListOrientation.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientationEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ClaimException.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimExceptionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ClaimModifiers.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiersEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ClassificationOrContext.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContextEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ConditionCategory.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ConditionClinical.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinicalEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ConditionState.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionStateEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ConformanceExpectation.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectationEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContactentityType.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractAction.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractActorrole.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorroleEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractSignerType.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractSignerTypeEnumFactory.java (69%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractSubtype.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractTermSubtype.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractTermType.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ContractType.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/DeviceAction.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceActionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterAdmitSource.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterAdmitSourceEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterDiet.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDietEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterDischargeDisposition.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterDischargeDispositionEnumFactory.java (52%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterPriority.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterSpecialArrangements.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangementsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EncounterType.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/EntformulaAdditive.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditiveEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/FlagCategory.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/FlagPriority.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/FmConditions.java (88%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditionsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Forms.java (88%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FormsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Fundsreserve.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FundsreserveEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/GoalAcceptanceStatus.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/GoalCategory.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/GoalPriority.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/GoalRelationshipType.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/GoalStatusReason.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ImmunizationRecommendationDateCriterion.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ImmunizationRecommendationStatus.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Intervention.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/InterventionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LOINC480020Answerlist.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020AnswerlistEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LOINC480194Answerlist.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194AnswerlistEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LOINC530345Answerlist.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345AnswerlistEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LOINC530378Answerlist.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378AnswerlistEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ListEmptyReason.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ListExampleCodes.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ListExampleCodesEnumFactory.java (50%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ListItemFlag.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlagEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ListOrder.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrderEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LocationPhysicalType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/LocationPhysicalTypeEnumFactory.java (53%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/MessageReasonEncounter.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounterEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/MessageTransport.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransportEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/MissingToothReason.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObjectLifecycle.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObjectLifecycleEnumFactory.java (55%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObjectRole.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObjectRoleEnumFactory.java (62%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObjectType.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ObservationCategory.java (97%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/OperationOutcome.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/OperationOutcomeEnumFactory.java (82%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/OralProsthodonticMaterial.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterialEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/OrganizationType.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/OrganizationTypeEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PatientContactRelationship.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PatientContactRelationshipEnumFactory.java (56%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PatientMpiMatch.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatchEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Payeetype.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PayeetypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PaymentAdjustmentReason.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PaymentStatus.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PaymentType.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PractitionerRole.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRoleEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/PractitionerSpecialty.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialtyEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProcedureProgressStatusCodes.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProcedureRelationshipType.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProcessOutcome.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcomeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProcessPriority.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProvenanceAgentRole.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProvenanceAgentRoleEnumFactory.java (53%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ProvenanceAgentType.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/QuestionMaxOccurs.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccursEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/QuestionnaireDisplayCategory.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/QuestionnaireItemControl.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/QuestionnaireItemControlEnumFactory.java (68%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ReasonMedicationGivenCodes.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ReasonMedicationNotGivenCodes.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Relationship.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RelationshipEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ResourceValidationMode.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/RestfulSecurityService.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityServiceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/RiskProbability.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbabilityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Ruleset.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RulesetEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServicePharmacy.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacyEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServicePlace.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlaceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServiceProduct.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProductEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServiceProvisionConditions.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditionsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServiceReferralMethod.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethodEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServiceUscls.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ServiceUsclsEnumFactory.java (61%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SignatureType.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SignatureTypeEnumFactory.java (69%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SubscriptionTag.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTagEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SubstanceCategory.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategoryEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SupplydeliveryType.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SupplyrequestKind.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKindEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/SupplyrequestReason.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Surface.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SurfaceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Teeth.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/TeethEnumFactory.java (66%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/TestscriptOperationCodes.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/TestscriptOperationCodesEnumFactory.java (70%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Tooth.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/ToothEnumFactory.java (70%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/Udi.java (88%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/UdiEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AcknowledgementCondition.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementConditionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AcknowledgementDetailCode.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java (73%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AcknowledgementDetailType.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AcknowledgementType.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActClass.java (99%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActClassEnumFactory.java (87%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActCode.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActCodeEnumFactory.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActExposureLevelCode.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCodeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActInvoiceElementModifier.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActMood.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActMoodEnumFactory.java (68%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActPriority.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActPriorityEnumFactory.java (55%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActReason.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActReasonEnumFactory.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipCheckpoint.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipJoin.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoinEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipSplit.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplitEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipSubset.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipSubsetEnumFactory.java (61%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipType.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActRelationshipTypeEnumFactory.java (90%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActSite.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActSiteEnumFactory.java (77%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActStatus.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActStatusEnumFactory.java (50%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActUSPrivacyLaw.java (98%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLawEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ActUncertainty.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertaintyEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AddressPartType.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AddressPartTypeEnumFactory.java (70%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AddressUse.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AddressUseEnumFactory.java (61%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AdministrativeGender.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGenderEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Calendar.java (90%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CalendarCycle.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CalendarCycleEnumFactory.java (60%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CalendarType.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Charset.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CharsetEnumFactory.java (50%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CodingRationale.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationaleEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CommunicationFunctionType.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3CompressionAlgorithm.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithmEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Confidentiality.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ConfidentialityEnumFactory.java (64%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ContainerCap.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCapEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ContainerSeparator.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparatorEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ContentProcessingMode.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ContextControl.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ContextControlEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3DataOperation.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3DataOperationEnumFactory.java (64%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3DeviceAlertLevel.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevelEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3DocumentCompletion.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3DocumentStorage.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorageEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EducationLevel.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevelEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EmployeeJobClass.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClassEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EncounterAdmissionSource.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EncounterSpecialCourtesy.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityClass.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityClassEnumFactory.java (67%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityCode.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityCodeEnumFactory.java (89%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityDeterminer.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminerEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityHandling.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityHandlingEnumFactory.java (60%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartQualifier.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartQualifierEnumFactory.java (74%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartQualifierR2.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java (71%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartType.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNamePartTypeR2.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNameUse.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNameUseEnumFactory.java (57%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNameUseR2.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityNameUseR2EnumFactory.java (61%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityRisk.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRiskEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EntityStatus.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EquipmentAlertLevel.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevelEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Ethnicity.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3EthnicityEnumFactory.java (75%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ExposureMode.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3GTSAbbreviation.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3GTSAbbreviationEnumFactory.java (73%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3GenderStatus.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3HL7UpdateMode.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3HL7UpdateModeEnumFactory.java (57%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Hl7Realm.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Hl7RealmEnumFactory.java (74%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Hl7V3Conformance.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3ConformanceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3HtmlLinkType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3HtmlLinkTypeEnumFactory.java (58%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3IdentifierReliability.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliabilityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3IdentifierScope.java (97%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScopeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3IntegrityCheckAlgorithm.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LanguageAbilityMode.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LanguageAbilityProficiency.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LivingArrangement.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LivingArrangementEnumFactory.java (53%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LocalMarkupIgnore.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3LocalRemoteControlState.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlStateEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ManagedParticipationStatus.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3MapRelationship.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationshipEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3MaritalStatus.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3MessageWaitingPriority.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ModifyIndicator.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicatorEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3NullFlavor.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3NullFlavorEnumFactory.java (57%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationInterpretation.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationInterpretationEnumFactory.java (82%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationMethod.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationMethodEnumFactory.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationValue.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ObservationValueEnumFactory.java (92%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3OrderableDrugForm.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3OrderableDrugFormEnumFactory.java (90%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationFunction.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationFunctionEnumFactory.java (81%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationMode.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationModeEnumFactory.java (60%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationSignature.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignatureEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationType.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ParticipationTypeEnumFactory.java (81%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3PatientImportance.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportanceEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3PaymentTerms.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTermsEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3PersonDisabilityType.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3PersonDisabilityTypeEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ProbabilityDistributionType.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ProcessingID.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingIDEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ProcessingMode.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryParameterValue.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryParameterValueEnumFactory.java (62%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryPriority.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriorityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryRequestLimit.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimitEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryResponse.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponseEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3QueryStatusCode.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCodeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Race.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RaceEnumFactory.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RelationalOperator.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperatorEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RelationshipConjunction.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunctionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ReligiousAffiliation.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ReligiousAffiliationEnumFactory.java (85%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ResponseLevel.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevelEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ResponseModality.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModalityEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3ResponseMode.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleClass.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleClassEnumFactory.java (86%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleCode.java (98%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleCodeEnumFactory.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleLinkStatus.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleLinkType.java (96%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RoleStatus.java (95%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RouteOfAdministration.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3RouteOfAdministrationEnumFactory.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3Sequencing.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SequencingEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SetOperator.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperatorEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SpecimenType.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SpecimenTypeEnumFactory.java (87%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SubstanceAdminSubstitution.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java (54%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3SubstitutionCondition.java (94%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionConditionEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TableCellHorizontalAlign.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TableCellScope.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScopeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TableCellVerticalAlign.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlignEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TableFrame.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrameEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TableRules.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRulesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TargetAwareness.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwarenessEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TelecommunicationCapabilities.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TimingEvent.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TimingEventEnumFactory.java (58%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TransmissionRelationshipTypeCode.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TribalEntityUS.java (97%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3TribalEntityUSEnumFactory.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3VaccineManufacturer.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/V3VaccineManufacturerEnumFactory.java (75%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/VaccinationProtocolDoseStatus.java (90%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/VaccinationProtocolDoseStatusReason.java (92%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/VariantState.java (91%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantStateEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/VisionProduct.java (89%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProductEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/XdsRelationshipType.java (93%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipTypeEnumFactory.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/model/valuesets/holder.txt (100%) create mode 100644 hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetChecker.java rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/terminologies/ValueSetCheckerSimple.java (83%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/terminologies/ValueSetExpander.java (91%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/terminologies/ValueSetExpanderFactory.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/terminologies/ValueSetExpanderSimple.java (89%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/utils/EOperationOutcome.java (75%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/utils/FHIRPathEngine.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/utils/INarrativeGenerator.java (51%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/utils/IWorkerContext.java (88%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/utils/ToolingExtensions.java (91%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/BaseValidator.java (96%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/ExtensionLocatorService.java (88%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/IResourceValidator.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/InstanceValidator.java (94%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/QuestionnaireResponseValidator.java (91%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/ValidationErrorHandler.java (89%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/ValidationMessage.java (93%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/XmlLocationAnnotator.java (95%) rename {hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3}/validation/XmlLocationData.java (92%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/exceptions/FHIRException.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/CSFile.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/FileNotifier.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/Inflector.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/Table.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/Utilities.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java (100%) create mode 100644 hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu3Test.java (67%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu3Test.java (92%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/java/ca/uhn/fhir/model/DateTypeTest.java (97%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu3Test.java (90%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu3Test.java (96%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java (95%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu3.java (86%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/RoundTripDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/RoundTripDstu3Test.java (95%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java (96%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu3Test.java (97%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu3Test.java (96%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu3Test.java (94%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java (93%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu3Test.java (92%) rename hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu3Test.java (90%) rename {hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21 => hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3}/hapi/rest/server/PatientResourceProvider.java (97%) rename hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProviderDstu21Test.java => hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProviderDstu3Test.java (96%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/bundle_orion.xml (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/conformance.json.gz (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/logback-test.xml (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/medicationstatement_invalidelement.xml (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/q_jon.json (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/qr_jon.xml (99%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml (100%) rename {hapi-fhir-structures-dstu2.1 => hapi-fhir-structures-dstu3}/src/test/resources/smart-conf.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1 => hapi-fhir-validation-resources-dstu3}/.gitignore (100%) rename {hapi-fhir-validation-resources-dstu2.1 => hapi-fhir-validation-resources-dstu3}/pom.xml (84%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/account.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/address.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/age.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/allergyintolerance.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/annotation.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/appointment.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/appointmentresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/attachment.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/auditevent.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/backboneelement.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/basic.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/binary.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/bodysite.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/boolean.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/bundle.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/careplan.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/cholesterol.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/claim.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/claimresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/clinicaldocument.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/clinicalimpression.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/code.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/codeableconcept.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/coding.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/communication.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/communicationrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/composition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/conceptmap.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/condition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/conformance.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/consentdirective.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/contactpoint.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/contract.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/count.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/coverage.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/dataelement.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/date.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/datetime.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/decimal.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/decisionsupportrule.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/decisionsupportservicemodule.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/detectedissue.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/device.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/devicecomponent.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/devicemetric.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/devicemetricobservation.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/deviceuserequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/deviceusestatement.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/diagnosticorder.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/diagnosticreport.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/distance.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/documentmanifest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/documentreference.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/domainresource.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/duration.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/element.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/elementdefinition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/eligibilityrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/eligibilityresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/encounter.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/enrollmentrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/enrollmentresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/episodeofcare.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/expansionprofile.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/explanationofbenefit.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/extension.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/familymemberhistory.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/flag.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/genetics.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/goal.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/group.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/guidancerequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/guidanceresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/hdlcholesterol.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/healthcareservice.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/hlaresult.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/humanname.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/id.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/identifier.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/imagingobjectselection.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/imagingstudy.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/immunization.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/immunizationrecommendation.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/implementationguide.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/instant.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/integer.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/ldlcholesterol.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/library.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/linkage.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/lipidprofile.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/list.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/location.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/markdown.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/measure.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/measurereport.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/media.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/medication.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/medicationadministration.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/medicationdispense.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/medicationorder.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/medicationstatement.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/messageheader.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/meta.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/moduledefinition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/modulemetadata.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/money.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/namingsystem.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/narrative.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/nutritionorder.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/observation.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/observationforgenetics.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/oid.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/operationdefinition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/operationoutcome.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/order.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/orderforgenetics.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/orderresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/orderset.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/organization.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/parameters.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/patient.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/paymentnotice.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/paymentreconciliation.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/period.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/person.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/positiveint.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/practitioner.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/procedure.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/procedurerequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/processrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/processresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/provenance.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/quantity.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/questionnaire.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/questionnaireresponse.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/range.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/ratio.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/reference.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/referralrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/relatedperson.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/reportforgenetics.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/resource.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/riskassessment.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/sampleddata.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/schedule.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/searchparameter.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/sequence.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/shareablevalueset.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/signature.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/simplequantity.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/slot.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/specimen.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/string.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/structuredefinition.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/subscription.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/substance.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/supplydelivery.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/supplyrequest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/testscript.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/time.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/timing.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/triglyceride.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/unsignedint.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/uri.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/uuid.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/valueset.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/visionprescription.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/xdsdocumentmanifest.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/profile/xdsdocumentreference.profile.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/account.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/allergyintolerance.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/appointment.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/appointmentresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/auditevent.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/basic.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/binary.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/bodysite.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/bundle.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/careplan.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/cholesterol.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/claim.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/claimresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/clinicaldocument.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/clinicalimpression.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/communication.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/communicationrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/composition.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/conceptmap.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/condition.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/conformance.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/consentdirective.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/contract.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/coverage.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/dataelement.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/decisionsupportrule.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/decisionsupportservicemodule.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/detectedissue.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/device.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/devicecomponent.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/devicemetric.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/devicemetricobservation.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/deviceuserequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/deviceusestatement.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/diagnosticorder.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/diagnosticreport.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/documentmanifest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/documentreference.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/eligibilityrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/eligibilityresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/encounter.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/enrollmentrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/enrollmentresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/episodeofcare.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/expansionprofile.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/explanationofbenefit.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/familymemberhistory.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/fhir-single.xsd (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/fhir-xhtml.xsd (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/flag.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/genetics.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/goal.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/group.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/guidancerequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/guidanceresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/hdlcholesterol.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/healthcareservice.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/hlaresult.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/imagingobjectselection.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/imagingstudy.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/immunization.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/immunizationrecommendation.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/implementationguide.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/ldlcholesterol.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/library.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/linkage.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/lipidprofile.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/list.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/location.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/measure.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/measurereport.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/media.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/medication.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/medicationadministration.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/medicationdispense.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/medicationorder.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/medicationstatement.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/messageheader.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/moduledefinition.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/modulemetadata.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/namingsystem.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/nutritionorder.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/observation.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/observationforgenetics.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/operationdefinition.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/operationoutcome.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/order.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/orderforgenetics.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/orderresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/orderset.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/organization.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/patient.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/paymentnotice.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/paymentreconciliation.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/person.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/practitioner.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/procedure.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/procedurerequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/processrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/processresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/provenance.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/questionnaire.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/questionnaireresponse.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/referralrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/relatedperson.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/reportforgenetics.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/riskassessment.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/schedule.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/searchparameter.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/sequence.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/shareablevalueset.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/slot.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/specimen.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/structuredefinition.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/subscription.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/substance.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/supplydelivery.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/supplyrequest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/testscript.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/triglyceride.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/valueset.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/visionprescription.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/xdsdocumentmanifest.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/xdsdocumentreference.sch (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/schema/xml.xsd (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/valueset/v2-tables.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/valueset/v3-codesystems.xml (100%) rename {hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21 => hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3}/valueset/valuesets.xml (100%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/AgeDt.java (89%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/BoundCodeableConceptDt.java (96%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/CodeableConceptDt.java (99%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/CodingDt.java (99%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/ContainedDt.java (97%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/CountDt.java (89%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/DistanceDt.java (89%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/DurationDt.java (89%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/MoneyDt.java (89%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/NarrativeDt.java (98%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/QuantityDt.java (99%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/ResourceReferenceDt.java (99%) rename hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/{dstu21 => dstu3}/composite/SimpleQuantityDt.java (98%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/activitydefinition.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/address.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/annotation.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/attachment.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/backboneelement.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/codeableconcept.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/coding.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/contactpoint.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/element.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/elementdefinition.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/extension.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/humanname.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/identifier.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/meta.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/narrative.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/period.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/primitives.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/quantity.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/range.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/ratio.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/reference.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/sampleddata.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/signature.xml (100%) rename hapi-tinder-plugin/src/main/resources/dt/{dstu21 => dstu3}/timing.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/account-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/allergyintolerance-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/appointment-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/appointmentresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/auditevent-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/basic-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/binary-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/bodysite-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/bundle-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/careplan-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/claim-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/claimresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/clinicalimpression-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/codesystem-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/communication-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/communicationrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/composition-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/conceptmap-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/condition-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/conformance-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/contract-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/coverage-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/dataelement-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/decisionsupportrule-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/decisionsupportservicemodule-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/detectedissue-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/device-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/devicecomponent-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/devicemetric-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/deviceuserequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/deviceusestatement-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/diagnosticorder-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/diagnosticreport-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/documentation-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/documentmanifest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/documentreference-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/domainresource-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/eligibilityrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/eligibilityresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/encounter-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/enrollmentrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/enrollmentresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/episodeofcare-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/expansionprofile-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/explanationofbenefit-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/familymemberhistory-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/flag-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/goal-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/group-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/guidancerequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/guidanceresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/healthcareservice-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/imagingobjectselection-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/imagingstudy-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/immunization-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/immunizationrecommendation-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/implementationguide-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/library-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/linkage-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/list-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/location-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/measure-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/media-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/medication-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/medicationadministration-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/medicationdispense-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/medicationorder-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/medicationstatement-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/messageheader-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/moduledefinition-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/modulemetadata-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/namingsystem-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/nutritionorder-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/observation-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/operationdefinition-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/operationoutcome-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/order-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/orderresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/orderset-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/organization-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/parameters-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/patient-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/paymentnotice-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/paymentreconciliation-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/person-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/practitioner-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/procedure-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/procedurerequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/processrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/processresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/protocol-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/provenance-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/questionnaire-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/questionnaireresponse-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/referralrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/relatedperson-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/remittance-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/resource-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/riskassessment-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/schedule-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/searchparameter-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/sequence-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/slot-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/specimen-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/structuredefinition-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/subscription-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/substance-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/supplydelivery-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/supplyrequest-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/supportingdocumentation-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/template-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/test-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/testscript-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/user-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/valueset-spreadsheet.xml (100%) rename hapi-tinder-plugin/src/main/resources/res/{dstu21 => dstu3}/visionprescription-spreadsheet.xml (100%) diff --git a/examples/pom.xml b/examples/pom.xml index 099969d3072..e7c346e034a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -27,7 +27,7 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT diff --git a/examples/src/main/java/example/FhirContextIntro.java b/examples/src/main/java/example/FhirContextIntro.java index 310b9bdc140..dc4fe8a9e11 100644 --- a/examples/src/main/java/example/FhirContextIntro.java +++ b/examples/src/main/java/example/FhirContextIntro.java @@ -26,11 +26,11 @@ FhirContext ctxDstu2 = FhirContext.forDstu2(); @SuppressWarnings("unused") public static void creatingContextHl7org() { // START SNIPPET: creatingContextHl7org -// Create a context for DSTU2.1 -FhirContext ctx = FhirContext.forDstu2_1(); +// Create a context for DSTU3 +FhirContext ctx = FhirContext.forDstu3(); // Working with RI structures is similar to how it works with the HAPI structures -org.hl7.fhir.dstu21.model.Patient patient = new org.hl7.fhir.dstu21.model.Patient(); +org.hl7.fhir.dstu3.model.Patient patient = new org.hl7.fhir.dstu3.model.Patient(); patient.addName().addGiven("John").addFamily("Smith"); patient.getBirthDateElement().setValueAsString("1998-02-22"); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java index 858327e44d8..c4e6e832531 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java @@ -508,12 +508,12 @@ public class FhirContext { } /** - * Creates and returns a new FhirContext with version {@link FhirVersionEnum#DSTU2_1 DSTU 2.1} + * Creates and returns a new FhirContext with version {@link FhirVersionEnum#DSTU3 DSTU 3} * * @since 1.4 */ - public static FhirContext forDstu2_1() { - return new FhirContext(FhirVersionEnum.DSTU2_1); + public static FhirContext forDstu3() { + return new FhirContext(FhirVersionEnum.DSTU3); } public static FhirContext forDstu2Hl7Org() { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java index 3cf9787d06e..8c86d53c51c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java @@ -38,7 +38,7 @@ public enum FhirVersionEnum { DSTU2("ca.uhn.fhir.model.dstu2.FhirDstu2", null, false), - DSTU2_1("org.hl7.fhir.dstu21.hapi.ctx.FhirDstu21", null, true), + DSTU3("org.hl7.fhir.dstu3.hapi.ctx.FhirDstu3", null, true), DSTU2_HL7ORG("org.hl7.fhir.instance.FhirDstu2Hl7Org", DSTU2, true); diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml index 7139770d8b0..5dec6fe18ab 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml @@ -55,7 +55,7 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT @@ -70,7 +70,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/BaseCommand.java b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/BaseCommand.java index d5d1f7fe207..28bff9a7840 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/BaseCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/BaseCommand.java @@ -54,11 +54,12 @@ public abstract class BaseCommand implements Comparable { protected FhirContext getSpecVersionContext(CommandLine theCommandLine) throws ParseException { if (myFhirCtx == null) { String specVersion = theCommandLine.getOptionValue("f", SPEC_DEFAULT_VERSION); + specVersion = specVersion.toLowerCase(); FhirVersionEnum version; if ("dstu2".equals(specVersion)) { version = FhirVersionEnum.DSTU2; - } else if ("dstu2.1".equals(specVersion)) { - version = FhirVersionEnum.DSTU2_1; + } else if ("dstu3".equals(specVersion)) { + version = FhirVersionEnum.DSTU3; } else { throw new ParseException("Unknown spec version: " + specVersion); } diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java index 51d77022311..8410cc6965b 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java +++ b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java @@ -108,7 +108,7 @@ public class ExampleDataUploader extends BaseCommand { case DSTU2: specUrl = "http://hl7.org/fhir/dstu2/examples-json.zip"; break; - case DSTU2_1: + case DSTU3: specUrl = "http://hl7-fhir.github.io/examples-json.zip"; break; default: diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu21.java b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java similarity index 78% rename from hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu21.java rename to hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java index 07109930b51..a4a5465f180 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu21.java +++ b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java @@ -1,9 +1,9 @@ package ca.uhn.fhir.cli; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.FhirContext; @@ -11,11 +11,11 @@ import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.client.ServerValidationModeEnum; import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; -public class LoadingValidationSupportDstu21 implements IValidationSupport { +public class LoadingValidationSupportDstu3 implements IValidationSupport { - private static FhirContext myCtx = FhirContext.forDstu2_1(); + private static FhirContext myCtx = FhirContext.forDstu3(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(LoadingValidationSupportDstu21.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(LoadingValidationSupportDstu3.class); @Override public ValueSetExpansionComponent expandValueSet(FhirContext theContext, ConceptSetComponent theInclude) { diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java index 9bed6f5f878..c3da85baec9 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/RunServerCommand.java @@ -6,7 +6,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.EventListener; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -16,7 +15,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.IOUtils; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.webapp.WebAppContext; import org.springframework.web.context.ContextLoader; import org.springframework.web.context.ContextLoaderListener; @@ -24,7 +22,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon import ca.uhn.fhir.jpa.demo.ContextHolder; import ca.uhn.fhir.jpa.demo.FhirServerConfig; -import ca.uhn.fhir.jpa.demo.FhirServerConfigDstu21; +import ca.uhn.fhir.jpa.demo.FhirServerConfigDstu3; public class RunServerCommand extends BaseCommand { @@ -95,8 +93,8 @@ public class RunServerCommand extends BaseCommand { case DSTU2: theSce.getServletContext().setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, FhirServerConfig.class.getName()); break; - case DSTU2_1: - theSce.getServletContext().setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, FhirServerConfigDstu21.class.getName()); + case DSTU3: + theSce.getServletContext().setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, FhirServerConfigDstu3.class.getName()); break; } cll.contextInitialized(theSce); diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java index 5a5cbe99557..3c57254e569 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java +++ b/hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ValidateCommand.java @@ -20,10 +20,10 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.text.WordUtils; import org.fusesource.jansi.Ansi.Color; -import org.hl7.fhir.dstu21.hapi.validation.DefaultProfileValidationSupport; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.hapi.validation.ValidationSupportChain; -import org.hl7.fhir.dstu21.model.StructureDefinition; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.hapi.validation.ValidationSupportChain; +import org.hl7.fhir.dstu3.model.StructureDefinition; import org.hl7.fhir.instance.model.api.IBaseResource; import com.phloc.commons.io.file.FileUtils; @@ -127,7 +127,7 @@ public class ValidateCommand extends BaseCommand { instanceValidator.setValidationSupport(validationSupport); break; } - case DSTU2_1: { + case DSTU3: { FhirInstanceValidator instanceValidator = new FhirInstanceValidator(); val.registerValidatorModule(instanceValidator); ValidationSupportChain validationSupport = new ValidationSupportChain(new DefaultProfileValidationSupport()); @@ -135,7 +135,7 @@ public class ValidateCommand extends BaseCommand { instanceValidator.setStructureDefintion((StructureDefinition) localProfileResource); } if (theCommandLine.hasOption("r")) { - validationSupport.addValidationSupport(new LoadingValidationSupportDstu21()); + validationSupport.addValidationSupport(new LoadingValidationSupportDstu3()); } instanceValidator.setValidationSupport(validationSupport); break; diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java index d9613f68f1a..c07ae37f57b 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/ContextHolder.java @@ -20,8 +20,8 @@ public class ContextHolder { case DSTU2: ourPath = "/baseDstu2/"; break; - case DSTU2_1: - ourPath = "/baseDstu2.1/"; + case DSTU3: + ourPath = "/baseDstu3/"; break; default: throw new ParseException("FHIR version not supported by this command: " + ContextHolder.getCtx().getVersion().getVersion()); diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java similarity index 94% rename from hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java rename to hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java index 0ba42d8f4cf..cc3fb3679b1 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java @@ -15,23 +15,23 @@ import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.annotation.EnableTransactionManagement; -import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu21; +import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3; import ca.uhn.fhir.jpa.dao.DaoConfig; -import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu21; +import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu3; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; /** * This class isn't used by default by the example, but - * you can use it as a config if you want to support DSTU2.1 + * you can use it as a config if you want to support DSTU3 * instead of DSTU2 in your server. * * See https://github.com/jamesagnew/hapi-fhir/issues/278 */ @Configuration @EnableTransactionManagement() -public class FhirServerConfigDstu21 extends BaseJavaConfigDstu21 { +public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 { /** * Configure FHIR properties around the the JPA server via this bean @@ -115,7 +115,7 @@ public class FhirServerConfigDstu21 extends BaseJavaConfigDstu21 { @Bean(autowire = Autowire.BY_TYPE) public IServerInterceptor subscriptionSecurityInterceptor() { - SubscriptionsRequireManualActivationInterceptorDstu21 retVal = new SubscriptionsRequireManualActivationInterceptorDstu21(); + SubscriptionsRequireManualActivationInterceptorDstu3 retVal = new SubscriptionsRequireManualActivationInterceptorDstu3(); return retVal; } diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java index 149fdb88bf9..d13c143a3a6 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java @@ -5,7 +5,7 @@ import java.util.List; import javax.servlet.ServletException; -import org.hl7.fhir.dstu21.model.Meta; +import org.hl7.fhir.dstu3.model.Meta; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; @@ -15,10 +15,10 @@ import ca.uhn.fhir.jpa.dao.DaoConfig; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21; +import ca.uhn.fhir.jpa.provider.dstu3.JpaConformanceProviderDstu3; +import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu2.composite.MetaDt; import ca.uhn.fhir.model.dstu2.resource.Bundle; @@ -60,8 +60,8 @@ public class JpaServerDemo extends RestfulServer { case DSTU2: resourceProviderBeanName = "myResourceProvidersDstu2"; break; - case DSTU2_1: - resourceProviderBeanName = "myResourceProvidersDstu21"; + case DSTU3: + resourceProviderBeanName = "myResourceProvidersDstu3"; break; default: throw new IllegalStateException(); @@ -79,8 +79,8 @@ public class JpaServerDemo extends RestfulServer { systemProvider = myAppCtx.getBean("mySystemProviderDstu1", JpaSystemProviderDstu1.class); } else if (fhirVersion == FhirVersionEnum.DSTU2) { systemProvider = myAppCtx.getBean("mySystemProviderDstu2", JpaSystemProviderDstu2.class); - } else if (fhirVersion == FhirVersionEnum.DSTU2_1) { - systemProvider = myAppCtx.getBean("mySystemProviderDstu21", JpaSystemProviderDstu21.class); + } else if (fhirVersion == FhirVersionEnum.DSTU3) { + systemProvider = myAppCtx.getBean("mySystemProviderDstu3", JpaSystemProviderDstu3.class); } else { throw new IllegalStateException(); } @@ -103,10 +103,10 @@ public class JpaServerDemo extends RestfulServer { myAppCtx.getBean(DaoConfig.class)); confProvider.setImplementationDescription("Example Server"); setServerConformanceProvider(confProvider); - } else if (fhirVersion == FhirVersionEnum.DSTU2_1) { - IFhirSystemDao systemDao = myAppCtx - .getBean("mySystemDaoDstu21", IFhirSystemDao.class); - JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(this, systemDao, + } else if (fhirVersion == FhirVersionEnum.DSTU3) { + IFhirSystemDao systemDao = myAppCtx + .getBean("mySystemDaoDstu3", IFhirSystemDao.class); + JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(this, systemDao, myAppCtx.getBean(DaoConfig.class)); confProvider.setImplementationDescription("Example Server"); setServerConformanceProvider(confProvider); diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml index ab550900651..fbfcb66d5c2 100644 --- a/hapi-fhir-cobertura/pom.xml +++ b/hapi-fhir-cobertura/pom.xml @@ -33,7 +33,7 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT @@ -48,7 +48,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT @@ -284,7 +284,7 @@ ../hapi-fhir-structures-dstu/src/test/java ../hapi-fhir-structures-dstu2/src/test/java ../hapi-fhir-structures-hl7org-dstu2/src/test/java - ../hapi-fhir-structures-dstu2.1/src/test/java + ../hapi-fhir-structures-dstu3/src/test/java ../hapi-fhir-jpaserver-base/src/test/java @@ -354,7 +354,7 @@ ../hapi-fhir-structures-hl7org-dstu2/src/test/resources - ../hapi-fhir-structures-dstu2.1/src/test/resources + ../hapi-fhir-structures-dstu3/src/test/resources diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 7272091c875..de0fbee1174 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -50,7 +50,7 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT @@ -65,7 +65,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT @@ -373,15 +373,15 @@ - build_dstu21 + build_dstu3 generate-jparest-server - dstu21 + dstu3 ca.uhn.fhir.jpa.config - ca.uhn.fhir.jpa.rp.dstu21 - hapi-fhir-server-resourceproviders-dstu21.xml + ca.uhn.fhir.jpa.rp.dstu3 + hapi-fhir-server-resourceproviders-dstu3.xml @@ -402,12 +402,12 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java index 1bf236fddef..ded23af9b26 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java @@ -43,41 +43,20 @@ import ca.uhn.fhir.context.FhirContext; @EnableJpaRepositories(basePackages = "ca.uhn.fhir.jpa.dao.data") public class BaseConfig implements SchedulingConfigurer { - private static FhirContext ourFhirContextDstu21; - private static FhirContext ourFhirContextDstu2; private static FhirContext ourFhirContextDstu1; + private static FhirContext ourFhirContextDstu2; private static FhirContext ourFhirContextDstu2Hl7Org; - - @Autowired - protected Environment myEnv; - - /** - * This lets the "@Value" fields reference properties from the properties file - */ - @Bean - public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - return new PropertySourcesPlaceholderConfigurer(); - } + private static FhirContext ourFhirContextDstu3; @Resource private ApplicationContext myAppCtx; - @Bean(name = "myFhirContextDstu2") - @Lazy - public FhirContext fhirContextDstu2() { - if (ourFhirContextDstu2 == null) { - ourFhirContextDstu2 = FhirContext.forDstu2(); - } - return ourFhirContextDstu2; - } + @Autowired + protected Environment myEnv; - @Bean(name = "myFhirContextDstu21") - @Lazy - public FhirContext fhirContextDstu21() { - if (ourFhirContextDstu21 == null) { - ourFhirContextDstu21 = FhirContext.forDstu2_1(); - } - return ourFhirContextDstu21; + @Override + public void configureTasks(ScheduledTaskRegistrar theTaskRegistrar) { + theTaskRegistrar.setTaskScheduler(taskScheduler()); } @Bean(name = "myFhirContextDstu1") @@ -89,6 +68,15 @@ public class BaseConfig implements SchedulingConfigurer { return ourFhirContextDstu1; } + @Bean(name = "myFhirContextDstu2") + @Lazy + public FhirContext fhirContextDstu2() { + if (ourFhirContextDstu2 == null) { + ourFhirContextDstu2 = FhirContext.forDstu2(); + } + return ourFhirContextDstu2; + } + @Bean(name = "myFhirContextDstu2Hl7Org") @Lazy public FhirContext fhirContextDstu2Hl7Org() { @@ -98,9 +86,13 @@ public class BaseConfig implements SchedulingConfigurer { return ourFhirContextDstu2Hl7Org; } - @Override - public void configureTasks(ScheduledTaskRegistrar theTaskRegistrar) { - theTaskRegistrar.setTaskScheduler(taskScheduler()); + @Bean(name = "myFhirContextDstu3") + @Lazy + public FhirContext fhirContextDstu3() { + if (ourFhirContextDstu3 == null) { + ourFhirContextDstu3 = FhirContext.forDstu3(); + } + return ourFhirContextDstu3; } @Bean @@ -110,6 +102,14 @@ public class BaseConfig implements SchedulingConfigurer { return retVal; } + /** + * This lets the "@Value" fields reference properties from the properties file + */ + @Bean + public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + return new PropertySourcesPlaceholderConfigurer(); + } + // @PostConstruct // public void wireResourceDaos() { // Map daoBeans = myAppCtx.getBeansOfType(IDao.class); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu21Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java similarity index 50% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu21Config.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java index 3403d52c5e1..5164b95725a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu21Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java @@ -1,9 +1,9 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.config.dstu3; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.hapi.validation.FhirQuestionnaireResponseValidator; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.validation.IResourceValidator.BestPracticeWarningLevel; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.hapi.validation.FhirQuestionnaireResponseValidator; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.validation.IResourceValidator.BestPracticeWarningLevel; /* * #%L @@ -33,67 +33,68 @@ import org.springframework.context.annotation.Primary; import org.springframework.transaction.annotation.EnableTransactionManagement; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.config.BaseConfig; import ca.uhn.fhir.jpa.dao.FhirSearchDao; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.dao.ISearchDao; -import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu21; +import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu3; import ca.uhn.fhir.validation.IValidatorModule; @Configuration @EnableTransactionManagement -public class BaseDstu21Config extends BaseConfig { +public class BaseDstu3Config extends BaseConfig { @Bean @Primary public FhirContext defaultFhirContext() { - return fhirContextDstu21(); + return fhirContextDstu3(); } - @Bean(name = "mySystemDaoDstu21", autowire = Autowire.BY_NAME) - public IFhirSystemDao systemDaoDstu21() { - ca.uhn.fhir.jpa.dao.FhirSystemDaoDstu21 retVal = new ca.uhn.fhir.jpa.dao.FhirSystemDaoDstu21(); + @Bean(name = "mySystemDaoDstu3", autowire = Autowire.BY_NAME) + public IFhirSystemDao systemDaoDstu3() { + ca.uhn.fhir.jpa.dao.dstu3.FhirSystemDaoDstu3 retVal = new ca.uhn.fhir.jpa.dao.dstu3.FhirSystemDaoDstu3(); return retVal; } - @Bean(name = "mySystemProviderDstu21") - public ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21 systemProviderDstu21() { - ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21 retVal = new ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21(); - retVal.setDao(systemDaoDstu21()); + @Bean(name = "mySystemProviderDstu3") + public ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3 systemProviderDstu3() { + ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3 retVal = new ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3(); + retVal.setDao(systemDaoDstu3()); return retVal; } - @Bean(name = "myJpaValidationSupportDstu21", autowire = Autowire.BY_NAME) - public ca.uhn.fhir.jpa.dao.IJpaValidationSupportDstu21 jpaValidationSupportDstu21() { - ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21 retVal = new ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21(); + @Bean(name = "myJpaValidationSupportDstu3", autowire = Autowire.BY_NAME) + public ca.uhn.fhir.jpa.dao.dstu3.IJpaValidationSupportDstu3 jpaValidationSupportDstu3() { + ca.uhn.fhir.jpa.dao.dstu3.JpaValidationSupportDstu3 retVal = new ca.uhn.fhir.jpa.dao.dstu3.JpaValidationSupportDstu3(); return retVal; } @Bean(autowire = Autowire.BY_TYPE) - public ISearchDao searchDaoDstu21() { + public ISearchDao searchDaoDstu3() { FhirSearchDao searchDao = new FhirSearchDao(); return searchDao; } - @Bean(name="myInstanceValidatorDstu21") + @Bean(name="myInstanceValidatorDstu3") @Lazy - public IValidatorModule instanceValidatorDstu21() { + public IValidatorModule instanceValidatorDstu3() { FhirInstanceValidator val = new FhirInstanceValidator(); val.setBestPracticeWarningLevel(BestPracticeWarningLevel.Warning); - val.setValidationSupport(validationSupportChainDstu21()); + val.setValidationSupport(validationSupportChainDstu3()); return val; } - @Bean(name="myQuestionnaireResponseValidatorDstu21") + @Bean(name="myQuestionnaireResponseValidatorDstu3") @Lazy - public IValidatorModule questionnaireResponseValidatorDstu21() { + public IValidatorModule questionnaireResponseValidatorDstu3() { FhirQuestionnaireResponseValidator module = new FhirQuestionnaireResponseValidator(); - module.setValidationSupport(validationSupportChainDstu21()); + module.setValidationSupport(validationSupportChainDstu3()); return module; } - @Bean(autowire=Autowire.BY_NAME, name="myJpaValidationSupportChainDstu21") - public IValidationSupport validationSupportChainDstu21() { - return new JpaValidationSupportChainDstu21(); + @Bean(autowire=Autowire.BY_NAME, name="myJpaValidationSupportChainDstu3") + public IValidationSupport validationSupportChainDstu3() { + return new JpaValidationSupportChainDstu3(); } } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/WebsocketDstu21Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/WebsocketDstu3Config.java similarity index 91% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/WebsocketDstu21Config.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/WebsocketDstu3Config.java index 4e1978bf509..4dda7fd2c90 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/WebsocketDstu21Config.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/WebsocketDstu3Config.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.config; +package ca.uhn.fhir.jpa.config.dstu3; /* * #%L @@ -31,20 +31,20 @@ import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; import org.springframework.web.socket.handler.PerConnectionWebSocketHandler; -import ca.uhn.fhir.jpa.subscription.SubscriptionWebsocketHandlerDstu21; +import ca.uhn.fhir.jpa.subscription.SubscriptionWebsocketHandlerDstu3; @Configuration @EnableWebSocket() -public class WebsocketDstu21Config implements WebSocketConfigurer { +public class WebsocketDstu3Config implements WebSocketConfigurer { @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry theRegistry) { - theRegistry.addHandler(subscriptionWebSocketHandler(), "/websocket/dstu2.1"); + theRegistry.addHandler(subscriptionWebSocketHandler(), "/websocket/dstu3"); } @Bean(autowire = Autowire.BY_TYPE) public WebSocketHandler subscriptionWebSocketHandler() { - PerConnectionWebSocketHandler retVal = new PerConnectionWebSocketHandler(SubscriptionWebsocketHandlerDstu21.class); + PerConnectionWebSocketHandler retVal = new PerConnectionWebSocketHandler(SubscriptionWebsocketHandlerDstu3.class); return retVal; } @@ -61,7 +61,7 @@ public class WebsocketDstu21Config implements WebSocketConfigurer { getScheduledThreadPoolExecutor().setContinueExistingPeriodicTasksAfterShutdownPolicy(false); } }; - retVal.setThreadNamePrefix("ws-dstu21-"); + retVal.setThreadNamePrefix("ws-dstu3-"); retVal.setPoolSize(5); return retVal; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java index 66bb81ffa17..5224012fed5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java @@ -53,9 +53,9 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseCoding; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; @@ -82,6 +82,7 @@ import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.RuntimeChildResourceDefinition; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.context.RuntimeSearchParam; +import ca.uhn.fhir.jpa.dao.dstu3.SearchParamExtractorDstu3; import ca.uhn.fhir.jpa.entity.BaseHasResource; import ca.uhn.fhir.jpa.entity.BaseResourceIndexedSearchParam; import ca.uhn.fhir.jpa.entity.BaseTag; @@ -1113,8 +1114,8 @@ public abstract class BaseHapiFhirDao implements IDao { case DSTU2: mySearchParamExtractor = new SearchParamExtractorDstu2(theContext); break; - case DSTU2_1: - mySearchParamExtractor = new SearchParamExtractorDstu21(theContext); + case DSTU3: + mySearchParamExtractor = new SearchParamExtractorDstu3(theContext); break; case DSTU2_HL7ORG: throw new IllegalStateException("Don't know how to handle version: " + myContext.getVersion().getVersion()); @@ -1681,7 +1682,7 @@ public abstract class BaseHapiFhirDao implements IDao { } } - static String normalizeString(String theString) { + public static String normalizeString(String theString) { char[] out = new char[theString.length()]; theString = Normalizer.normalize(theString, Normalizer.Form.NFD); int j = 0; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java index 1c400c70515..482b4001d7f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java @@ -37,7 +37,7 @@ import javax.persistence.NoResultException; import javax.persistence.TemporalType; import javax.persistence.TypedQuery; -import org.hl7.fhir.dstu21.model.IdType; +import org.hl7.fhir.dstu3.model.IdType; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseCoding; import org.hl7.fhir.instance.model.api.IBaseMetaType; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchParamExtractor.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchParamExtractor.java index 3f6a2311a19..72c1108eaec 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchParamExtractor.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/ISearchParamExtractor.java @@ -33,7 +33,7 @@ import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString; import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri; import ca.uhn.fhir.jpa.entity.ResourceTable; -interface ISearchParamExtractor { +public interface ISearchParamExtractor { public abstract Set extractSearchParamCoords(ResourceTable theEntity, IBaseResource theResource); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoBundleDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoBundleDstu3.java similarity index 83% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoBundleDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoBundleDstu3.java index c641ef22dd5..67286c0b6fb 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoBundleDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoBundleDstu3.java @@ -1,8 +1,8 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; /* * #%L @@ -26,7 +26,7 @@ import org.hl7.fhir.dstu21.model.Bundle.BundleType; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -public class FhirResourceDaoBundleDstu21 extends FhirResourceDaoDstu21 { +public class FhirResourceDaoBundleDstu3 extends FhirResourceDaoDstu3 { @Override protected void preProcessResourceForStorage(Bundle theResource) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3.java similarity index 90% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3.java index 2ddcafc50aa..c9705caca4b 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -26,11 +26,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hl7.fhir.dstu21.exceptions.FHIRException; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.OperationOutcomeIssueComponent; +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.OperationOutcomeIssueComponent; import org.hl7.fhir.instance.model.OperationOutcome.IssueType; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; @@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.context.RuntimeSearchParam; +import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.jpa.util.DeleteConflict; import ca.uhn.fhir.model.api.Bundle; @@ -60,12 +61,12 @@ import ca.uhn.fhir.validation.IValidationContext; import ca.uhn.fhir.validation.IValidatorModule; import ca.uhn.fhir.validation.ValidationResult; -public class FhirResourceDaoDstu21 extends BaseHapiFhirResourceDao { +public class FhirResourceDaoDstu3 extends BaseHapiFhirResourceDao { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3.class); @Autowired() - @Qualifier("myInstanceValidatorDstu21") + @Qualifier("myInstanceValidatorDstu3") private IValidatorModule myInstanceValidator; @Override @@ -75,7 +76,7 @@ public class FhirResourceDaoDstu21 extends BaseHapiFhirR issue.getSeverityElement().setValueAsString(theSeverity); issue.setDiagnostics(theMessage); try { - issue.setCode(org.hl7.fhir.dstu21.model.OperationOutcome.IssueType.fromCode(theCode)); + issue.setCode(org.hl7.fhir.dstu3.model.OperationOutcome.IssueType.fromCode(theCode)); } catch (FHIRException e) { ourLog.error("Unknown code: {}", theCode); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoEncounterDstu3.java similarity index 88% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoEncounterDstu3.java index 058ea87c234..5c0529d34b9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoEncounterDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -24,10 +24,12 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.Encounter; +import org.hl7.fhir.dstu3.model.Encounter; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoEncounter; +import ca.uhn.fhir.jpa.dao.SearchParameterMap; import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.rest.api.SortSpec; @@ -35,7 +37,7 @@ import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.server.IBundleProvider; -public class FhirResourceDaoEncounterDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoEncounter { +public class FhirResourceDaoEncounterDstu3 extends FhirResourceDaoDstu3implements IFhirResourceDaoEncounter { @Override public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoPatientDstu3.java similarity index 91% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoPatientDstu3.java index aa6652e41cd..de2e65dfbae 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoPatientDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -24,10 +24,13 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.model.Patient; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoPatient; +import ca.uhn.fhir.jpa.dao.SearchBuilder; +import ca.uhn.fhir.jpa.dao.SearchParameterMap; import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; @@ -39,7 +42,7 @@ import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.IBundleProvider; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails; -public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoPatient { +public class FhirResourceDaoPatientDstu3 extends FhirResourceDaoDstu3implements IFhirResourceDaoPatient { private IBundleProvider doEverythingOperation(IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { SearchParameterMap paramMap = new SearchParameterMap(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireResponseDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoQuestionnaireResponseDstu3.java similarity index 88% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireResponseDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoQuestionnaireResponseDstu3.java index 37c4099d438..0dccafd8a2f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireResponseDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoQuestionnaireResponseDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -22,16 +22,17 @@ package ca.uhn.fhir.jpa.dao; import javax.annotation.PostConstruct; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; @@ -40,13 +41,13 @@ import ca.uhn.fhir.validation.IResourceLoader; import ca.uhn.fhir.validation.IValidatorModule; import ca.uhn.fhir.validation.ValidationResult; -public class FhirResourceDaoQuestionnaireResponseDstu21 extends FhirResourceDaoDstu21 { +public class FhirResourceDaoQuestionnaireResponseDstu3 extends FhirResourceDaoDstu3 { private Boolean myValidateResponses; @Autowired - @Qualifier("myQuestionnaireResponseValidatorDstu21") - private IValidatorModule myQuestionnaireResponseValidatorDstu21; + @Qualifier("myQuestionnaireResponseValidatorDstu3") + private IValidatorModule myQuestionnaireResponseValidatorDstu3; /** @@ -77,7 +78,7 @@ public class FhirResourceDaoQuestionnaireResponseDstu21 extends FhirResourceDaoD val.setValidateAgainstStandardSchema(false); val.setValidateAgainstStandardSchematron(false); - val.registerValidatorModule(myQuestionnaireResponseValidatorDstu21); + val.registerValidatorModule(myQuestionnaireResponseValidatorDstu3); ValidationResult result = val.validateWithResult(getContext().newJsonParser().parseResource(getContext().newJsonParser().encodeResourceToString(theResource))); if (!result.isSuccessful()) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java similarity index 80% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java index b21e44a68a5..24cc8493071 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSearchParameterDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -21,13 +21,16 @@ package ca.uhn.fhir.jpa.dao; */ import org.apache.commons.lang3.time.DateUtils; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.SearchParameter; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.SearchParameter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -public class FhirResourceDaoSearchParameterDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoSearchParameter { +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoSearchParameter; +import ca.uhn.fhir.jpa.dao.IFhirSystemDao; + +public class FhirResourceDaoSearchParameterDstu3 extends FhirResourceDaoDstu3implements IFhirResourceDaoSearchParameter { @Autowired private IFhirSystemDao mySystemDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java index 3e933a34216..6d20c954c38 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSubscriptionDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -30,8 +30,8 @@ import java.util.List; import javax.persistence.Query; import org.apache.commons.lang3.time.DateUtils; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; @@ -48,6 +48,10 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import ca.uhn.fhir.context.RuntimeResourceDefinition; +import ca.uhn.fhir.jpa.dao.IDao; +import ca.uhn.fhir.jpa.dao.IFhirResourceDao; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoSubscription; +import ca.uhn.fhir.jpa.dao.SearchParameterMap; import ca.uhn.fhir.jpa.dao.data.ISubscriptionFlaggedResourceDataDao; import ca.uhn.fhir.jpa.dao.data.ISubscriptionTableDao; import ca.uhn.fhir.jpa.entity.ResourceTable; @@ -66,9 +70,9 @@ import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.IBundleProvider; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoSubscription { +public class FhirResourceDaoSubscriptionDstu3 extends FhirResourceDaoDstu3implements IFhirResourceDaoSubscription { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoSubscriptionDstu21.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoSubscriptionDstu3.class); @Autowired private ISubscriptionFlaggedResourceDataDao mySubscriptionFlaggedResourceDataDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoValueSetDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java similarity index 91% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoValueSetDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java index 05f14381a70..bbd361b7b60 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoValueSetDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -33,34 +33,37 @@ import java.util.Set; import javax.annotation.PostConstruct; import org.apache.commons.codec.binary.StringUtils; -import org.hl7.fhir.dstu21.hapi.validation.DefaultProfileValidationSupport; -import org.hl7.fhir.dstu21.hapi.validation.HapiWorkerContext; -import org.hl7.fhir.dstu21.hapi.validation.ValidationSupportChain; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionContainsComponent; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.HapiWorkerContext; +import org.hl7.fhir.dstu3.hapi.validation.ValidationSupportChain; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.springframework.beans.factory.annotation.Autowired; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet.LookupCodeResult; +import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet.ValidateCodeResult; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.UriParam; import ca.uhn.fhir.rest.server.IBundleProvider; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -public class FhirResourceDaoValueSetDstu21 extends FhirResourceDaoDstu21 implements IFhirResourceDaoValueSet { +public class FhirResourceDaoValueSetDstu3 extends FhirResourceDaoDstu3 implements IFhirResourceDaoValueSet { @Autowired - private IJpaValidationSupportDstu21 myJpaValidationSupport; + private IJpaValidationSupportDstu3 myJpaValidationSupport; private ValidationSupportChain myValidationSupport; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java index b60b8b9fc98..b057355237d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -39,16 +39,16 @@ import java.util.Set; import javax.persistence.TypedQuery; import org.apache.http.NameValuePair; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryResponseComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.Resource; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryResponseComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseReference; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -66,6 +66,9 @@ import org.springframework.transaction.support.TransactionTemplate; import com.google.common.collect.ArrayListMultimap; import ca.uhn.fhir.context.RuntimeResourceDefinition; +import ca.uhn.fhir.jpa.dao.BaseHapiFhirSystemDao; +import ca.uhn.fhir.jpa.dao.DaoMethodOutcome; +import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.jpa.entity.TagDefinition; import ca.uhn.fhir.jpa.provider.ServletSubRequestDetails; @@ -91,8 +94,8 @@ import ca.uhn.fhir.util.FhirTerser; import ca.uhn.fhir.util.UrlUtil; import ca.uhn.fhir.util.UrlUtil.UrlParts; -public class FhirSystemDaoDstu21 extends BaseHapiFhirSystemDao { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirSystemDaoDstu21.class); +public class FhirSystemDaoDstu3 extends BaseHapiFhirSystemDao { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirSystemDaoDstu3.class); @Autowired private PlatformTransactionManager myTxManager; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaValidationSupportDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/IJpaValidationSupportDstu3.java similarity index 79% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaValidationSupportDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/IJpaValidationSupportDstu3.java index 2989636309e..701a7b2e99c 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IJpaValidationSupportDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/IJpaValidationSupportDstu3.java @@ -1,6 +1,6 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; /* * #%L @@ -22,6 +22,6 @@ import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; * #L% */ -public interface IJpaValidationSupportDstu21 extends IValidationSupport { +public interface IJpaValidationSupportDstu3 extends IValidationSupport { } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaValidationSupportDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java similarity index 78% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaValidationSupportDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java index 069c1629f41..d8b75cef877 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaValidationSupportDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java @@ -1,11 +1,11 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IAnyResource; /* @@ -33,31 +33,32 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.UriParam; import ca.uhn.fhir.rest.server.IBundleProvider; -public class JpaValidationSupportDstu21 implements IJpaValidationSupportDstu21 { +public class JpaValidationSupportDstu3 implements IJpaValidationSupportDstu3 { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(JpaValidationSupportDstu21.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(JpaValidationSupportDstu3.class); @Autowired - @Qualifier("myStructureDefinitionDaoDstu21") + @Qualifier("myStructureDefinitionDaoDstu3") private IFhirResourceDao myStructureDefinitionDao; @Autowired - @Qualifier("myValueSetDaoDstu21") + @Qualifier("myValueSetDaoDstu3") private IFhirResourceDao myValueSetDao; @Autowired - @Qualifier("myQuestionnaireDaoDstu21") + @Qualifier("myQuestionnaireDaoDstu3") private IFhirResourceDao myQuestionnaireDao; @Autowired - @Qualifier("myFhirContextDstu21") - private FhirContext myDstu21Ctx; + @Qualifier("myFhirContextDstu3") + private FhirContext myDstu3Ctx; - public JpaValidationSupportDstu21() { + public JpaValidationSupportDstu3() { super(); } @@ -80,7 +81,7 @@ public class JpaValidationSupportDstu21 implements IJpaValidationSupportDstu21 { localReference = true; } - String resourceName = myDstu21Ctx.getResourceDefinition(theClass).getName(); + String resourceName = myDstu3Ctx.getResourceDefinition(theClass).getName(); IBundleProvider search; if ("ValueSet".equals(resourceName)) { if (localReference) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java index ea314bde8c0..3403d346f6f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao; +package ca.uhn.fhir.jpa.dao.dstu3; /* * #%L @@ -34,25 +34,25 @@ import javax.measure.unit.Unit; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.hl7.fhir.dstu21.model.Address; -import org.hl7.fhir.dstu21.model.BaseDateTimeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestSecurityComponent; -import org.hl7.fhir.dstu21.model.ContactPoint; -import org.hl7.fhir.dstu21.model.Duration; -import org.hl7.fhir.dstu21.model.Enumeration; -import org.hl7.fhir.dstu21.model.HumanName; -import org.hl7.fhir.dstu21.model.Identifier; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.Location.LocationPositionComponent; -import org.hl7.fhir.dstu21.model.Patient.PatientCommunicationComponent; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.Address; +import org.hl7.fhir.dstu3.model.BaseDateTimeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ContactPoint; +import org.hl7.fhir.dstu3.model.Duration; +import org.hl7.fhir.dstu3.model.Enumeration; +import org.hl7.fhir.dstu3.model.HumanName; +import org.hl7.fhir.dstu3.model.Identifier; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestSecurityComponent; +import org.hl7.fhir.dstu3.model.Location.LocationPositionComponent; +import org.hl7.fhir.dstu3.model.Patient.PatientCommunicationComponent; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IPrimitiveType; @@ -61,6 +61,9 @@ import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.context.RuntimeSearchParam; +import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; +import ca.uhn.fhir.jpa.dao.BaseSearchParamExtractor; +import ca.uhn.fhir.jpa.dao.ISearchParamExtractor; import ca.uhn.fhir.jpa.entity.BaseResourceIndexedSearchParam; import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamCoords; import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamDate; @@ -72,11 +75,11 @@ import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum; -public class SearchParamExtractorDstu21 extends BaseSearchParamExtractor implements ISearchParamExtractor { +public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implements ISearchParamExtractor { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorDstu21.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorDstu3.class); - public SearchParamExtractorDstu21(FhirContext theContext) { + public SearchParamExtractorDstu3(FhirContext theContext) { super(theContext); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderEncounterDstu3.java similarity index 92% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderEncounterDstu3.java index 0f66ee17f2f..54d69185b34 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderEncounterDstu3.java @@ -1,8 +1,8 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.UnsignedIntType; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.UnsignedIntType; /* * #%L @@ -34,7 +34,7 @@ import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.server.Constants; -public class BaseJpaResourceProviderEncounterDstu21 extends JpaResourceProviderDstu21 { +public class BaseJpaResourceProviderEncounterDstu3 extends JpaResourceProviderDstu3 { /** * Encounter/123/$everything diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatientDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderPatientDstu3.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatientDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderPatientDstu3.java index 194b5a684f2..dc36cd0319a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatientDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderPatientDstu3.java @@ -1,13 +1,13 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.List; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UnsignedIntType; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UnsignedIntType; /* * #%L @@ -42,7 +42,7 @@ import ca.uhn.fhir.rest.param.StringOrListParam; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.server.Constants; -public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDstu21 { +public class BaseJpaResourceProviderPatientDstu3 extends JpaResourceProviderDstu3 { /** * Patient/123/$everything diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderQuestionnaireResponseDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderQuestionnaireResponseDstu3.java similarity index 76% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderQuestionnaireResponseDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderQuestionnaireResponseDstu3.java index dc1a25bb7f3..e7e4f53b5a5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderQuestionnaireResponseDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderQuestionnaireResponseDstu3.java @@ -1,6 +1,6 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; /* * #%L @@ -22,7 +22,7 @@ import org.hl7.fhir.dstu21.model.QuestionnaireResponse; * #L% */ -public class BaseJpaResourceProviderQuestionnaireResponseDstu21 extends JpaResourceProviderDstu21 { +public class BaseJpaResourceProviderQuestionnaireResponseDstu3 extends JpaResourceProviderDstu3 { // nothing yet diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderValueSetDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java similarity index 92% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderValueSetDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java index 5fb3443e696..a46a8870caf 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderValueSetDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/BaseJpaResourceProviderValueSetDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; /* * #%L @@ -24,15 +24,15 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet; import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet.LookupCodeResult; @@ -43,7 +43,7 @@ import ca.uhn.fhir.rest.annotation.OperationParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -public class BaseJpaResourceProviderValueSetDstu21 extends JpaResourceProviderDstu21 { +public class BaseJpaResourceProviderValueSetDstu3 extends JpaResourceProviderDstu3 { //@formatter:off @Operation(name = "$expand", idempotent = true) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java similarity index 79% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java index 85930ec487d..96919a3d945 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaConformanceProviderDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; /* * #%L @@ -25,17 +25,17 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.Conformance; -import org.hl7.fhir.dstu21.model.Conformance.ConditionalDeleteStatus; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceSearchParamComponent; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.Enumerations.SearchParamType; -import org.hl7.fhir.dstu21.model.Extension; -import org.hl7.fhir.dstu21.model.Meta; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.Conformance; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.Conformance.ConditionalDeleteStatus; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceSearchParamComponent; +import org.hl7.fhir.dstu3.model.Enumerations.SearchParamType; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; @@ -46,7 +46,7 @@ import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.util.CoverageIgnore; import ca.uhn.fhir.util.ExtensionConstants; -public class JpaConformanceProviderDstu21 extends org.hl7.fhir.dstu21.hapi.rest.server.ServerConformanceProvider { +public class JpaConformanceProviderDstu3 extends org.hl7.fhir.dstu3.hapi.rest.server.ServerConformanceProvider { private volatile Conformance myCachedValue; private DaoConfig myDaoConfig; @@ -58,7 +58,7 @@ public class JpaConformanceProviderDstu21 extends org.hl7.fhir.dstu21.hapi.rest. * Constructor */ @CoverageIgnore - public JpaConformanceProviderDstu21(){ + public JpaConformanceProviderDstu3(){ super(); super.setCache(false); } @@ -66,7 +66,7 @@ public class JpaConformanceProviderDstu21 extends org.hl7.fhir.dstu21.hapi.rest. /** * Constructor */ - public JpaConformanceProviderDstu21(RestfulServer theRestfulServer, IFhirSystemDao theSystemDao, DaoConfig theDaoConfig) { + public JpaConformanceProviderDstu3(RestfulServer theRestfulServer, IFhirSystemDao theSystemDao, DaoConfig theDaoConfig) { super(theRestfulServer); myRestfulServer = theRestfulServer; mySystemDao = theSystemDao; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaResourceProviderDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaResourceProviderDstu3.java similarity index 93% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaResourceProviderDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaResourceProviderDstu3.java index 72e7e8f6b22..80ecda2e358 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaResourceProviderDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaResourceProviderDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; /* * #%L @@ -22,12 +22,13 @@ package ca.uhn.fhir.jpa.provider; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.Parameters; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.Parameters; import org.hl7.fhir.instance.model.api.IAnyResource; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; +import ca.uhn.fhir.jpa.provider.BaseJpaResourceProvider; import ca.uhn.fhir.rest.annotation.ConditionalUrlParam; import ca.uhn.fhir.rest.annotation.Create; import ca.uhn.fhir.rest.annotation.Delete; @@ -42,17 +43,17 @@ import ca.uhn.fhir.rest.api.ValidationModeEnum; import ca.uhn.fhir.rest.server.EncodingEnum; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -public class JpaResourceProviderDstu21 extends BaseJpaResourceProvider { +public class JpaResourceProviderDstu3 extends BaseJpaResourceProvider { public static final String OPERATION_NAME_META = "$meta"; public static final String OPERATION_NAME_META_DELETE = "$meta-delete"; public static final String OPERATION_NAME_META_ADD = "$meta-add"; - public JpaResourceProviderDstu21() { + public JpaResourceProviderDstu3() { // nothing } - public JpaResourceProviderDstu21(IFhirResourceDao theDao) { + public JpaResourceProviderDstu3(IFhirResourceDao theDao) { super(theDao); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProviderDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaSystemProviderDstu3.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProviderDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaSystemProviderDstu3.java index 3644478eeea..57bca21de14 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaSystemProviderDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/dstu3/JpaSystemProviderDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -28,17 +28,18 @@ import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.Parameters.ParametersParameterComponent; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Parameters.ParametersParameterComponent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import ca.uhn.fhir.jpa.dao.FhirSearchDao.Suggestion; +import ca.uhn.fhir.jpa.provider.BaseJpaSystemProvider; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.dao.ISearchDao; import ca.uhn.fhir.model.api.annotation.Description; @@ -51,10 +52,10 @@ import ca.uhn.fhir.rest.method.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; -public class JpaSystemProviderDstu21 extends BaseJpaSystemProvider { +public class JpaSystemProviderDstu3 extends BaseJpaSystemProvider { @Autowired() - @Qualifier("mySystemDaoDstu21") + @Qualifier("mySystemDaoDstu3") private IFhirSystemDao mySystemDao; @Autowired diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu3.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu3.java index 8f5f834fa1d..cafd1797755 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerDstu3.java @@ -29,10 +29,10 @@ import javax.annotation.PreDestroy; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.beans.factory.annotation.Autowired; @@ -50,11 +50,11 @@ import ca.uhn.fhir.rest.server.EncodingEnum; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -public class SubscriptionWebsocketHandlerDstu21 extends TextWebSocketHandler implements ISubscriptionWebsocketHandler, Runnable { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionWebsocketHandlerDstu21.class); +public class SubscriptionWebsocketHandlerDstu3 extends TextWebSocketHandler implements ISubscriptionWebsocketHandler, Runnable { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionWebsocketHandlerDstu3.class); @Autowired - @Qualifier("myFhirContextDstu21") + @Qualifier("myFhirContextDstu3") private FhirContext myCtx; private ScheduledFuture myScheduleFuture; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu3.java similarity index 83% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu3.java index 7166051c3aa..f43e36f0835 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/subscription/SubscriptionWebsocketHandlerFactoryDstu3.java @@ -22,12 +22,12 @@ package ca.uhn.fhir.jpa.subscription; import org.springframework.beans.factory.FactoryBean; -public class SubscriptionWebsocketHandlerFactoryDstu21 implements FactoryBean { - static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionWebsocketHandlerDstu21.class); +public class SubscriptionWebsocketHandlerFactoryDstu3 implements FactoryBean { + static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionWebsocketHandlerDstu3.class); @Override public ISubscriptionWebsocketHandler getObject() throws Exception { - return new SubscriptionWebsocketHandlerDstu21(); + return new SubscriptionWebsocketHandlerDstu3(); } @Override diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java similarity index 92% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java index 197996bba8e..fdd33d883fc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SubscriptionsRequireManualActivationInterceptorDstu3.java @@ -2,9 +2,9 @@ package ca.uhn.fhir.jpa.util; import static org.apache.commons.lang3.StringUtils.isNotBlank; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; /* * #%L @@ -30,8 +30,8 @@ import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import ca.uhn.fhir.jpa.dao.FhirResourceDaoSubscriptionDstu21; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; +import ca.uhn.fhir.jpa.dao.dstu3.FhirResourceDaoSubscriptionDstu3; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; @@ -44,9 +44,9 @@ import ca.uhn.fhir.util.CoverageIgnore; * Interceptor which requires newly created {@link Subscription subscriptions} to be in * {@link SubscriptionStatus#REQUESTED} state and prevents clients from changing the status. */ -public class SubscriptionsRequireManualActivationInterceptorDstu21 extends InterceptorAdapter { +public class SubscriptionsRequireManualActivationInterceptorDstu3 extends InterceptorAdapter { - public static final ResourceMetadataKeyEnum ALLOW_STATUS_CHANGE = new ResourceMetadataKeyEnum(FhirResourceDaoSubscriptionDstu21.class.getName() + "_ALLOW_STATUS_CHANGE") { + public static final ResourceMetadataKeyEnum ALLOW_STATUS_CHANGE = new ResourceMetadataKeyEnum(FhirResourceDaoSubscriptionDstu3.class.getName() + "_ALLOW_STATUS_CHANGE") { private static final long serialVersionUID = 1; @CoverageIgnore @@ -63,7 +63,7 @@ public class SubscriptionsRequireManualActivationInterceptorDstu21 extends Inter }; @Autowired - @Qualifier("mySubscriptionDaoDstu21") + @Qualifier("mySubscriptionDaoDstu3") private IFhirResourceDao myDao; @Override diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu21.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java similarity index 54% rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu21.java rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java index dc8aece74b0..5366a5e3d6a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu21.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/validation/JpaValidationSupportChainDstu3.java @@ -2,20 +2,20 @@ package ca.uhn.fhir.jpa.validation; import javax.annotation.PostConstruct; -import org.hl7.fhir.dstu21.hapi.validation.DefaultProfileValidationSupport; -import org.hl7.fhir.dstu21.hapi.validation.ValidationSupportChain; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.ValidationSupportChain; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -public class JpaValidationSupportChainDstu21 extends ValidationSupportChain { +public class JpaValidationSupportChainDstu3 extends ValidationSupportChain { private DefaultProfileValidationSupport myDefaultProfileValidationSupport = new DefaultProfileValidationSupport(); @Autowired - @Qualifier("myJpaValidationSupportDstu21") - public ca.uhn.fhir.jpa.dao.IJpaValidationSupportDstu21 myJpaValidationSupportDstu21; + @Qualifier("myJpaValidationSupportDstu3") + public ca.uhn.fhir.jpa.dao.dstu3.IJpaValidationSupportDstu3 myJpaValidationSupportDstu3; - public JpaValidationSupportChainDstu21() { + public JpaValidationSupportChainDstu3() { super(); } @@ -26,6 +26,6 @@ public class JpaValidationSupportChainDstu21 extends ValidationSupportChain { @PostConstruct public void postConstruct() { addValidationSupport(myDefaultProfileValidationSupport); - addValidationSupport(myJpaValidationSupportDstu21); + addValidationSupport(myJpaValidationSupportDstu3); } } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu21Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu21Config.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java index 7b5bc351f0c..072197fdb05 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu21Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java @@ -17,7 +17,7 @@ import ca.uhn.fhir.jpa.dao.DaoConfig; @Configuration @EnableTransactionManagement() -public class TestDstu21Config extends BaseJavaConfigDstu21 { +public class TestDstu3Config extends BaseJavaConfigDstu3 { @Bean() public DaoConfig daoConfig() { @@ -59,7 +59,7 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 { extraProperties.put("hibernate.hbm2ddl.auto", "update"); extraProperties.put("hibernate.dialect", "org.hibernate.dialect.DerbyTenSevenDialect"); extraProperties.put("hibernate.search.default.directory_provider" ,"filesystem"); - extraProperties.put("hibernate.search.default.indexBase", "target/lucene_index_dstu21"); + extraProperties.put("hibernate.search.default.indexBase", "target/lucene_index_dstu3"); extraProperties.put("hibernate.search.lucene_version","LUCENE_CURRENT"); extraProperties.put("hibernate.search.autoregister_listeners", "true"); return extraProperties; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java index 7a656fa4d0a..14261c933a2 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.IOUtils; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.AfterClass; @@ -37,7 +37,7 @@ public class BaseJpaTest { return retVal; } - protected List toUnqualifiedVersionlessIds(org.hl7.fhir.dstu21.model.Bundle theFound) { + protected List toUnqualifiedVersionlessIds(org.hl7.fhir.dstu3.model.Bundle theFound) { List retVal = new ArrayList(); for (BundleEntryComponent next : theFound.getEntry()) { // if (next.getResource()!= null) { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21SystemTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java similarity index 88% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21SystemTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java index af5d3f7aa0c..7b35b5afb9c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21SystemTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3SystemTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletRequest; import org.junit.Before; -import ca.uhn.fhir.jpa.rp.dstu21.PatientResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu3.PatientResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails; -public abstract class BaseJpaDstu21SystemTest extends BaseJpaDstu21Test { +public abstract class BaseJpaDstu3SystemTest extends BaseJpaDstu3Test { protected ServletRequestDetails myRequestDetails; private RestfulServer myServer; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java similarity index 78% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java index bb03d57e892..398d137f2c8 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/BaseJpaDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; @@ -11,32 +11,32 @@ import javax.persistence.EntityManager; import org.apache.commons.io.IOUtils; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.Search; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.Device; -import org.hl7.fhir.dstu21.model.DiagnosticOrder; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.Immunization; -import org.hl7.fhir.dstu21.model.Location; -import org.hl7.fhir.dstu21.model.Media; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.NamingSystem; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Practitioner; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Substance; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.Device; +import org.hl7.fhir.dstu3.model.DiagnosticOrder; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.Immunization; +import org.hl7.fhir.dstu3.model.Location; +import org.hl7.fhir.dstu3.model.Media; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.NamingSystem; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Practitioner; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Substance; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.Before; import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.config.TestDstu21Config; +import ca.uhn.fhir.jpa.config.TestDstu3Config; import ca.uhn.fhir.jpa.dao.BaseJpaTest; import ca.uhn.fhir.jpa.dao.DaoConfig; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; @@ -78,45 +78,45 @@ import ca.uhn.fhir.jpa.entity.ResourceTag; import ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource; import ca.uhn.fhir.jpa.entity.SubscriptionTable; import ca.uhn.fhir.jpa.entity.TagDefinition; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21; +import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.method.MethodUtil; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; //@formatter:off @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes= {TestDstu21Config.class}) +@ContextConfiguration(classes= {TestDstu3Config.class}) //@formatter:on -public abstract class BaseJpaDstu21Test extends BaseJpaTest { +public abstract class BaseJpaDstu3Test extends BaseJpaTest { @Autowired - @Qualifier("myJpaValidationSupportChainDstu21") + @Qualifier("myJpaValidationSupportChainDstu3") protected IValidationSupport myValidationSupport; @Autowired protected ApplicationContext myAppCtx; @Autowired protected ISearchDao mySearchDao; @Autowired - @Qualifier("myConceptMapDaoDstu21") + @Qualifier("myConceptMapDaoDstu3") protected IFhirResourceDao myConceptMapDao; @Autowired - @Qualifier("myMedicationDaoDstu21") + @Qualifier("myMedicationDaoDstu3") protected IFhirResourceDao myMedicationDao; @Autowired - @Qualifier("myMedicationOrderDaoDstu21") + @Qualifier("myMedicationOrderDaoDstu3") protected IFhirResourceDao myMedicationOrderDao; @Autowired protected DaoConfig myDaoConfig; @Autowired - @Qualifier("myDeviceDaoDstu21") + @Qualifier("myDeviceDaoDstu3") protected IFhirResourceDao myDeviceDao; @Autowired - @Qualifier("myDiagnosticOrderDaoDstu21") + @Qualifier("myDiagnosticOrderDaoDstu3") protected IFhirResourceDao myDiagnosticOrderDao; @Autowired - @Qualifier("myDiagnosticReportDaoDstu21") + @Qualifier("myDiagnosticReportDaoDstu3") protected IFhirResourceDao myDiagnosticReportDao; @Autowired - @Qualifier("myEncounterDaoDstu21") + @Qualifier("myEncounterDaoDstu3") protected IFhirResourceDao myEncounterDao; // @PersistenceContext() @@ -124,61 +124,61 @@ public abstract class BaseJpaDstu21Test extends BaseJpaTest { protected EntityManager myEntityManager; @Autowired - @Qualifier("myFhirContextDstu21") + @Qualifier("myFhirContextDstu3") protected FhirContext myFhirCtx; @Autowired - @Qualifier("myImmunizationDaoDstu21") + @Qualifier("myImmunizationDaoDstu3") protected IFhirResourceDao myImmunizationDao; protected IServerInterceptor myInterceptor; @Autowired - @Qualifier("myLocationDaoDstu21") + @Qualifier("myLocationDaoDstu3") protected IFhirResourceDao myLocationDao; @Autowired - @Qualifier("myObservationDaoDstu21") + @Qualifier("myObservationDaoDstu3") protected IFhirResourceDao myObservationDao; @Autowired - @Qualifier("myOrganizationDaoDstu21") + @Qualifier("myOrganizationDaoDstu3") protected IFhirResourceDao myOrganizationDao; @Autowired - @Qualifier("myPatientDaoDstu21") + @Qualifier("myPatientDaoDstu3") protected IFhirResourceDaoPatient myPatientDao; @Autowired - @Qualifier("myNamingSystemDaoDstu21") + @Qualifier("myNamingSystemDaoDstu3") protected IFhirResourceDao myNamingSystemDao; @Autowired - @Qualifier("myMediaDaoDstu21") + @Qualifier("myMediaDaoDstu3") protected IFhirResourceDao myMediaDao; @Autowired - @Qualifier("myPractitionerDaoDstu21") + @Qualifier("myPractitionerDaoDstu3") protected IFhirResourceDao myPractitionerDao; @Autowired - @Qualifier("myQuestionnaireDaoDstu21") + @Qualifier("myQuestionnaireDaoDstu3") protected IFhirResourceDao myQuestionnaireDao; @Autowired - @Qualifier("myQuestionnaireResponseDaoDstu21") + @Qualifier("myQuestionnaireResponseDaoDstu3") protected IFhirResourceDao myQuestionnaireResponseDao; @Autowired - @Qualifier("myResourceProvidersDstu21") + @Qualifier("myResourceProvidersDstu3") protected Object myResourceProviders; @Autowired - @Qualifier("myStructureDefinitionDaoDstu21") + @Qualifier("myStructureDefinitionDaoDstu3") protected IFhirResourceDao myStructureDefinitionDao; @Autowired - @Qualifier("mySubscriptionDaoDstu21") + @Qualifier("mySubscriptionDaoDstu3") protected IFhirResourceDaoSubscription mySubscriptionDao; @Autowired - @Qualifier("mySubstanceDaoDstu21") + @Qualifier("mySubstanceDaoDstu3") protected IFhirResourceDao mySubstanceDao; @Autowired - @Qualifier("mySystemDaoDstu21") + @Qualifier("mySystemDaoDstu3") protected IFhirSystemDao mySystemDao; @Autowired - @Qualifier("mySystemProviderDstu21") - protected JpaSystemProviderDstu21 mySystemProvider; + @Qualifier("mySystemProviderDstu3") + protected JpaSystemProviderDstu3 mySystemProvider; @Autowired protected PlatformTransactionManager myTxManager; @Autowired - @Qualifier("myValueSetDaoDstu21") + @Qualifier("myValueSetDaoDstu3") protected IFhirResourceDaoValueSet myValueSetDao; @Before diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21InterceptorTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3InterceptorTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21InterceptorTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3InterceptorTest.java index 2d73b0b262c..823d69ba493 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21InterceptorTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3InterceptorTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -7,8 +7,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Patient; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -19,7 +19,7 @@ import ca.uhn.fhir.jpa.interceptor.IJpaServerInterceptor; import ca.uhn.fhir.jpa.interceptor.JpaServerInterceptorAdapter; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails; -public class FhirResourceDaoDstu21InterceptorTest extends BaseJpaDstu21Test { +public class FhirResourceDaoDstu3InterceptorTest extends BaseJpaDstu3Test { private IJpaServerInterceptor myJpaInterceptor; private JpaServerInterceptorAdapter myJpaInterceptorAdapter = new JpaServerInterceptorAdapter(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchFtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchFtTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java index df7174038a5..8df9c19757d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchFtTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchFtTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -13,14 +13,14 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.Base64BinaryType; -import org.hl7.fhir.dstu21.model.Device; -import org.hl7.fhir.dstu21.model.Media; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.Base64BinaryType; +import org.hl7.fhir.dstu3.model.Device; +import org.hl7.fhir.dstu3.model.Media; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Ignore; import org.junit.Test; @@ -33,9 +33,9 @@ import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.server.Constants; -public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { +public class FhirResourceDaoDstu3SearchFtTest extends BaseJpaDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21SearchFtTest.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3SearchFtTest.class); @Test @Ignore diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java index 9488aa66147..91dddda0152 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchNoFtTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -23,35 +23,35 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.model.BaseResource; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.ContactPoint.ContactPointSystem; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.Device; -import org.hl7.fhir.dstu21.model.DiagnosticOrder; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Immunization; -import org.hl7.fhir.dstu21.model.Location; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Practitioner; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; -import org.hl7.fhir.dstu21.model.Substance; -import org.hl7.fhir.dstu21.model.TemporalPrecisionEnum; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.BaseResource; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.Device; +import org.hl7.fhir.dstu3.model.DiagnosticOrder; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Immunization; +import org.hl7.fhir.dstu3.model.Location; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Practitioner; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Substance; +import org.hl7.fhir.dstu3.model.TemporalPrecisionEnum; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ContactPoint.ContactPointSystem; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Ignore; @@ -90,8 +90,8 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; @SuppressWarnings("unchecked") -public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21SearchNoFtTest.class); +public class FhirResourceDaoDstu3SearchNoFtTest extends BaseJpaDstu3Test { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3SearchNoFtTest.class); @Test public void testCodeSearch() { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SubscriptionTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SubscriptionTest.java similarity index 97% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SubscriptionTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SubscriptionTest.java index 7e4a930009e..af8627d6506 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SubscriptionTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SubscriptionTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; @@ -19,12 +19,12 @@ import java.util.List; import javax.persistence.TypedQuery; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Before; @@ -39,9 +39,9 @@ import ca.uhn.fhir.rest.server.IBundleProvider; import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -public class FhirResourceDaoDstu21SubscriptionTest extends BaseJpaDstu21Test { +public class FhirResourceDaoDstu3SubscriptionTest extends BaseJpaDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21SubscriptionTest.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3SubscriptionTest.class); @Autowired private ISubscriptionFlaggedResourceDataDao mySubscriptionFlaggedResourceDataDao; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java index 9d3b4070261..613f69a8c0f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.hamcrest.Matchers.contains; @@ -34,35 +34,35 @@ import java.util.Set; import org.apache.commons.lang3.RandomStringUtils; import org.hamcrest.Matchers; import org.hamcrest.core.StringContains; -import org.hl7.fhir.dstu21.model.BaseResource; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.Device; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.NamingSystem; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueType; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Quantity.QuantityComparator; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; +import org.hl7.fhir.dstu3.model.BaseResource; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.Device; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.NamingSystem; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueType; +import org.hl7.fhir.dstu3.model.Quantity.QuantityComparator; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; @@ -71,7 +71,6 @@ import org.mockito.ArgumentCaptor; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; import ca.uhn.fhir.jpa.dao.BaseHapiFhirResourceDao; -import ca.uhn.fhir.jpa.dao.FhirResourceDaoDstu21; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.dao.IFhirResourceDaoPatient; import ca.uhn.fhir.jpa.dao.SearchParameterMap; @@ -106,9 +105,9 @@ import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails; @SuppressWarnings("unchecked") -public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test { +public class FhirResourceDaoDstu3Test extends BaseJpaDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3Test.class); private List extractNames(IBundleProvider theSearch) { ArrayList retVal = new ArrayList(); @@ -285,18 +284,18 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test { */ assertEquals(org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity.ERROR.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_ERROR); assertEquals(ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum.ERROR.getCode(), BaseHapiFhirResourceDao.OO_SEVERITY_ERROR); - assertEquals(org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity.ERROR.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_ERROR); + assertEquals(org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity.ERROR.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_ERROR); assertEquals(org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity.INFORMATION.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_INFO); assertEquals(ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum.INFORMATION.getCode(), BaseHapiFhirResourceDao.OO_SEVERITY_INFO); - assertEquals(org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity.INFORMATION.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_INFO); + assertEquals(org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity.INFORMATION.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_INFO); assertEquals(org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity.WARNING.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_WARN); assertEquals(ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum.WARNING.getCode(), BaseHapiFhirResourceDao.OO_SEVERITY_WARN); - assertEquals(org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity.WARNING.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_WARN); + assertEquals(org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity.WARNING.toCode(), BaseHapiFhirResourceDao.OO_SEVERITY_WARN); } @Test public void testCreateOperationOutcomeError() { - FhirResourceDaoDstu21 dao = new FhirResourceDaoDstu21(); + FhirResourceDaoDstu3 dao = new FhirResourceDaoDstu3(); OperationOutcome oo = (OperationOutcome) dao.createErrorOperationOutcome("my message", "incomplete"); assertEquals(IssueSeverity.ERROR.toCode(), oo.getIssue().get(0).getSeverity().toCode()); assertEquals("my message", oo.getIssue().get(0).getDiagnostics()); @@ -305,7 +304,7 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test { @Test public void testCreateOperationOutcomeInfo() { - FhirResourceDaoDstu21 dao = new FhirResourceDaoDstu21(); + FhirResourceDaoDstu3 dao = new FhirResourceDaoDstu3(); OperationOutcome oo = (OperationOutcome) dao.createInfoOperationOutcome("my message"); assertEquals(IssueSeverity.INFORMATION.toCode(), oo.getIssue().get(0).getSeverity().toCode()); assertEquals("my message", oo.getIssue().get(0).getDiagnostics()); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21UpdateTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21UpdateTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java index 16acda945f9..2fdd66e1b3d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21UpdateTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3UpdateTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -22,13 +22,13 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.InstantType; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.UriType; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.InstantType; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Test; @@ -42,8 +42,8 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails; -public class FhirResourceDaoDstu21UpdateTest extends BaseJpaDstu21Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21UpdateTest.class); +public class FhirResourceDaoDstu3UpdateTest extends BaseJpaDstu3Test { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3UpdateTest.class); @Test public void testUpdateAndGetHistoryResource() throws InterruptedException { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21ValidateTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java similarity index 91% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21ValidateTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java index 1877ffbd1fc..d679251b93f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21ValidateTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValidateTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; @@ -7,16 +7,16 @@ import static org.junit.Assert.fail; import java.io.IOException; import org.apache.commons.io.IOUtils; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Ignore; @@ -29,8 +29,8 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException; -public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21ValidateTest.class); +public class FhirResourceDaoDstu3ValidateTest extends BaseJpaDstu3Test { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu3ValidateTest.class); @Test @Ignore @@ -59,7 +59,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { } private OperationOutcome doTestValidateResourceContainingProfileDeclaration(String methodName, EncodingEnum enc) throws IOException { - Bundle vss = loadResourceFromClasspath(Bundle.class, "/org/hl7/fhir/instance/model/dstu21/valueset/valuesets.xml"); + Bundle vss = loadResourceFromClasspath(Bundle.class, "/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml"); myValueSetDao.update((ValueSet) findResourceByIdInBundle(vss, "observation-status")); myValueSetDao.update((ValueSet) findResourceByIdInBundle(vss, "observation-category")); myValueSetDao.update((ValueSet) findResourceByIdInBundle(vss, "observation-codes")); @@ -70,7 +70,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { myValueSetDao.update((ValueSet) findResourceByIdInBundle(vss, "referencerange-meaning")); myValueSetDao.update((ValueSet) findResourceByIdInBundle(vss, "observation-relationshiptypes")); - StructureDefinition sd = loadResourceFromClasspath(StructureDefinition.class, "/org/hl7/fhir/instance/model/dstu21/profile/devicemetricobservation.profile.xml"); + StructureDefinition sd = loadResourceFromClasspath(StructureDefinition.class, "/org/hl7/fhir/instance/model/dstu3/profile/devicemetricobservation.profile.xml"); sd.setId(new IdType()); sd.setUrl("http://example.com/foo/bar/" + methodName); myStructureDefinitionDao.create(sd); @@ -246,7 +246,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { @Test public void testValidateNewQuestionnaireFormat() throws Exception { - String input =IOUtils.toString(FhirResourceDaoDstu21ValidateTest.class.getResourceAsStream("/questionnaire_dstu21.xml")); + String input =IOUtils.toString(FhirResourceDaoDstu3ValidateTest.class.getResourceAsStream("/questionnaire_dstu3.xml")); try { MethodOutcome results = myQuestionnaireDao.validate(null, null, input, EncodingEnum.XML, ValidationModeEnum.UPDATE, null); OperationOutcome oo = (OperationOutcome) results.getOperationOutcome(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoValueSetDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3Test.java similarity index 94% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoValueSetDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3Test.java index 3ea2e4b94f5..5ba5c8439ee 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoValueSetDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; @@ -10,13 +10,13 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Before; import org.junit.Ignore; @@ -25,9 +25,9 @@ import org.springframework.transaction.annotation.Transactional; import ca.uhn.fhir.jpa.dao.IFhirResourceDaoValueSet.ValidateCodeResult; -public class FhirResourceDaoValueSetDstu21Test extends BaseJpaDstu21Test { +public class FhirResourceDaoValueSetDstu3Test extends BaseJpaDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoValueSetDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoValueSetDstu3Test.class); private IIdType myExtensionalVsId; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSearchDaoDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSearchDaoDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java index 522ca70a285..f05d23163c6 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSearchDaoDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSearchDaoDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; @@ -6,8 +6,8 @@ import static org.junit.Assert.assertThat; import java.util.List; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,7 @@ import ca.uhn.fhir.rest.param.StringOrListParam; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.rest.server.Constants; -public class FhirSearchDaoDstu21Test extends BaseJpaDstu21Test { +public class FhirSearchDaoDstu3Test extends BaseJpaDstu3Test { @Autowired private ISearchDao mySearchDao; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21SearchTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3SearchTest.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21SearchTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3SearchTest.java index 40dcda0b7ea..0a1b5bfc920 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21SearchTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3SearchTest.java @@ -1,8 +1,8 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import org.junit.Test; -public class FhirSystemDaoDstu21SearchTest extends BaseJpaDstu21SystemTest { +public class FhirSystemDaoDstu3SearchTest extends BaseJpaDstu3SystemTest { @Test public void testSearchByParans() { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java similarity index 98% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java index 6afc4a695f7..f11c2444729 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirSystemDaoDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.dao.dstu21; +package ca.uhn.fhir.jpa.dao.dstu3; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyString; @@ -24,24 +24,24 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.IOUtils; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryRequestComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryResponseComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryRequestComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryResponseComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Test; @@ -65,9 +65,9 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails; -public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { +public class FhirSystemDaoDstu3Test extends BaseJpaDstu3SystemTest { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirSystemDaoDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirSystemDaoDstu3Test.class); @Test public void testReindexing() { @@ -480,7 +480,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { @Test public void testTransactionCreateWithPutUsingUrl2() throws Exception { - String req = IOUtils.toString(FhirSystemDaoDstu21Test.class.getResourceAsStream("/bundle-dstu21.xml")); + String req = IOUtils.toString(FhirSystemDaoDstu3Test.class.getResourceAsStream("/bundle-dstu3.xml")); Bundle request = myFhirCtx.newXmlParser().parseResource(Bundle.class, req); mySystemDao.transaction(myRequestDetails, request); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java deleted file mode 100644 index 463e386d78e..00000000000 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java +++ /dev/null @@ -1,15 +0,0 @@ -package ca.uhn.fhir.jpa.provider.dstu21; - -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.instance.model.api.IBaseResource; - -import ca.uhn.fhir.jpa.provider.JpaResourceProviderDstu21; - -public class QuestionnaireResourceProviderDstu21 extends JpaResourceProviderDstu21 { - - @Override - public Class getResourceType() { - return Questionnaire.class; - } - -} diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java similarity index 85% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java index 4225ad8083f..5a2d284ccfa 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/BaseResourceProviderDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -12,10 +12,10 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.hl7.fhir.dstu21.hapi.validation.DefaultProfileValidationSupport; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -27,11 +27,10 @@ import org.springframework.web.context.support.GenericWebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.servlet.DispatcherServlet; -import ca.uhn.fhir.jpa.config.WebsocketDstu21Config; -import ca.uhn.fhir.jpa.dao.dstu21.BaseJpaDstu21Test; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21; +import ca.uhn.fhir.jpa.config.dstu3.WebsocketDstu3Config; +import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; -import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu21; +import ca.uhn.fhir.jpa.validation.JpaValidationSupportChainDstu3; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.client.ServerValidationModeEnum; @@ -39,7 +38,7 @@ import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; import ca.uhn.fhir.rest.server.RestfulServer; -public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test { +public abstract class BaseResourceProviderDstu3Test extends BaseJpaDstu3Test { protected static IGenericClient ourClient; protected static CloseableHttpClient ourHttpClient; @@ -47,9 +46,9 @@ public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test { private static Server ourServer; protected static String ourServerBase; protected static RestfulServer ourRestServer; - private static JpaValidationSupportChainDstu21 myValidationSupport; + private static JpaValidationSupportChainDstu3 myValidationSupport; - public BaseResourceProviderDstu21Test() { + public BaseResourceProviderDstu3Test() { super(); } @@ -98,7 +97,7 @@ public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test { ourRestServer.setPlainProviders(mySystemProvider); - JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(ourRestServer, mySystemDao, myDaoConfig); + JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(ourRestServer, mySystemDao, myDaoConfig); confProvider.setImplementationDescription("THIS IS THE DESC"); ourRestServer.setServerConformanceProvider(confProvider); @@ -126,7 +125,7 @@ public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test { dispatcherServlet.setContextClass(AnnotationConfigWebApplicationContext.class); ServletHolder subsServletHolder = new ServletHolder(); subsServletHolder.setServlet(dispatcherServlet); - subsServletHolder.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, WebsocketDstu21Config.class.getName()); + subsServletHolder.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, WebsocketDstu3Config.class.getName()); proxyHandler.addServlet(subsServletHolder, "/*"); @@ -134,7 +133,7 @@ public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test { server.start(); WebApplicationContext wac = WebApplicationContextUtils.getWebApplicationContext(subsServletHolder.getServlet().getServletConfig().getServletContext()); - myValidationSupport = wac.getBean(JpaValidationSupportChainDstu21.class); + myValidationSupport = wac.getBean(JpaValidationSupportChainDstu3.class); ourClient = myFhirCtx.newRestfulGenericClient(ourServerBase); ourClient.registerInterceptor(new LoggingInterceptor(true)); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java new file mode 100644 index 00000000000..3d3a35958aa --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/QuestionnaireResourceProviderDstu3.java @@ -0,0 +1,13 @@ +package ca.uhn.fhir.jpa.provider.dstu3; + +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.instance.model.api.IBaseResource; + +public class QuestionnaireResourceProviderDstu3 extends JpaResourceProviderDstu3 { + + @Override + public Class getResourceType() { + return Questionnaire.class; + } + +} diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java index 43fd84eb120..b7f1d1eb9ca 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -38,52 +38,52 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.hl7.fhir.dstu21.model.BaseResource; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.Bundle.SearchEntryMode; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.Condition; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.Device; -import org.hl7.fhir.dstu21.model.DiagnosticOrder; -import org.hl7.fhir.dstu21.model.DocumentManifest; -import org.hl7.fhir.dstu21.model.DocumentReference; -import org.hl7.fhir.dstu21.model.DomainResource; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.Encounter.EncounterClass; -import org.hl7.fhir.dstu21.model.Encounter.EncounterLocationComponent; -import org.hl7.fhir.dstu21.model.Encounter.EncounterState; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.ImagingStudy; -import org.hl7.fhir.dstu21.model.InstantType; -import org.hl7.fhir.dstu21.model.Location; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.Meta; -import org.hl7.fhir.dstu21.model.Narrative.NarrativeStatus; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Practitioner; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; -import org.hl7.fhir.dstu21.model.TemporalPrecisionEnum; -import org.hl7.fhir.dstu21.model.UnsignedIntType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.BaseResource; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.Condition; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.Device; +import org.hl7.fhir.dstu3.model.DiagnosticOrder; +import org.hl7.fhir.dstu3.model.DocumentManifest; +import org.hl7.fhir.dstu3.model.DocumentReference; +import org.hl7.fhir.dstu3.model.DomainResource; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.ImagingStudy; +import org.hl7.fhir.dstu3.model.InstantType; +import org.hl7.fhir.dstu3.model.Location; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Meta; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Practitioner; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.TemporalPrecisionEnum; +import org.hl7.fhir.dstu3.model.UnsignedIntType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.Bundle.SearchEntryMode; +import org.hl7.fhir.dstu3.model.Encounter.EncounterClass; +import org.hl7.fhir.dstu3.model.Encounter.EncounterLocationComponent; +import org.hl7.fhir.dstu3.model.Encounter.EncounterState; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.dstu3.model.Narrative.NarrativeStatus; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Ignore; @@ -105,9 +105,9 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; import ca.uhn.fhir.util.UrlUtil; -public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { +public class ResourceProviderDstu3Test extends BaseResourceProviderDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu3Test.class); @Override public void before() throws Exception { @@ -187,7 +187,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { public void testBundleCreate() throws Exception { IGenericClient client = ourClient; - String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/document-father.json")); + String resBody = IOUtils.toString(ResourceProviderDstu3Test.class.getResource("/document-father.json")); IIdType id = client.create().resource(resBody).execute().getId(); ourLog.info("Created: {}", id); @@ -201,7 +201,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { public void testBundleCreateWithTypeTransaction() throws Exception { IGenericClient client = ourClient; - String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/document-father.json")); + String resBody = IOUtils.toString(ResourceProviderDstu3Test.class.getResource("/document-father.json")); resBody = resBody.replace("\"type\": \"document\"", "\"type\": \"transaction\""); try { client.create().resource(resBody).execute().getId(); @@ -772,7 +772,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { int initialSize = client.search().forResource(DocumentManifest.class).returnBundle(Bundle.class).execute().getEntry().size(); - String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/documentmanifest.json")); + String resBody = IOUtils.toString(ResourceProviderDstu3Test.class.getResource("/documentmanifest.json")); client.create().resource(resBody).execute(); int newSize = client.search().forResource(DocumentManifest.class).returnBundle(Bundle.class).execute().getEntry().size(); @@ -790,7 +790,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { int initialSize = client.search().forResource(DocumentReference.class).returnBundle(Bundle.class).execute().getEntry().size(); - String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/documentreference.json")); + String resBody = IOUtils.toString(ResourceProviderDstu3Test.class.getResource("/documentreference.json")); client.create().resource(resBody).execute(); int newSize = client.search().forResource(DocumentReference.class).returnBundle(Bundle.class).execute().getEntry().size(); @@ -929,7 +929,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { @Test public void testEverythingPatientDoesntRepeatPatient() throws Exception { Bundle b; - b = myFhirCtx.newJsonParser().parseResource(Bundle.class, new InputStreamReader(ResourceProviderDstu21Test.class.getResourceAsStream("/bug147-bundle.json"))); + b = myFhirCtx.newJsonParser().parseResource(Bundle.class, new InputStreamReader(ResourceProviderDstu3Test.class.getResourceAsStream("/bug147-bundle.json"))); Bundle resp = ourClient.transaction().withBundle(b).execute(); List ids = new ArrayList(); @@ -1271,7 +1271,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { int initialSize = client.search().forResource(ImagingStudy.class).returnBundle(Bundle.class).execute().getEntry().size(); - String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/imagingstudy.json")); + String resBody = IOUtils.toString(ResourceProviderDstu3Test.class.getResource("/imagingstudy.json")); client.create().resource(resBody).execute(); int newSize = client.search().forResource(ImagingStudy.class).returnBundle(Bundle.class).execute().getEntry().size(); @@ -2337,7 +2337,7 @@ public class ResourceProviderDstu21Test extends BaseResourceProviderDstu21Test { @Test public void testValueSetExpandOperation() throws IOException { - ValueSet upload = myFhirCtx.newXmlParser().parseResource(ValueSet.class, new InputStreamReader(ResourceProviderDstu21Test.class.getResourceAsStream("/extensional-case-2.1.xml"))); + ValueSet upload = myFhirCtx.newXmlParser().parseResource(ValueSet.class, new InputStreamReader(ResourceProviderDstu3Test.class.getResourceAsStream("/extensional-case-2.1.xml"))); IIdType vsid = ourClient.create().resource(upload).execute().getId().toUnqualifiedVersionless(); HttpGet get = new HttpGet(ourServerBase + "/ValueSet/" + vsid.getIdPart() + "/$expand"); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java similarity index 96% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java index 188bcdf12f9..e2c0b5301a5 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3ValueSetTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; @@ -9,13 +9,13 @@ import static org.junit.Assert.fail; import java.io.IOException; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Before; import org.junit.Test; @@ -24,9 +24,9 @@ import org.springframework.transaction.annotation.Transactional; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; -public class ResourceProviderDstu21ValueSetTest extends BaseResourceProviderDstu21Test { +public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu21ValueSetTest.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu3ValueSetTest.class); private IIdType myExtensionalVsId; @Before diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderQuestionnaireResponseDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java similarity index 84% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderQuestionnaireResponseDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java index fbb4cc93b48..bcb24228f49 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderQuestionnaireResponseDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderQuestionnaireResponseDstu3Test.java @@ -1,15 +1,15 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseStatus; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseStatus; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.AfterClass; import org.junit.Before; @@ -22,9 +22,9 @@ import ca.uhn.fhir.rest.server.interceptor.ResponseValidatingInterceptor; import ca.uhn.fhir.validation.IValidatorModule; import ca.uhn.fhir.validation.ResultSeverityEnum; -public class ResourceProviderQuestionnaireResponseDstu21Test extends BaseResourceProviderDstu21Test { +public class ResourceProviderQuestionnaireResponseDstu3Test extends BaseResourceProviderDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderQuestionnaireResponseDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderQuestionnaireResponseDstu3Test.class); private static RequestValidatingInterceptor ourValidatingInterceptor; @Override diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SubscriptionsDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java similarity index 95% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SubscriptionsDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java index e9d70455e79..a350dda4bad 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SubscriptionsDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SubscriptionsDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -14,25 +14,25 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Subscription; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionChannelType; -import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Subscription; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionChannelType; +import org.hl7.fhir.dstu3.model.Subscription.SubscriptionStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Before; import org.junit.Test; -import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu21; +import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu3; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.server.EncodingEnum; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -public class SubscriptionsDstu21Test extends BaseResourceProviderDstu21Test { +public class SubscriptionsDstu3Test extends BaseResourceProviderDstu3Test { - private static final String WEBSOCKET_PATH = "/websocket/dstu2.1"; + private static final String WEBSOCKET_PATH = "/websocket/dstu3"; public class BaseSocket { protected String myError; @@ -42,7 +42,7 @@ public class SubscriptionsDstu21Test extends BaseResourceProviderDstu21Test { } - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionsDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SubscriptionsDstu3Test.class); @Before public void beforeEnableScheduling() { @@ -53,7 +53,7 @@ public class SubscriptionsDstu21Test extends BaseResourceProviderDstu21Test { public void beforeCreateInterceptor() { super.beforeCreateInterceptor(); - SubscriptionsRequireManualActivationInterceptorDstu21 interceptor = new SubscriptionsRequireManualActivationInterceptorDstu21(); + SubscriptionsRequireManualActivationInterceptorDstu3 interceptor = new SubscriptionsRequireManualActivationInterceptorDstu3(); interceptor.setDao(mySubscriptionDao); myDaoConfig.getInterceptors().add(interceptor); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderDstu3Test.java similarity index 90% rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderDstu3Test.java index 7be784fa11e..ee125db1c6a 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/SystemProviderDstu3Test.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.provider.dstu21; +package ca.uhn.fhir.jpa.provider.dstu3; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; @@ -25,19 +25,19 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.OperationDefinition; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.OperationDefinition; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.After; import org.junit.AfterClass; @@ -47,11 +47,11 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.dao.dstu21.BaseJpaDstu21Test; +import ca.uhn.fhir.jpa.dao.dstu3.BaseJpaDstu3Test; import ca.uhn.fhir.jpa.provider.SystemProviderDstu2Test; -import ca.uhn.fhir.jpa.rp.dstu21.ObservationResourceProvider; -import ca.uhn.fhir.jpa.rp.dstu21.OrganizationResourceProvider; -import ca.uhn.fhir.jpa.rp.dstu21.PatientResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu3.ObservationResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu3.OrganizationResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu3.PatientResourceProvider; import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.server.Constants; @@ -63,13 +63,13 @@ import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; import ca.uhn.fhir.validation.ResultSeverityEnum; -public class SystemProviderDstu21Test extends BaseJpaDstu21Test { +public class SystemProviderDstu3Test extends BaseJpaDstu3Test { private static RestfulServer myRestServer; private static IGenericClient ourClient; private static FhirContext ourCtx; private static CloseableHttpClient ourHttpClient; - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SystemProviderDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SystemProviderDstu3Test.class); private static Server ourServer; private static String ourServerBase; @@ -79,7 +79,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { PatientResourceProvider patientRp = new PatientResourceProvider(); patientRp.setDao(myPatientDao); - QuestionnaireResourceProviderDstu21 questionnaireRp = new QuestionnaireResourceProviderDstu21(); + QuestionnaireResourceProviderDstu3 questionnaireRp = new QuestionnaireResourceProviderDstu3(); questionnaireRp.setDao(myQuestionnaireDao); ObservationResourceProvider observationRp = new ObservationResourceProvider(); @@ -106,7 +106,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { servletHolder.setServlet(restServer); proxyHandler.addServlet(servletHolder, "/fhir/context/*"); - ourCtx = FhirContext.forDstu2_1(); + ourCtx = FhirContext.forDstu3(); restServer.setFhirContext(ourCtx); ourServer.setHandler(proxyHandler); @@ -344,7 +344,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { @Test public void testTransactionFromBundle() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/transaction_link_patient_eve.xml"); String bundle = IOUtils.toString(bundleRes); String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); ourLog.info(response); @@ -370,7 +370,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { @Test public void testTransactionFromBundle2() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); String bundle = IOUtils.toString(bundleRes); String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); ourLog.info(response); @@ -386,7 +386,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { * Same bundle! */ - bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); + bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); bundle = IOUtils.toString(bundleRes); response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); ourLog.info(response); @@ -410,7 +410,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { // @Test public void testTransactionFromBundle3() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/grahame-transaction.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/grahame-transaction.xml"); String bundle = IOUtils.toString(bundleRes); String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); ourLog.info(response); @@ -418,7 +418,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { @Test public void testTransactionFromBundle4() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/simone_bundle.xml"); String bundle = IOUtils.toString(bundleRes); String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); ourLog.info(response); @@ -433,7 +433,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { @Test public void testTransactionFromBundle5() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle2.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/simone_bundle2.xml"); String bundle = IOUtils.toString(bundleRes); try { ourClient.transaction().withBundle(bundle).prettyPrint().execute(); @@ -447,7 +447,7 @@ public class SystemProviderDstu21Test extends BaseJpaDstu21Test { @Test public void testTransactionFromBundle6() throws Exception { - InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle3.xml"); + InputStream bundleRes = SystemProviderDstu3Test.class.getResourceAsStream("/simone_bundle3.xml"); String bundle = IOUtils.toString(bundleRes); ourClient.transaction().withBundle(bundle).prettyPrint().execute(); // try { diff --git a/hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu21.xml b/hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu3.xml similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu21.xml rename to hapi-fhir-jpaserver-base/src/test/resources/bundle-dstu3.xml diff --git a/hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu21.xml b/hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu3.xml similarity index 100% rename from hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu21.xml rename to hapi-fhir-jpaserver-base/src/test/resources/questionnaire_dstu3.xml diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java similarity index 94% rename from hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java rename to hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java index 0ba42d8f4cf..cc3fb3679b1 100644 --- a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu21.java +++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigDstu3.java @@ -15,23 +15,23 @@ import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.annotation.EnableTransactionManagement; -import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu21; +import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3; import ca.uhn.fhir.jpa.dao.DaoConfig; -import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu21; +import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu3; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; /** * This class isn't used by default by the example, but - * you can use it as a config if you want to support DSTU2.1 + * you can use it as a config if you want to support DSTU3 * instead of DSTU2 in your server. * * See https://github.com/jamesagnew/hapi-fhir/issues/278 */ @Configuration @EnableTransactionManagement() -public class FhirServerConfigDstu21 extends BaseJavaConfigDstu21 { +public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 { /** * Configure FHIR properties around the the JPA server via this bean @@ -115,7 +115,7 @@ public class FhirServerConfigDstu21 extends BaseJavaConfigDstu21 { @Bean(autowire = Autowire.BY_TYPE) public IServerInterceptor subscriptionSecurityInterceptor() { - SubscriptionsRequireManualActivationInterceptorDstu21 retVal = new SubscriptionsRequireManualActivationInterceptorDstu21(); + SubscriptionsRequireManualActivationInterceptorDstu3 retVal = new SubscriptionsRequireManualActivationInterceptorDstu3(); return retVal; } diff --git a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java index 97226473988..c531e7b8336 100644 --- a/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java +++ b/hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java @@ -5,7 +5,7 @@ import java.util.List; import javax.servlet.ServletException; -import org.hl7.fhir.dstu21.model.Meta; +import org.hl7.fhir.dstu3.model.Meta; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; @@ -15,10 +15,10 @@ import ca.uhn.fhir.jpa.dao.DaoConfig; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21; +import ca.uhn.fhir.jpa.provider.dstu3.JpaConformanceProviderDstu3; +import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu2.composite.MetaDt; import ca.uhn.fhir.model.dstu2.resource.Bundle; @@ -63,8 +63,8 @@ public class JpaServerDemo extends RestfulServer { resourceProviderBeanName = "myResourceProvidersDstu1"; } else if (fhirVersion == FhirVersionEnum.DSTU2) { resourceProviderBeanName = "myResourceProvidersDstu2"; - } else if (fhirVersion == FhirVersionEnum.DSTU2_1) { - resourceProviderBeanName = "myResourceProvidersDstu21"; + } else if (fhirVersion == FhirVersionEnum.DSTU3) { + resourceProviderBeanName = "myResourceProvidersDstu3"; } else { throw new IllegalStateException(); } @@ -80,8 +80,8 @@ public class JpaServerDemo extends RestfulServer { systemProvider = myAppCtx.getBean("mySystemProviderDstu1", JpaSystemProviderDstu1.class); } else if (fhirVersion == FhirVersionEnum.DSTU2) { systemProvider = myAppCtx.getBean("mySystemProviderDstu2", JpaSystemProviderDstu2.class); - } else if (fhirVersion == FhirVersionEnum.DSTU2_1) { - systemProvider = myAppCtx.getBean("mySystemProviderDstu21", JpaSystemProviderDstu21.class); + } else if (fhirVersion == FhirVersionEnum.DSTU3) { + systemProvider = myAppCtx.getBean("mySystemProviderDstu3", JpaSystemProviderDstu3.class); } else { throw new IllegalStateException(); } @@ -104,10 +104,10 @@ public class JpaServerDemo extends RestfulServer { myAppCtx.getBean(DaoConfig.class)); confProvider.setImplementationDescription("Example Server"); setServerConformanceProvider(confProvider); - } else if (fhirVersion == FhirVersionEnum.DSTU2_1) { - IFhirSystemDao systemDao = myAppCtx - .getBean("mySystemDaoDstu21", IFhirSystemDao.class); - JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(this, systemDao, + } else if (fhirVersion == FhirVersionEnum.DSTU3) { + IFhirSystemDao systemDao = myAppCtx + .getBean("mySystemDaoDstu3", IFhirSystemDao.class); + JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(this, systemDao, myAppCtx.getBean(DaoConfig.class)); confProvider.setImplementationDescription("Example Server"); setServerConformanceProvider(confProvider); diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.classpath b/hapi-fhir-jpaserver-uhnfhirtest/.classpath index 52187c307ba..0b809b9cdb8 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/.classpath +++ b/hapi-fhir-jpaserver-uhnfhirtest/.classpath @@ -36,6 +36,6 @@ - + diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java index ecebb7ba52a..d1760f9fc4e 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java @@ -14,16 +14,16 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.config.WebsocketDstu21Config; import ca.uhn.fhir.jpa.config.WebsocketDstu2Config; +import ca.uhn.fhir.jpa.config.dstu3.WebsocketDstu3Config; import ca.uhn.fhir.jpa.dao.DaoConfig; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu21; +import ca.uhn.fhir.jpa.provider.dstu3.JpaConformanceProviderDstu3; +import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; import ca.uhn.fhir.rest.server.ETagSupportEnum; import ca.uhn.fhir.rest.server.EncodingEnum; @@ -33,7 +33,7 @@ import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; -import ca.uhn.fhirtest.config.TestDstu21Config; +import ca.uhn.fhirtest.config.TestDstu3Config; import ca.uhn.fhirtest.config.TestDstu2Config; public class TestRestfulServer extends RestfulServer { @@ -65,7 +65,7 @@ public class TestRestfulServer extends RestfulServer { List beans; JpaSystemProviderDstu1 systemProviderDstu1 = null; JpaSystemProviderDstu2 systemProviderDstu2 = null; - JpaSystemProviderDstu21 systemProviderDstu21 = null; + JpaSystemProviderDstu3 systemProviderDstu3 = null; @SuppressWarnings("rawtypes") IFhirSystemDao systemDao; ETagSupportEnum etagSupport; @@ -105,21 +105,21 @@ public class TestRestfulServer extends RestfulServer { baseUrlProperty = "fhir.baseurl.dstu2"; break; } - case "DSTU21": { + case "DSTU3": { myAppCtx = new AnnotationConfigWebApplicationContext(); myAppCtx.setServletConfig(getServletConfig()); myAppCtx.setParent(parentAppCtx); - myAppCtx.register(TestDstu21Config.class, WebsocketDstu21Config.class); + myAppCtx.register(TestDstu3Config.class, WebsocketDstu3Config.class); myAppCtx.refresh(); - setFhirContext(FhirContext.forDstu2_1()); - beans = myAppCtx.getBean("myResourceProvidersDstu21", List.class); - systemProviderDstu21 = myAppCtx.getBean("mySystemProviderDstu21", JpaSystemProviderDstu21.class); - systemDao = myAppCtx.getBean("mySystemDaoDstu21", IFhirSystemDao.class); + setFhirContext(FhirContext.forDstu3()); + beans = myAppCtx.getBean("myResourceProvidersDstu3", List.class); + systemProviderDstu3 = myAppCtx.getBean("mySystemProviderDstu3", JpaSystemProviderDstu3.class); + systemDao = myAppCtx.getBean("mySystemDaoDstu3", IFhirSystemDao.class); etagSupport = ETagSupportEnum.ENABLED; - JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(this, systemDao, myAppCtx.getBean(DaoConfig.class)); + JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(this, systemDao, myAppCtx.getBean(DaoConfig.class)); confProvider.setImplementationDescription(implDesc); setServerConformanceProvider(confProvider); - baseUrlProperty = "fhir.baseurl.dstu21"; + baseUrlProperty = "fhir.baseurl.dstu3"; break; } default: @@ -154,8 +154,8 @@ public class TestRestfulServer extends RestfulServer { if (systemProviderDstu2 != null) { provList.add(systemProviderDstu2); } - if (systemProviderDstu21 != null) { - provList.add(systemProviderDstu21); + if (systemProviderDstu3 != null) { + provList.add(systemProviderDstu3); } setPlainProviders(provList); diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu21Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java similarity index 92% rename from hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu21Config.java rename to hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java index 49c636a8ee6..42f20d2d5dc 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu21Config.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java @@ -19,9 +19,9 @@ import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.annotation.EnableTransactionManagement; -import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu21; +import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3; import ca.uhn.fhir.jpa.dao.DaoConfig; -import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu21; +import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu3; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor; @@ -31,12 +31,12 @@ import ca.uhn.fhir.validation.ResultSeverityEnum; @Configuration @Import(CommonConfig.class) @EnableTransactionManagement() -public class TestDstu21Config extends BaseJavaConfigDstu21 { +public class TestDstu3Config extends BaseJavaConfigDstu3 { - @Value("${fhir.db.location.dstu21}") + @Value("${fhir.db.location.dstu3}") private String myFhirDbLocation; - @Value("${fhir.lucene.location.dstu21}") + @Value("${fhir.lucene.location.dstu3}") private String myFhirLuceneLocation; @Bean() @@ -49,7 +49,7 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 { return retVal; } - @Bean(name = "myPersistenceDataSourceDstu21", destroyMethod = "close") + @Bean(name = "myPersistenceDataSourceDstu3", destroyMethod = "close") @DependsOn("dbServer") public DataSource dataSource() { BasicDataSource retVal = new BasicDataSource(); @@ -64,7 +64,7 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 { @Bean() public LocalContainerEntityManagerFactoryBean entityManagerFactory() { LocalContainerEntityManagerFactoryBean retVal = new LocalContainerEntityManagerFactoryBean(); - retVal.setPersistenceUnitName("PU_HapiFhirJpaDstu21"); + retVal.setPersistenceUnitName("PU_HapiFhirJpaDstu3"); retVal.setDataSource(dataSource()); retVal.setPackagesToScan("ca.uhn.fhir.jpa.entity"); retVal.setPersistenceProvider(new HibernatePersistenceProvider()); @@ -97,8 +97,8 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 { requestValidator.setFailOnSeverity(ResultSeverityEnum.ERROR); requestValidator.setAddResponseHeaderOnSeverity(null); requestValidator.setAddResponseOutcomeHeaderOnSeverity(ResultSeverityEnum.INFORMATION); - requestValidator.addValidatorModule(questionnaireResponseValidatorDstu21()); - requestValidator.addValidatorModule(instanceValidatorDstu21()); + requestValidator.addValidatorModule(questionnaireResponseValidatorDstu3()); + requestValidator.addValidatorModule(instanceValidatorDstu3()); return requestValidator; } @@ -123,14 +123,14 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 { responseValidator.addExcludeOperationType(RestOperationTypeEnum.HISTORY_TYPE); responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_SYSTEM); responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_TYPE); - responseValidator.addValidatorModule(questionnaireResponseValidatorDstu21()); - responseValidator.addValidatorModule(instanceValidatorDstu21()); + responseValidator.addValidatorModule(questionnaireResponseValidatorDstu3()); + responseValidator.addValidatorModule(instanceValidatorDstu3()); return responseValidator; } @Bean(autowire = Autowire.BY_TYPE) public IServerInterceptor subscriptionSecurityInterceptor() { - return new SubscriptionsRequireManualActivationInterceptorDstu21(); + return new SubscriptionsRequireManualActivationInterceptorDstu3(); } @Bean() diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml index fd2258a4c39..77d93e67f21 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml @@ -13,7 +13,7 @@ home_dev , DSTU2 , UHN/HAPI Server (DSTU2 FHIR) , http://fhirtest.uhn.ca/baseDstu2 - home_21 , DSTU2_1 , UHN/HAPI Server (DSTU2.1 FHIR) , http://fhirtest.uhn.ca/baseDstu2.1 + home_21 , DSTU3 , UHN/HAPI Server (DSTU3 FHIR) , http://fhirtest.uhn.ca/baseDstu3 home , DSTU1 , UHN/HAPI Server (DSTU1 FHIR) , http://fhirtest.uhn.ca/baseDstu1 hidev , DSTU2 , Health Intersections (DSTU2 FHIR) , http://fhir-dev.healthintersections.com.au/open hi , DSTU1 , Health Intersections (DSTU1 FHIR) , http://fhir.healthintersections.com.au/open diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml index 81329c15f8d..3b76c566159 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/web.xml @@ -98,7 +98,7 @@ - fhirServletDstu21 + fhirServletDstu3 ca.uhn.fhirtest.TestRestfulServer ImplementationDescription @@ -106,7 +106,7 @@ FhirVersion - DSTU21 + DSTU3 1 @@ -127,9 +127,13 @@ - fhirServletDstu21 + fhirServletDstu3 /baseDstu2.1/* + + fhirServletDstu3 + /baseDstu3/* + fhirServletDstu2 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java index 06c766c188a..22bc46c0212 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java @@ -25,12 +25,12 @@ public class UhnFhirTestApp { // new File("target/testdb").mkdirs(); System.setProperty("fhir.db.location", "./target/testdb"); System.setProperty("fhir.db.location.dstu2", "./target/testdb_dstu2"); - System.setProperty("fhir.db.location.dstu21", "./target/testdb_dstu21"); + System.setProperty("fhir.db.location.dstu3", "./target/testdb_dstu3"); System.setProperty("fhir.lucene.location.dstu2", "./target/testlucene_dstu2"); - System.setProperty("fhir.lucene.location.dstu21", "./target/testlucene_dstu21"); + System.setProperty("fhir.lucene.location.dstu3", "./target/testlucene_dstu3"); System.setProperty("fhir.baseurl.dstu1", base.replace("Dstu2", "Dstu1")); System.setProperty("fhir.baseurl.dstu2", base); - System.setProperty("fhir.baseurl.dstu21", base.replace("Dstu2", "Dstu21")); + System.setProperty("fhir.baseurl.dstu3", base.replace("Dstu2", "Dstu3")); Server server = new Server(myPort); diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml index a69dfe21b9e..00d5f9a4e40 100644 --- a/hapi-fhir-osgi-core/pom.xml +++ b/hapi-fhir-osgi-core/pom.xml @@ -38,7 +38,7 @@ ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4-SNAPSHOT @@ -48,7 +48,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT @@ -100,8 +100,8 @@ - - + + @@ -219,12 +219,12 @@ false - ../hapi-fhir-structures-dstu2.1/src/main/resources + ../hapi-fhir-structures-dstu3/src/main/resources false @@ -233,7 +233,7 @@ false - ../hapi-fhir-validation-resources-dstu2.1/src/main/resources + ../hapi-fhir-validation-resources-dstu3/src/main/resources false diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextDstu1Test.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextDstu1Test.java index 9b9b31a52a9..e027dd8e8b0 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextDstu1Test.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextDstu1Test.java @@ -37,10 +37,10 @@ public class FhirContextDstu1Test { public void testUnknownVersion() { try { - Class.forName("org.hl7.fhir.dstu21.model.Patient"); + Class.forName("org.hl7.fhir.dstu3.model.Patient"); /* - * If we found this class, DSTU2.1 structures are on the classpath so we're probably doing + * If we found this class, DSTU3 structures are on the classpath so we're probably doing * the cobertura tests.. This one won't work since all structures are on the classpath for * cobertura tests */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdditionalmaterialsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdditionalmaterialsEnumFactory.java deleted file mode 100644 index 54e97544466..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdditionalmaterialsEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AdditionalmaterialsEnumFactory implements EnumFactory { - - public Additionalmaterials fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("xray".equals(codeString)) - return Additionalmaterials.XRAY; - if ("image".equals(codeString)) - return Additionalmaterials.IMAGE; - if ("email".equals(codeString)) - return Additionalmaterials.EMAIL; - if ("model".equals(codeString)) - return Additionalmaterials.MODEL; - if ("document".equals(codeString)) - return Additionalmaterials.DOCUMENT; - if ("other".equals(codeString)) - return Additionalmaterials.OTHER; - throw new IllegalArgumentException("Unknown Additionalmaterials code '"+codeString+"'"); - } - - public String toCode(Additionalmaterials code) { - if (code == Additionalmaterials.XRAY) - return "xray"; - if (code == Additionalmaterials.IMAGE) - return "image"; - if (code == Additionalmaterials.EMAIL) - return "email"; - if (code == Additionalmaterials.MODEL) - return "model"; - if (code == Additionalmaterials.DOCUMENT) - return "document"; - if (code == Additionalmaterials.OTHER) - return "other"; - return "?"; - } - - public String toSystem(Additionalmaterials code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationEnumFactory.java deleted file mode 100644 index b1632d22f25..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AdjudicationEnumFactory implements EnumFactory { - - public Adjudication fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("total".equals(codeString)) - return Adjudication.TOTAL; - if ("copay".equals(codeString)) - return Adjudication.COPAY; - if ("eligible".equals(codeString)) - return Adjudication.ELIGIBLE; - if ("deductible".equals(codeString)) - return Adjudication.DEDUCTIBLE; - if ("eligpercent".equals(codeString)) - return Adjudication.ELIGPERCENT; - if ("tax".equals(codeString)) - return Adjudication.TAX; - if ("benefit".equals(codeString)) - return Adjudication.BENEFIT; - throw new IllegalArgumentException("Unknown Adjudication code '"+codeString+"'"); - } - - public String toCode(Adjudication code) { - if (code == Adjudication.TOTAL) - return "total"; - if (code == Adjudication.COPAY) - return "copay"; - if (code == Adjudication.ELIGIBLE) - return "eligible"; - if (code == Adjudication.DEDUCTIBLE) - return "deductible"; - if (code == Adjudication.ELIGPERCENT) - return "eligpercent"; - if (code == Adjudication.TAX) - return "tax"; - if (code == Adjudication.BENEFIT) - return "benefit"; - return "?"; - } - - public String toSystem(Adjudication code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationErrorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationErrorEnumFactory.java deleted file mode 100644 index 3141b6ee9c8..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationErrorEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AdjudicationErrorEnumFactory implements EnumFactory { - - public AdjudicationError fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("a001".equals(codeString)) - return AdjudicationError.A001; - if ("a002".equals(codeString)) - return AdjudicationError.A002; - throw new IllegalArgumentException("Unknown AdjudicationError code '"+codeString+"'"); - } - - public String toCode(AdjudicationError code) { - if (code == AdjudicationError.A001) - return "a001"; - if (code == AdjudicationError.A002) - return "a002"; - return "?"; - } - - public String toSystem(AdjudicationError code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReasonEnumFactory.java deleted file mode 100644 index 2529bc17b26..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReasonEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AdjudicationReasonEnumFactory implements EnumFactory { - - public AdjudicationReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("ar001".equals(codeString)) - return AdjudicationReason.AR001; - if ("ar002".equals(codeString)) - return AdjudicationReason.AR002; - throw new IllegalArgumentException("Unknown AdjudicationReason code '"+codeString+"'"); - } - - public String toCode(AdjudicationReason code) { - if (code == AdjudicationReason.AR001) - return "ar001"; - if (code == AdjudicationReason.AR002) - return "ar002"; - return "?"; - } - - public String toSystem(AdjudicationReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreedsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreedsEnumFactory.java deleted file mode 100644 index d385e4d5049..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreedsEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AnimalBreedsEnumFactory implements EnumFactory { - - public AnimalBreeds fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("gsd".equals(codeString)) - return AnimalBreeds.GSD; - if ("irt".equals(codeString)) - return AnimalBreeds.IRT; - if ("tibmas".equals(codeString)) - return AnimalBreeds.TIBMAS; - if ("gret".equals(codeString)) - return AnimalBreeds.GRET; - throw new IllegalArgumentException("Unknown AnimalBreeds code '"+codeString+"'"); - } - - public String toCode(AnimalBreeds code) { - if (code == AnimalBreeds.GSD) - return "gsd"; - if (code == AnimalBreeds.IRT) - return "irt"; - if (code == AnimalBreeds.TIBMAS) - return "tibmas"; - if (code == AnimalBreeds.GRET) - return "gret"; - return "?"; - } - - public String toSystem(AnimalBreeds code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatusEnumFactory.java deleted file mode 100644 index 7089b0e35db..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatusEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AnimalGenderstatusEnumFactory implements EnumFactory { - - public AnimalGenderstatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("neutered".equals(codeString)) - return AnimalGenderstatus.NEUTERED; - if ("intact".equals(codeString)) - return AnimalGenderstatus.INTACT; - if ("unknown".equals(codeString)) - return AnimalGenderstatus.UNKNOWN; - throw new IllegalArgumentException("Unknown AnimalGenderstatus code '"+codeString+"'"); - } - - public String toCode(AnimalGenderstatus code) { - if (code == AnimalGenderstatus.NEUTERED) - return "neutered"; - if (code == AnimalGenderstatus.INTACT) - return "intact"; - if (code == AnimalGenderstatus.UNKNOWN) - return "unknown"; - return "?"; - } - - public String toSystem(AnimalGenderstatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpeciesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpeciesEnumFactory.java deleted file mode 100644 index 3f2ef592629..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpeciesEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AnimalSpeciesEnumFactory implements EnumFactory { - - public AnimalSpecies fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("canislf".equals(codeString)) - return AnimalSpecies.CANISLF; - if ("ovisa".equals(codeString)) - return AnimalSpecies.OVISA; - if ("serinuscd".equals(codeString)) - return AnimalSpecies.SERINUSCD; - throw new IllegalArgumentException("Unknown AnimalSpecies code '"+codeString+"'"); - } - - public String toCode(AnimalSpecies code) { - if (code == AnimalSpecies.CANISLF) - return "canislf"; - if (code == AnimalSpecies.OVISA) - return "ovisa"; - if (code == AnimalSpecies.SERINUSCD) - return "serinuscd"; - return "?"; - } - - public String toSystem(AnimalSpecies code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceTypeEnumFactory.java deleted file mode 100644 index 096d1b5ff9e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceTypeEnumFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class AuditSourceTypeEnumFactory implements EnumFactory { - - public AuditSourceType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("1".equals(codeString)) - return AuditSourceType._1; - if ("2".equals(codeString)) - return AuditSourceType._2; - if ("3".equals(codeString)) - return AuditSourceType._3; - if ("4".equals(codeString)) - return AuditSourceType._4; - if ("5".equals(codeString)) - return AuditSourceType._5; - if ("6".equals(codeString)) - return AuditSourceType._6; - if ("7".equals(codeString)) - return AuditSourceType._7; - if ("8".equals(codeString)) - return AuditSourceType._8; - if ("9".equals(codeString)) - return AuditSourceType._9; - throw new IllegalArgumentException("Unknown AuditSourceType code '"+codeString+"'"); - } - - public String toCode(AuditSourceType code) { - if (code == AuditSourceType._1) - return "1"; - if (code == AuditSourceType._2) - return "2"; - if (code == AuditSourceType._3) - return "3"; - if (code == AuditSourceType._4) - return "4"; - if (code == AuditSourceType._5) - return "5"; - if (code == AuditSourceType._6) - return "6"; - if (code == AuditSourceType._7) - return "7"; - if (code == AuditSourceType._8) - return "8"; - if (code == AuditSourceType._9) - return "9"; - return "?"; - } - - public String toSystem(AuditSourceType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategoryEnumFactory.java deleted file mode 100644 index f83dad6d285..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategoryEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class BenefitCategoryEnumFactory implements EnumFactory { - - public BenefitCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("oral".equals(codeString)) - return BenefitCategory.ORAL; - if ("vision".equals(codeString)) - return BenefitCategory.VISION; - if ("medical".equals(codeString)) - return BenefitCategory.MEDICAL; - if ("pharmacy".equals(codeString)) - return BenefitCategory.PHARMACY; - throw new IllegalArgumentException("Unknown BenefitCategory code '"+codeString+"'"); - } - - public String toCode(BenefitCategory code) { - if (code == BenefitCategory.ORAL) - return "oral"; - if (code == BenefitCategory.VISION) - return "vision"; - if (code == BenefitCategory.MEDICAL) - return "medical"; - if (code == BenefitCategory.PHARMACY) - return "pharmacy"; - return "?"; - } - - public String toSystem(BenefitCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetworkEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetworkEnumFactory.java deleted file mode 100644 index 0d1a4bd75c5..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetworkEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class BenefitNetworkEnumFactory implements EnumFactory { - - public BenefitNetwork fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("in".equals(codeString)) - return BenefitNetwork.IN; - if ("out".equals(codeString)) - return BenefitNetwork.OUT; - throw new IllegalArgumentException("Unknown BenefitNetwork code '"+codeString+"'"); - } - - public String toCode(BenefitNetwork code) { - if (code == BenefitNetwork.IN) - return "in"; - if (code == BenefitNetwork.OUT) - return "out"; - return "?"; - } - - public String toSystem(BenefitNetwork code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTermEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTermEnumFactory.java deleted file mode 100644 index 911cbc80f27..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTermEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class BenefitTermEnumFactory implements EnumFactory { - - public BenefitTerm fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("annual".equals(codeString)) - return BenefitTerm.ANNUAL; - if ("lifetime".equals(codeString)) - return BenefitTerm.LIFETIME; - throw new IllegalArgumentException("Unknown BenefitTerm code '"+codeString+"'"); - } - - public String toCode(BenefitTerm code) { - if (code == BenefitTerm.ANNUAL) - return "annual"; - if (code == BenefitTerm.LIFETIME) - return "lifetime"; - return "?"; - } - - public String toSystem(BenefitTerm code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTypeEnumFactory.java deleted file mode 100644 index 655efd01d9f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTypeEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class BenefitTypeEnumFactory implements EnumFactory { - - public BenefitType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("deductable".equals(codeString)) - return BenefitType.DEDUCTABLE; - if ("visit".equals(codeString)) - return BenefitType.VISIT; - if ("copay".equals(codeString)) - return BenefitType.COPAY; - if ("vision-exam".equals(codeString)) - return BenefitType.VISIONEXAM; - if ("vision-glasses".equals(codeString)) - return BenefitType.VISIONGLASSES; - if ("vision-contacts".equals(codeString)) - return BenefitType.VISIONCONTACTS; - if ("medical-primarycare".equals(codeString)) - return BenefitType.MEDICALPRIMARYCARE; - if ("pharmacy-dispense".equals(codeString)) - return BenefitType.PHARMACYDISPENSE; - throw new IllegalArgumentException("Unknown BenefitType code '"+codeString+"'"); - } - - public String toCode(BenefitType code) { - if (code == BenefitType.DEDUCTABLE) - return "deductable"; - if (code == BenefitType.VISIT) - return "visit"; - if (code == BenefitType.COPAY) - return "copay"; - if (code == BenefitType.VISIONEXAM) - return "vision-exam"; - if (code == BenefitType.VISIONGLASSES) - return "vision-glasses"; - if (code == BenefitType.VISIONCONTACTS) - return "vision-contacts"; - if (code == BenefitType.MEDICALPRIMARYCARE) - return "medical-primarycare"; - if (code == BenefitType.PHARMACYDISPENSE) - return "pharmacy-dispense"; - return "?"; - } - - public String toSystem(BenefitType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnitEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnitEnumFactory.java deleted file mode 100644 index 266a8a54d7c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnitEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class BenefitUnitEnumFactory implements EnumFactory { - - public BenefitUnit fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("individual".equals(codeString)) - return BenefitUnit.INDIVIDUAL; - if ("family".equals(codeString)) - return BenefitUnit.FAMILY; - throw new IllegalArgumentException("Unknown BenefitUnit code '"+codeString+"'"); - } - - public String toCode(BenefitUnit code) { - if (code == BenefitUnit.INDIVIDUAL) - return "individual"; - if (code == BenefitUnit.FAMILY) - return "family"; - return "?"; - } - - public String toSystem(BenefitUnit code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategoryEnumFactory.java deleted file mode 100644 index c9a87462bd1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategoryEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class CarePlanActivityCategoryEnumFactory implements EnumFactory { - - public CarePlanActivityCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("diet".equals(codeString)) - return CarePlanActivityCategory.DIET; - if ("drug".equals(codeString)) - return CarePlanActivityCategory.DRUG; - if ("encounter".equals(codeString)) - return CarePlanActivityCategory.ENCOUNTER; - if ("observation".equals(codeString)) - return CarePlanActivityCategory.OBSERVATION; - if ("procedure".equals(codeString)) - return CarePlanActivityCategory.PROCEDURE; - if ("supply".equals(codeString)) - return CarePlanActivityCategory.SUPPLY; - if ("other".equals(codeString)) - return CarePlanActivityCategory.OTHER; - throw new IllegalArgumentException("Unknown CarePlanActivityCategory code '"+codeString+"'"); - } - - public String toCode(CarePlanActivityCategory code) { - if (code == CarePlanActivityCategory.DIET) - return "diet"; - if (code == CarePlanActivityCategory.DRUG) - return "drug"; - if (code == CarePlanActivityCategory.ENCOUNTER) - return "encounter"; - if (code == CarePlanActivityCategory.OBSERVATION) - return "observation"; - if (code == CarePlanActivityCategory.PROCEDURE) - return "procedure"; - if (code == CarePlanActivityCategory.SUPPLY) - return "supply"; - if (code == CarePlanActivityCategory.OTHER) - return "other"; - return "?"; - } - - public String toSystem(CarePlanActivityCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientationEnumFactory.java deleted file mode 100644 index 7a32235c55c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientationEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ChoiceListOrientationEnumFactory implements EnumFactory { - - public ChoiceListOrientation fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("horizontal".equals(codeString)) - return ChoiceListOrientation.HORIZONTAL; - if ("vertical".equals(codeString)) - return ChoiceListOrientation.VERTICAL; - throw new IllegalArgumentException("Unknown ChoiceListOrientation code '"+codeString+"'"); - } - - public String toCode(ChoiceListOrientation code) { - if (code == ChoiceListOrientation.HORIZONTAL) - return "horizontal"; - if (code == ChoiceListOrientation.VERTICAL) - return "vertical"; - return "?"; - } - - public String toSystem(ChoiceListOrientation code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimExceptionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimExceptionEnumFactory.java deleted file mode 100644 index 8dd61bf5333..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimExceptionEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ClaimExceptionEnumFactory implements EnumFactory { - - public ClaimException fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("student".equals(codeString)) - return ClaimException.STUDENT; - if ("disabled".equals(codeString)) - return ClaimException.DISABLED; - throw new IllegalArgumentException("Unknown ClaimException code '"+codeString+"'"); - } - - public String toCode(ClaimException code) { - if (code == ClaimException.STUDENT) - return "student"; - if (code == ClaimException.DISABLED) - return "disabled"; - return "?"; - } - - public String toSystem(ClaimException code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiersEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiersEnumFactory.java deleted file mode 100644 index eb4b008de5d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiersEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ClaimModifiersEnumFactory implements EnumFactory { - - public ClaimModifiers fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("A".equals(codeString)) - return ClaimModifiers.A; - if ("B".equals(codeString)) - return ClaimModifiers.B; - if ("C".equals(codeString)) - return ClaimModifiers.C; - if ("E".equals(codeString)) - return ClaimModifiers.E; - if ("X".equals(codeString)) - return ClaimModifiers.X; - throw new IllegalArgumentException("Unknown ClaimModifiers code '"+codeString+"'"); - } - - public String toCode(ClaimModifiers code) { - if (code == ClaimModifiers.A) - return "A"; - if (code == ClaimModifiers.B) - return "B"; - if (code == ClaimModifiers.C) - return "C"; - if (code == ClaimModifiers.E) - return "E"; - if (code == ClaimModifiers.X) - return "X"; - return "?"; - } - - public String toSystem(ClaimModifiers code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContextEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContextEnumFactory.java deleted file mode 100644 index 67169ac1762..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContextEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ClassificationOrContextEnumFactory implements EnumFactory { - - public ClassificationOrContext fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("classification".equals(codeString)) - return ClassificationOrContext.CLASSIFICATION; - if ("context".equals(codeString)) - return ClassificationOrContext.CONTEXT; - throw new IllegalArgumentException("Unknown ClassificationOrContext code '"+codeString+"'"); - } - - public String toCode(ClassificationOrContext code) { - if (code == ClassificationOrContext.CLASSIFICATION) - return "classification"; - if (code == ClassificationOrContext.CONTEXT) - return "context"; - return "?"; - } - - public String toSystem(ClassificationOrContext code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategoryEnumFactory.java deleted file mode 100644 index 9390ce535d9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategoryEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ConditionCategoryEnumFactory implements EnumFactory { - - public ConditionCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("complaint".equals(codeString)) - return ConditionCategory.COMPLAINT; - if ("symptom".equals(codeString)) - return ConditionCategory.SYMPTOM; - if ("finding".equals(codeString)) - return ConditionCategory.FINDING; - if ("diagnosis".equals(codeString)) - return ConditionCategory.DIAGNOSIS; - throw new IllegalArgumentException("Unknown ConditionCategory code '"+codeString+"'"); - } - - public String toCode(ConditionCategory code) { - if (code == ConditionCategory.COMPLAINT) - return "complaint"; - if (code == ConditionCategory.SYMPTOM) - return "symptom"; - if (code == ConditionCategory.FINDING) - return "finding"; - if (code == ConditionCategory.DIAGNOSIS) - return "diagnosis"; - return "?"; - } - - public String toSystem(ConditionCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinicalEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinicalEnumFactory.java deleted file mode 100644 index 1e76c0aa36c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinicalEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ConditionClinicalEnumFactory implements EnumFactory { - - public ConditionClinical fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("active".equals(codeString)) - return ConditionClinical.ACTIVE; - if ("relapse".equals(codeString)) - return ConditionClinical.RELAPSE; - if ("remission".equals(codeString)) - return ConditionClinical.REMISSION; - if ("resolved".equals(codeString)) - return ConditionClinical.RESOLVED; - throw new IllegalArgumentException("Unknown ConditionClinical code '"+codeString+"'"); - } - - public String toCode(ConditionClinical code) { - if (code == ConditionClinical.ACTIVE) - return "active"; - if (code == ConditionClinical.RELAPSE) - return "relapse"; - if (code == ConditionClinical.REMISSION) - return "remission"; - if (code == ConditionClinical.RESOLVED) - return "resolved"; - return "?"; - } - - public String toSystem(ConditionClinical code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionStateEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionStateEnumFactory.java deleted file mode 100644 index 90d7b5de428..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionStateEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ConditionStateEnumFactory implements EnumFactory { - - public ConditionState fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("active".equals(codeString)) - return ConditionState.ACTIVE; - if ("inactive".equals(codeString)) - return ConditionState.INACTIVE; - if ("resolved".equals(codeString)) - return ConditionState.RESOLVED; - throw new IllegalArgumentException("Unknown ConditionState code '"+codeString+"'"); - } - - public String toCode(ConditionState code) { - if (code == ConditionState.ACTIVE) - return "active"; - if (code == ConditionState.INACTIVE) - return "inactive"; - if (code == ConditionState.RESOLVED) - return "resolved"; - return "?"; - } - - public String toSystem(ConditionState code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectationEnumFactory.java deleted file mode 100644 index 6f357c84e1b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectationEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ConformanceExpectationEnumFactory implements EnumFactory { - - public ConformanceExpectation fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("SHALL".equals(codeString)) - return ConformanceExpectation.SHALL; - if ("SHOULD".equals(codeString)) - return ConformanceExpectation.SHOULD; - if ("MAY".equals(codeString)) - return ConformanceExpectation.MAY; - if ("SHOULD-NOT".equals(codeString)) - return ConformanceExpectation.SHOULDNOT; - throw new IllegalArgumentException("Unknown ConformanceExpectation code '"+codeString+"'"); - } - - public String toCode(ConformanceExpectation code) { - if (code == ConformanceExpectation.SHALL) - return "SHALL"; - if (code == ConformanceExpectation.SHOULD) - return "SHOULD"; - if (code == ConformanceExpectation.MAY) - return "MAY"; - if (code == ConformanceExpectation.SHOULDNOT) - return "SHOULD-NOT"; - return "?"; - } - - public String toSystem(ConformanceExpectation code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityTypeEnumFactory.java deleted file mode 100644 index 58512592d90..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityTypeEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContactentityTypeEnumFactory implements EnumFactory { - - public ContactentityType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("BILL".equals(codeString)) - return ContactentityType.BILL; - if ("ADMIN".equals(codeString)) - return ContactentityType.ADMIN; - if ("HR".equals(codeString)) - return ContactentityType.HR; - if ("PAYOR".equals(codeString)) - return ContactentityType.PAYOR; - if ("PATINF".equals(codeString)) - return ContactentityType.PATINF; - if ("PRESS".equals(codeString)) - return ContactentityType.PRESS; - throw new IllegalArgumentException("Unknown ContactentityType code '"+codeString+"'"); - } - - public String toCode(ContactentityType code) { - if (code == ContactentityType.BILL) - return "BILL"; - if (code == ContactentityType.ADMIN) - return "ADMIN"; - if (code == ContactentityType.HR) - return "HR"; - if (code == ContactentityType.PAYOR) - return "PAYOR"; - if (code == ContactentityType.PATINF) - return "PATINF"; - if (code == ContactentityType.PRESS) - return "PRESS"; - return "?"; - } - - public String toSystem(ContactentityType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActionEnumFactory.java deleted file mode 100644 index b869ecd8488..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActionEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractActionEnumFactory implements EnumFactory { - - public ContractAction fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("action-a".equals(codeString)) - return ContractAction.ACTIONA; - if ("action-b".equals(codeString)) - return ContractAction.ACTIONB; - throw new IllegalArgumentException("Unknown ContractAction code '"+codeString+"'"); - } - - public String toCode(ContractAction code) { - if (code == ContractAction.ACTIONA) - return "action-a"; - if (code == ContractAction.ACTIONB) - return "action-b"; - return "?"; - } - - public String toSystem(ContractAction code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorroleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorroleEnumFactory.java deleted file mode 100644 index 93a5d292ec6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorroleEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractActorroleEnumFactory implements EnumFactory { - - public ContractActorrole fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("practitioner".equals(codeString)) - return ContractActorrole.PRACTITIONER; - if ("patient".equals(codeString)) - return ContractActorrole.PATIENT; - throw new IllegalArgumentException("Unknown ContractActorrole code '"+codeString+"'"); - } - - public String toCode(ContractActorrole code) { - if (code == ContractActorrole.PRACTITIONER) - return "practitioner"; - if (code == ContractActorrole.PATIENT) - return "patient"; - return "?"; - } - - public String toSystem(ContractActorrole code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtypeEnumFactory.java deleted file mode 100644 index 64bef2872d2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtypeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractSubtypeEnumFactory implements EnumFactory { - - public ContractSubtype fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("disclosure-CA".equals(codeString)) - return ContractSubtype.DISCLOSURECA; - if ("disclosure-US".equals(codeString)) - return ContractSubtype.DISCLOSUREUS; - throw new IllegalArgumentException("Unknown ContractSubtype code '"+codeString+"'"); - } - - public String toCode(ContractSubtype code) { - if (code == ContractSubtype.DISCLOSURECA) - return "disclosure-CA"; - if (code == ContractSubtype.DISCLOSUREUS) - return "disclosure-US"; - return "?"; - } - - public String toSystem(ContractSubtype code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtypeEnumFactory.java deleted file mode 100644 index fb1546b9bd7..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtypeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractTermSubtypeEnumFactory implements EnumFactory { - - public ContractTermSubtype fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("OralHealth-Basic".equals(codeString)) - return ContractTermSubtype.ORALHEALTHBASIC; - if ("OralHealth-Major".equals(codeString)) - return ContractTermSubtype.ORALHEALTHMAJOR; - if ("OralHealth-Orthodontic".equals(codeString)) - return ContractTermSubtype.ORALHEALTHORTHODONTIC; - throw new IllegalArgumentException("Unknown ContractTermSubtype code '"+codeString+"'"); - } - - public String toCode(ContractTermSubtype code) { - if (code == ContractTermSubtype.ORALHEALTHBASIC) - return "OralHealth-Basic"; - if (code == ContractTermSubtype.ORALHEALTHMAJOR) - return "OralHealth-Major"; - if (code == ContractTermSubtype.ORALHEALTHORTHODONTIC) - return "OralHealth-Orthodontic"; - return "?"; - } - - public String toSystem(ContractTermSubtype code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermTypeEnumFactory.java deleted file mode 100644 index efe7334e682..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermTypeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractTermTypeEnumFactory implements EnumFactory { - - public ContractTermType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("OralHealth".equals(codeString)) - return ContractTermType.ORALHEALTH; - if ("Vision".equals(codeString)) - return ContractTermType.VISION; - throw new IllegalArgumentException("Unknown ContractTermType code '"+codeString+"'"); - } - - public String toCode(ContractTermType code) { - if (code == ContractTermType.ORALHEALTH) - return "OralHealth"; - if (code == ContractTermType.VISION) - return "Vision"; - return "?"; - } - - public String toSystem(ContractTermType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTypeEnumFactory.java deleted file mode 100644 index 96b0d849a50..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTypeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ContractTypeEnumFactory implements EnumFactory { - - public ContractType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("privacy".equals(codeString)) - return ContractType.PRIVACY; - if ("disclosure".equals(codeString)) - return ContractType.DISCLOSURE; - throw new IllegalArgumentException("Unknown ContractType code '"+codeString+"'"); - } - - public String toCode(ContractType code) { - if (code == ContractType.PRIVACY) - return "privacy"; - if (code == ContractType.DISCLOSURE) - return "disclosure"; - return "?"; - } - - public String toSystem(ContractType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceActionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceActionEnumFactory.java deleted file mode 100644 index 0ee1c3dfbf9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceActionEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class DeviceActionEnumFactory implements EnumFactory { - - public DeviceAction fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("implanted".equals(codeString)) - return DeviceAction.IMPLANTED; - if ("explanted".equals(codeString)) - return DeviceAction.EXPLANTED; - if ("manipulated".equals(codeString)) - return DeviceAction.MANIPULATED; - throw new IllegalArgumentException("Unknown DeviceAction code '"+codeString+"'"); - } - - public String toCode(DeviceAction code) { - if (code == DeviceAction.IMPLANTED) - return "implanted"; - if (code == DeviceAction.EXPLANTED) - return "explanted"; - if (code == DeviceAction.MANIPULATED) - return "manipulated"; - return "?"; - } - - public String toSystem(DeviceAction code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDietEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDietEnumFactory.java deleted file mode 100644 index 2572e1dddda..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDietEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class EncounterDietEnumFactory implements EnumFactory { - - public EncounterDiet fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("vegetarian".equals(codeString)) - return EncounterDiet.VEGETARIAN; - if ("dairy-free".equals(codeString)) - return EncounterDiet.DAIRYFREE; - if ("nut-free".equals(codeString)) - return EncounterDiet.NUTFREE; - if ("gluten-free".equals(codeString)) - return EncounterDiet.GLUTENFREE; - if ("vegan".equals(codeString)) - return EncounterDiet.VEGAN; - if ("halal".equals(codeString)) - return EncounterDiet.HALAL; - if ("kosher".equals(codeString)) - return EncounterDiet.KOSHER; - throw new IllegalArgumentException("Unknown EncounterDiet code '"+codeString+"'"); - } - - public String toCode(EncounterDiet code) { - if (code == EncounterDiet.VEGETARIAN) - return "vegetarian"; - if (code == EncounterDiet.DAIRYFREE) - return "dairy-free"; - if (code == EncounterDiet.NUTFREE) - return "nut-free"; - if (code == EncounterDiet.GLUTENFREE) - return "gluten-free"; - if (code == EncounterDiet.VEGAN) - return "vegan"; - if (code == EncounterDiet.HALAL) - return "halal"; - if (code == EncounterDiet.KOSHER) - return "kosher"; - return "?"; - } - - public String toSystem(EncounterDiet code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriorityEnumFactory.java deleted file mode 100644 index 92c1a95327e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriorityEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class EncounterPriorityEnumFactory implements EnumFactory { - - public EncounterPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("imm".equals(codeString)) - return EncounterPriority.IMM; - if ("emg".equals(codeString)) - return EncounterPriority.EMG; - if ("urg".equals(codeString)) - return EncounterPriority.URG; - if ("s-urg".equals(codeString)) - return EncounterPriority.SURG; - if ("no-urg".equals(codeString)) - return EncounterPriority.NOURG; - throw new IllegalArgumentException("Unknown EncounterPriority code '"+codeString+"'"); - } - - public String toCode(EncounterPriority code) { - if (code == EncounterPriority.IMM) - return "imm"; - if (code == EncounterPriority.EMG) - return "emg"; - if (code == EncounterPriority.URG) - return "urg"; - if (code == EncounterPriority.SURG) - return "s-urg"; - if (code == EncounterPriority.NOURG) - return "no-urg"; - return "?"; - } - - public String toSystem(EncounterPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangementsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangementsEnumFactory.java deleted file mode 100644 index ef97185f251..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangementsEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class EncounterSpecialArrangementsEnumFactory implements EnumFactory { - - public EncounterSpecialArrangements fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("wheel".equals(codeString)) - return EncounterSpecialArrangements.WHEEL; - if ("stret".equals(codeString)) - return EncounterSpecialArrangements.STRET; - if ("int".equals(codeString)) - return EncounterSpecialArrangements.INT; - if ("att".equals(codeString)) - return EncounterSpecialArrangements.ATT; - if ("dog".equals(codeString)) - return EncounterSpecialArrangements.DOG; - throw new IllegalArgumentException("Unknown EncounterSpecialArrangements code '"+codeString+"'"); - } - - public String toCode(EncounterSpecialArrangements code) { - if (code == EncounterSpecialArrangements.WHEEL) - return "wheel"; - if (code == EncounterSpecialArrangements.STRET) - return "stret"; - if (code == EncounterSpecialArrangements.INT) - return "int"; - if (code == EncounterSpecialArrangements.ATT) - return "att"; - if (code == EncounterSpecialArrangements.DOG) - return "dog"; - return "?"; - } - - public String toSystem(EncounterSpecialArrangements code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterTypeEnumFactory.java deleted file mode 100644 index 27709f13a23..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterTypeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class EncounterTypeEnumFactory implements EnumFactory { - - public EncounterType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("ADMS".equals(codeString)) - return EncounterType.ADMS; - if ("BD/BM-clin".equals(codeString)) - return EncounterType.BD_BMCLIN; - if ("CCS60".equals(codeString)) - return EncounterType.CCS60; - if ("OKI".equals(codeString)) - return EncounterType.OKI; - throw new IllegalArgumentException("Unknown EncounterType code '"+codeString+"'"); - } - - public String toCode(EncounterType code) { - if (code == EncounterType.ADMS) - return "ADMS"; - if (code == EncounterType.BD_BMCLIN) - return "BD/BM-clin"; - if (code == EncounterType.CCS60) - return "CCS60"; - if (code == EncounterType.OKI) - return "OKI"; - return "?"; - } - - public String toSystem(EncounterType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditiveEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditiveEnumFactory.java deleted file mode 100644 index 38ab25869b6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditiveEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class EntformulaAdditiveEnumFactory implements EnumFactory { - - public EntformulaAdditive fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("lipid".equals(codeString)) - return EntformulaAdditive.LIPID; - if ("protein".equals(codeString)) - return EntformulaAdditive.PROTEIN; - if ("carbohydrate".equals(codeString)) - return EntformulaAdditive.CARBOHYDRATE; - if ("fiber".equals(codeString)) - return EntformulaAdditive.FIBER; - if ("water".equals(codeString)) - return EntformulaAdditive.WATER; - throw new IllegalArgumentException("Unknown EntformulaAdditive code '"+codeString+"'"); - } - - public String toCode(EntformulaAdditive code) { - if (code == EntformulaAdditive.LIPID) - return "lipid"; - if (code == EntformulaAdditive.PROTEIN) - return "protein"; - if (code == EntformulaAdditive.CARBOHYDRATE) - return "carbohydrate"; - if (code == EntformulaAdditive.FIBER) - return "fiber"; - if (code == EntformulaAdditive.WATER) - return "water"; - return "?"; - } - - public String toSystem(EntformulaAdditive code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategoryEnumFactory.java deleted file mode 100644 index 0b78863e74b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategoryEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class FlagCategoryEnumFactory implements EnumFactory { - - public FlagCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("diet".equals(codeString)) - return FlagCategory.DIET; - if ("drug".equals(codeString)) - return FlagCategory.DRUG; - if ("lab".equals(codeString)) - return FlagCategory.LAB; - if ("admin".equals(codeString)) - return FlagCategory.ADMIN; - if ("contact".equals(codeString)) - return FlagCategory.CONTACT; - throw new IllegalArgumentException("Unknown FlagCategory code '"+codeString+"'"); - } - - public String toCode(FlagCategory code) { - if (code == FlagCategory.DIET) - return "diet"; - if (code == FlagCategory.DRUG) - return "drug"; - if (code == FlagCategory.LAB) - return "lab"; - if (code == FlagCategory.ADMIN) - return "admin"; - if (code == FlagCategory.CONTACT) - return "contact"; - return "?"; - } - - public String toSystem(FlagCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriorityEnumFactory.java deleted file mode 100644 index 2096d9232f6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriorityEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class FlagPriorityEnumFactory implements EnumFactory { - - public FlagPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("PN".equals(codeString)) - return FlagPriority.PN; - if ("PL".equals(codeString)) - return FlagPriority.PL; - if ("PM".equals(codeString)) - return FlagPriority.PM; - if ("PH".equals(codeString)) - return FlagPriority.PH; - throw new IllegalArgumentException("Unknown FlagPriority code '"+codeString+"'"); - } - - public String toCode(FlagPriority code) { - if (code == FlagPriority.PN) - return "PN"; - if (code == FlagPriority.PL) - return "PL"; - if (code == FlagPriority.PM) - return "PM"; - if (code == FlagPriority.PH) - return "PH"; - return "?"; - } - - public String toSystem(FlagPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditionsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditionsEnumFactory.java deleted file mode 100644 index b4d9f1ce7f4..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditionsEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class FmConditionsEnumFactory implements EnumFactory { - - public FmConditions fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("123987".equals(codeString)) - return FmConditions._123987; - throw new IllegalArgumentException("Unknown FmConditions code '"+codeString+"'"); - } - - public String toCode(FmConditions code) { - if (code == FmConditions._123987) - return "123987"; - return "?"; - } - - public String toSystem(FmConditions code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FormsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FormsEnumFactory.java deleted file mode 100644 index 9942f9ec301..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FormsEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class FormsEnumFactory implements EnumFactory { - - public Forms fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("1".equals(codeString)) - return Forms._1; - if ("2".equals(codeString)) - return Forms._2; - throw new IllegalArgumentException("Unknown Forms code '"+codeString+"'"); - } - - public String toCode(Forms code) { - if (code == Forms._1) - return "1"; - if (code == Forms._2) - return "2"; - return "?"; - } - - public String toSystem(Forms code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FundsreserveEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FundsreserveEnumFactory.java deleted file mode 100644 index b33f81c5428..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FundsreserveEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class FundsreserveEnumFactory implements EnumFactory { - - public Fundsreserve fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("patient".equals(codeString)) - return Fundsreserve.PATIENT; - if ("provider".equals(codeString)) - return Fundsreserve.PROVIDER; - if ("none".equals(codeString)) - return Fundsreserve.NONE; - throw new IllegalArgumentException("Unknown Fundsreserve code '"+codeString+"'"); - } - - public String toCode(Fundsreserve code) { - if (code == Fundsreserve.PATIENT) - return "patient"; - if (code == Fundsreserve.PROVIDER) - return "provider"; - if (code == Fundsreserve.NONE) - return "none"; - return "?"; - } - - public String toSystem(Fundsreserve code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatusEnumFactory.java deleted file mode 100644 index 0b18db7a424..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatusEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class GoalAcceptanceStatusEnumFactory implements EnumFactory { - - public GoalAcceptanceStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("agree".equals(codeString)) - return GoalAcceptanceStatus.AGREE; - if ("disagree".equals(codeString)) - return GoalAcceptanceStatus.DISAGREE; - if ("pending".equals(codeString)) - return GoalAcceptanceStatus.PENDING; - throw new IllegalArgumentException("Unknown GoalAcceptanceStatus code '"+codeString+"'"); - } - - public String toCode(GoalAcceptanceStatus code) { - if (code == GoalAcceptanceStatus.AGREE) - return "agree"; - if (code == GoalAcceptanceStatus.DISAGREE) - return "disagree"; - if (code == GoalAcceptanceStatus.PENDING) - return "pending"; - return "?"; - } - - public String toSystem(GoalAcceptanceStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategoryEnumFactory.java deleted file mode 100644 index 44c0c592ae3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategoryEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class GoalCategoryEnumFactory implements EnumFactory { - - public GoalCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("dietary".equals(codeString)) - return GoalCategory.DIETARY; - if ("safety".equals(codeString)) - return GoalCategory.SAFETY; - if ("behavioral".equals(codeString)) - return GoalCategory.BEHAVIORAL; - if ("nursing".equals(codeString)) - return GoalCategory.NURSING; - if ("physiotherapy".equals(codeString)) - return GoalCategory.PHYSIOTHERAPY; - throw new IllegalArgumentException("Unknown GoalCategory code '"+codeString+"'"); - } - - public String toCode(GoalCategory code) { - if (code == GoalCategory.DIETARY) - return "dietary"; - if (code == GoalCategory.SAFETY) - return "safety"; - if (code == GoalCategory.BEHAVIORAL) - return "behavioral"; - if (code == GoalCategory.NURSING) - return "nursing"; - if (code == GoalCategory.PHYSIOTHERAPY) - return "physiotherapy"; - return "?"; - } - - public String toSystem(GoalCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriorityEnumFactory.java deleted file mode 100644 index decf0a3dbdc..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriorityEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class GoalPriorityEnumFactory implements EnumFactory { - - public GoalPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("high".equals(codeString)) - return GoalPriority.HIGH; - if ("medium".equals(codeString)) - return GoalPriority.MEDIUM; - if ("low".equals(codeString)) - return GoalPriority.LOW; - throw new IllegalArgumentException("Unknown GoalPriority code '"+codeString+"'"); - } - - public String toCode(GoalPriority code) { - if (code == GoalPriority.HIGH) - return "high"; - if (code == GoalPriority.MEDIUM) - return "medium"; - if (code == GoalPriority.LOW) - return "low"; - return "?"; - } - - public String toSystem(GoalPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipTypeEnumFactory.java deleted file mode 100644 index 49eaf6caf0c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipTypeEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class GoalRelationshipTypeEnumFactory implements EnumFactory { - - public GoalRelationshipType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("predecessor".equals(codeString)) - return GoalRelationshipType.PREDECESSOR; - if ("successor".equals(codeString)) - return GoalRelationshipType.SUCCESSOR; - if ("replacement".equals(codeString)) - return GoalRelationshipType.REPLACEMENT; - if ("component".equals(codeString)) - return GoalRelationshipType.COMPONENT; - if ("other".equals(codeString)) - return GoalRelationshipType.OTHER; - throw new IllegalArgumentException("Unknown GoalRelationshipType code '"+codeString+"'"); - } - - public String toCode(GoalRelationshipType code) { - if (code == GoalRelationshipType.PREDECESSOR) - return "predecessor"; - if (code == GoalRelationshipType.SUCCESSOR) - return "successor"; - if (code == GoalRelationshipType.REPLACEMENT) - return "replacement"; - if (code == GoalRelationshipType.COMPONENT) - return "component"; - if (code == GoalRelationshipType.OTHER) - return "other"; - return "?"; - } - - public String toSystem(GoalRelationshipType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReasonEnumFactory.java deleted file mode 100644 index 889a95c46eb..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReasonEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class GoalStatusReasonEnumFactory implements EnumFactory { - - public GoalStatusReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("surgery".equals(codeString)) - return GoalStatusReason.SURGERY; - if ("life-event".equals(codeString)) - return GoalStatusReason.LIFEEVENT; - if ("replaced".equals(codeString)) - return GoalStatusReason.REPLACED; - if ("patient-request".equals(codeString)) - return GoalStatusReason.PATIENTREQUEST; - throw new IllegalArgumentException("Unknown GoalStatusReason code '"+codeString+"'"); - } - - public String toCode(GoalStatusReason code) { - if (code == GoalStatusReason.SURGERY) - return "surgery"; - if (code == GoalStatusReason.LIFEEVENT) - return "life-event"; - if (code == GoalStatusReason.REPLACED) - return "replaced"; - if (code == GoalStatusReason.PATIENTREQUEST) - return "patient-request"; - return "?"; - } - - public String toSystem(GoalStatusReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java deleted file mode 100644 index 541b3b5023a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ImmunizationRecommendationDateCriterionEnumFactory implements EnumFactory { - - public ImmunizationRecommendationDateCriterion fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("due".equals(codeString)) - return ImmunizationRecommendationDateCriterion.DUE; - if ("recommended".equals(codeString)) - return ImmunizationRecommendationDateCriterion.RECOMMENDED; - if ("earliest".equals(codeString)) - return ImmunizationRecommendationDateCriterion.EARLIEST; - if ("overdue".equals(codeString)) - return ImmunizationRecommendationDateCriterion.OVERDUE; - if ("latest".equals(codeString)) - return ImmunizationRecommendationDateCriterion.LATEST; - throw new IllegalArgumentException("Unknown ImmunizationRecommendationDateCriterion code '"+codeString+"'"); - } - - public String toCode(ImmunizationRecommendationDateCriterion code) { - if (code == ImmunizationRecommendationDateCriterion.DUE) - return "due"; - if (code == ImmunizationRecommendationDateCriterion.RECOMMENDED) - return "recommended"; - if (code == ImmunizationRecommendationDateCriterion.EARLIEST) - return "earliest"; - if (code == ImmunizationRecommendationDateCriterion.OVERDUE) - return "overdue"; - if (code == ImmunizationRecommendationDateCriterion.LATEST) - return "latest"; - return "?"; - } - - public String toSystem(ImmunizationRecommendationDateCriterion code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java deleted file mode 100644 index 61984b4a1ec..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ImmunizationRecommendationStatusEnumFactory implements EnumFactory { - - public ImmunizationRecommendationStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("due".equals(codeString)) - return ImmunizationRecommendationStatus.DUE; - if ("overdue".equals(codeString)) - return ImmunizationRecommendationStatus.OVERDUE; - throw new IllegalArgumentException("Unknown ImmunizationRecommendationStatus code '"+codeString+"'"); - } - - public String toCode(ImmunizationRecommendationStatus code) { - if (code == ImmunizationRecommendationStatus.DUE) - return "due"; - if (code == ImmunizationRecommendationStatus.OVERDUE) - return "overdue"; - return "?"; - } - - public String toSystem(ImmunizationRecommendationStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/InterventionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/InterventionEnumFactory.java deleted file mode 100644 index 6377a438e72..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/InterventionEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class InterventionEnumFactory implements EnumFactory { - - public Intervention fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("unknown".equals(codeString)) - return Intervention.UNKNOWN; - if ("other".equals(codeString)) - return Intervention.OTHER; - throw new IllegalArgumentException("Unknown Intervention code '"+codeString+"'"); - } - - public String toCode(Intervention code) { - if (code == Intervention.UNKNOWN) - return "unknown"; - if (code == Intervention.OTHER) - return "other"; - return "?"; - } - - public String toSystem(Intervention code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020AnswerlistEnumFactory.java deleted file mode 100644 index bec3f11508f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020AnswerlistEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class LOINC480020AnswerlistEnumFactory implements EnumFactory { - - public LOINC480020Answerlist fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("LA6683-2".equals(codeString)) - return LOINC480020Answerlist.LA66832; - if ("LA6684-0".equals(codeString)) - return LOINC480020Answerlist.LA66840; - if ("LA6685-7".equals(codeString)) - return LOINC480020Answerlist.LA66857; - if ("LA18194-3".equals(codeString)) - return LOINC480020Answerlist.LA181943; - if ("LA18195-0".equals(codeString)) - return LOINC480020Answerlist.LA181950; - if ("LA18196-8".equals(codeString)) - return LOINC480020Answerlist.LA181968; - if ("LA18197-6".equals(codeString)) - return LOINC480020Answerlist.LA181976; - throw new IllegalArgumentException("Unknown LOINC480020Answerlist code '"+codeString+"'"); - } - - public String toCode(LOINC480020Answerlist code) { - if (code == LOINC480020Answerlist.LA66832) - return "LA6683-2"; - if (code == LOINC480020Answerlist.LA66840) - return "LA6684-0"; - if (code == LOINC480020Answerlist.LA66857) - return "LA6685-7"; - if (code == LOINC480020Answerlist.LA181943) - return "LA18194-3"; - if (code == LOINC480020Answerlist.LA181950) - return "LA18195-0"; - if (code == LOINC480020Answerlist.LA181968) - return "LA18196-8"; - if (code == LOINC480020Answerlist.LA181976) - return "LA18197-6"; - return "?"; - } - - public String toSystem(LOINC480020Answerlist code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194AnswerlistEnumFactory.java deleted file mode 100644 index 7277982b4bf..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194AnswerlistEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class LOINC480194AnswerlistEnumFactory implements EnumFactory { - - public LOINC480194Answerlist fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("LA9658-1".equals(codeString)) - return LOINC480194Answerlist.LA96581; - if ("LA6692-3".equals(codeString)) - return LOINC480194Answerlist.LA66923; - if ("LA6686-5".equals(codeString)) - return LOINC480194Answerlist.LA66865; - if ("LA6687-3".equals(codeString)) - return LOINC480194Answerlist.LA66873; - if ("LA6688-1".equals(codeString)) - return LOINC480194Answerlist.LA66881; - if ("LA6689-9".equals(codeString)) - return LOINC480194Answerlist.LA66899; - if ("LA6690-7".equals(codeString)) - return LOINC480194Answerlist.LA66907; - throw new IllegalArgumentException("Unknown LOINC480194Answerlist code '"+codeString+"'"); - } - - public String toCode(LOINC480194Answerlist code) { - if (code == LOINC480194Answerlist.LA96581) - return "LA9658-1"; - if (code == LOINC480194Answerlist.LA66923) - return "LA6692-3"; - if (code == LOINC480194Answerlist.LA66865) - return "LA6686-5"; - if (code == LOINC480194Answerlist.LA66873) - return "LA6687-3"; - if (code == LOINC480194Answerlist.LA66881) - return "LA6688-1"; - if (code == LOINC480194Answerlist.LA66899) - return "LA6689-9"; - if (code == LOINC480194Answerlist.LA66907) - return "LA6690-7"; - return "?"; - } - - public String toSystem(LOINC480194Answerlist code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345AnswerlistEnumFactory.java deleted file mode 100644 index 2fc040ed386..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345AnswerlistEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class LOINC530345AnswerlistEnumFactory implements EnumFactory { - - public LOINC530345Answerlist fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("LA6703-8".equals(codeString)) - return LOINC530345Answerlist.LA67038; - if ("LA6704-6".equals(codeString)) - return LOINC530345Answerlist.LA67046; - if ("LA6705-3".equals(codeString)) - return LOINC530345Answerlist.LA67053; - if ("LA6706-1".equals(codeString)) - return LOINC530345Answerlist.LA67061; - if ("LA6707-9".equals(codeString)) - return LOINC530345Answerlist.LA67079; - throw new IllegalArgumentException("Unknown LOINC530345Answerlist code '"+codeString+"'"); - } - - public String toCode(LOINC530345Answerlist code) { - if (code == LOINC530345Answerlist.LA67038) - return "LA6703-8"; - if (code == LOINC530345Answerlist.LA67046) - return "LA6704-6"; - if (code == LOINC530345Answerlist.LA67053) - return "LA6705-3"; - if (code == LOINC530345Answerlist.LA67061) - return "LA6706-1"; - if (code == LOINC530345Answerlist.LA67079) - return "LA6707-9"; - return "?"; - } - - public String toSystem(LOINC530345Answerlist code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378AnswerlistEnumFactory.java deleted file mode 100644 index 311e6f700ca..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378AnswerlistEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class LOINC530378AnswerlistEnumFactory implements EnumFactory { - - public LOINC530378Answerlist fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("LA6668-3".equals(codeString)) - return LOINC530378Answerlist.LA66683; - if ("LA6669-1".equals(codeString)) - return LOINC530378Answerlist.LA66691; - if ("LA6682-4".equals(codeString)) - return LOINC530378Answerlist.LA66824; - if ("LA6675-8".equals(codeString)) - return LOINC530378Answerlist.LA66758; - if ("LA6674-1".equals(codeString)) - return LOINC530378Answerlist.LA66741; - throw new IllegalArgumentException("Unknown LOINC530378Answerlist code '"+codeString+"'"); - } - - public String toCode(LOINC530378Answerlist code) { - if (code == LOINC530378Answerlist.LA66683) - return "LA6668-3"; - if (code == LOINC530378Answerlist.LA66691) - return "LA6669-1"; - if (code == LOINC530378Answerlist.LA66824) - return "LA6682-4"; - if (code == LOINC530378Answerlist.LA66758) - return "LA6675-8"; - if (code == LOINC530378Answerlist.LA66741) - return "LA6674-1"; - return "?"; - } - - public String toSystem(LOINC530378Answerlist code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReasonEnumFactory.java deleted file mode 100644 index 90850f247c0..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReasonEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ListEmptyReasonEnumFactory implements EnumFactory { - - public ListEmptyReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("nilknown".equals(codeString)) - return ListEmptyReason.NILKNOWN; - if ("notasked".equals(codeString)) - return ListEmptyReason.NOTASKED; - if ("withheld".equals(codeString)) - return ListEmptyReason.WITHHELD; - if ("unavailable".equals(codeString)) - return ListEmptyReason.UNAVAILABLE; - if ("notstarted".equals(codeString)) - return ListEmptyReason.NOTSTARTED; - if ("closed".equals(codeString)) - return ListEmptyReason.CLOSED; - throw new IllegalArgumentException("Unknown ListEmptyReason code '"+codeString+"'"); - } - - public String toCode(ListEmptyReason code) { - if (code == ListEmptyReason.NILKNOWN) - return "nilknown"; - if (code == ListEmptyReason.NOTASKED) - return "notasked"; - if (code == ListEmptyReason.WITHHELD) - return "withheld"; - if (code == ListEmptyReason.UNAVAILABLE) - return "unavailable"; - if (code == ListEmptyReason.NOTSTARTED) - return "notstarted"; - if (code == ListEmptyReason.CLOSED) - return "closed"; - return "?"; - } - - public String toSystem(ListEmptyReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlagEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlagEnumFactory.java deleted file mode 100644 index 4d65da71ae8..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlagEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ListItemFlagEnumFactory implements EnumFactory { - - public ListItemFlag fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("01".equals(codeString)) - return ListItemFlag._01; - if ("02".equals(codeString)) - return ListItemFlag._02; - if ("03".equals(codeString)) - return ListItemFlag._03; - if ("04".equals(codeString)) - return ListItemFlag._04; - if ("05".equals(codeString)) - return ListItemFlag._05; - if ("06".equals(codeString)) - return ListItemFlag._06; - throw new IllegalArgumentException("Unknown ListItemFlag code '"+codeString+"'"); - } - - public String toCode(ListItemFlag code) { - if (code == ListItemFlag._01) - return "01"; - if (code == ListItemFlag._02) - return "02"; - if (code == ListItemFlag._03) - return "03"; - if (code == ListItemFlag._04) - return "04"; - if (code == ListItemFlag._05) - return "05"; - if (code == ListItemFlag._06) - return "06"; - return "?"; - } - - public String toSystem(ListItemFlag code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrderEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrderEnumFactory.java deleted file mode 100644 index 66ebcc3923a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrderEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ListOrderEnumFactory implements EnumFactory { - - public ListOrder fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("user".equals(codeString)) - return ListOrder.USER; - if ("system".equals(codeString)) - return ListOrder.SYSTEM; - if ("event-date".equals(codeString)) - return ListOrder.EVENTDATE; - if ("entry-date".equals(codeString)) - return ListOrder.ENTRYDATE; - if ("priority".equals(codeString)) - return ListOrder.PRIORITY; - if ("alphabetic".equals(codeString)) - return ListOrder.ALPHABETIC; - if ("category".equals(codeString)) - return ListOrder.CATEGORY; - if ("patient".equals(codeString)) - return ListOrder.PATIENT; - throw new IllegalArgumentException("Unknown ListOrder code '"+codeString+"'"); - } - - public String toCode(ListOrder code) { - if (code == ListOrder.USER) - return "user"; - if (code == ListOrder.SYSTEM) - return "system"; - if (code == ListOrder.EVENTDATE) - return "event-date"; - if (code == ListOrder.ENTRYDATE) - return "entry-date"; - if (code == ListOrder.PRIORITY) - return "priority"; - if (code == ListOrder.ALPHABETIC) - return "alphabetic"; - if (code == ListOrder.CATEGORY) - return "category"; - if (code == ListOrder.PATIENT) - return "patient"; - return "?"; - } - - public String toSystem(ListOrder code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounterEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounterEnumFactory.java deleted file mode 100644 index 99cadbe41c6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounterEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class MessageReasonEncounterEnumFactory implements EnumFactory { - - public MessageReasonEncounter fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("admit".equals(codeString)) - return MessageReasonEncounter.ADMIT; - if ("discharge".equals(codeString)) - return MessageReasonEncounter.DISCHARGE; - if ("absent".equals(codeString)) - return MessageReasonEncounter.ABSENT; - if ("return".equals(codeString)) - return MessageReasonEncounter.RETURN; - if ("moved".equals(codeString)) - return MessageReasonEncounter.MOVED; - if ("edit".equals(codeString)) - return MessageReasonEncounter.EDIT; - throw new IllegalArgumentException("Unknown MessageReasonEncounter code '"+codeString+"'"); - } - - public String toCode(MessageReasonEncounter code) { - if (code == MessageReasonEncounter.ADMIT) - return "admit"; - if (code == MessageReasonEncounter.DISCHARGE) - return "discharge"; - if (code == MessageReasonEncounter.ABSENT) - return "absent"; - if (code == MessageReasonEncounter.RETURN) - return "return"; - if (code == MessageReasonEncounter.MOVED) - return "moved"; - if (code == MessageReasonEncounter.EDIT) - return "edit"; - return "?"; - } - - public String toSystem(MessageReasonEncounter code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransportEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransportEnumFactory.java deleted file mode 100644 index 56f6ce463cc..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransportEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class MessageTransportEnumFactory implements EnumFactory { - - public MessageTransport fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("http".equals(codeString)) - return MessageTransport.HTTP; - if ("ftp".equals(codeString)) - return MessageTransport.FTP; - if ("mllp".equals(codeString)) - return MessageTransport.MLLP; - throw new IllegalArgumentException("Unknown MessageTransport code '"+codeString+"'"); - } - - public String toCode(MessageTransport code) { - if (code == MessageTransport.HTTP) - return "http"; - if (code == MessageTransport.FTP) - return "ftp"; - if (code == MessageTransport.MLLP) - return "mllp"; - return "?"; - } - - public String toSystem(MessageTransport code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReasonEnumFactory.java deleted file mode 100644 index ee6accdbf8b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReasonEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class MissingToothReasonEnumFactory implements EnumFactory { - - public MissingToothReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("E".equals(codeString)) - return MissingToothReason.E; - if ("C".equals(codeString)) - return MissingToothReason.C; - if ("U".equals(codeString)) - return MissingToothReason.U; - if ("O".equals(codeString)) - return MissingToothReason.O; - throw new IllegalArgumentException("Unknown MissingToothReason code '"+codeString+"'"); - } - - public String toCode(MissingToothReason code) { - if (code == MissingToothReason.E) - return "E"; - if (code == MissingToothReason.C) - return "C"; - if (code == MissingToothReason.U) - return "U"; - if (code == MissingToothReason.O) - return "O"; - return "?"; - } - - public String toSystem(MissingToothReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectTypeEnumFactory.java deleted file mode 100644 index 3bd955a5e3d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectTypeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ObjectTypeEnumFactory implements EnumFactory { - - public ObjectType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("1".equals(codeString)) - return ObjectType._1; - if ("2".equals(codeString)) - return ObjectType._2; - if ("3".equals(codeString)) - return ObjectType._3; - if ("4".equals(codeString)) - return ObjectType._4; - throw new IllegalArgumentException("Unknown ObjectType code '"+codeString+"'"); - } - - public String toCode(ObjectType code) { - if (code == ObjectType._1) - return "1"; - if (code == ObjectType._2) - return "2"; - if (code == ObjectType._3) - return "3"; - if (code == ObjectType._4) - return "4"; - return "?"; - } - - public String toSystem(ObjectType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategoryEnumFactory.java deleted file mode 100644 index 8a7a3ce9a50..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategoryEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ObservationCategoryEnumFactory implements EnumFactory { - - public ObservationCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("social-history".equals(codeString)) - return ObservationCategory.SOCIALHISTORY; - if ("vital-signs".equals(codeString)) - return ObservationCategory.VITALSIGNS; - if ("imaging".equals(codeString)) - return ObservationCategory.IMAGING; - if ("laboratory".equals(codeString)) - return ObservationCategory.LABORATORY; - if ("procedure".equals(codeString)) - return ObservationCategory.PROCEDURE; - if ("survey".equals(codeString)) - return ObservationCategory.SURVEY; - if ("exam".equals(codeString)) - return ObservationCategory.EXAM; - if ("therapy".equals(codeString)) - return ObservationCategory.THERAPY; - throw new IllegalArgumentException("Unknown ObservationCategory code '"+codeString+"'"); - } - - public String toCode(ObservationCategory code) { - if (code == ObservationCategory.SOCIALHISTORY) - return "social-history"; - if (code == ObservationCategory.VITALSIGNS) - return "vital-signs"; - if (code == ObservationCategory.IMAGING) - return "imaging"; - if (code == ObservationCategory.LABORATORY) - return "laboratory"; - if (code == ObservationCategory.PROCEDURE) - return "procedure"; - if (code == ObservationCategory.SURVEY) - return "survey"; - if (code == ObservationCategory.EXAM) - return "exam"; - if (code == ObservationCategory.THERAPY) - return "therapy"; - return "?"; - } - - public String toSystem(ObservationCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterialEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterialEnumFactory.java deleted file mode 100644 index fd1bd0d5c65..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterialEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class OralProsthodonticMaterialEnumFactory implements EnumFactory { - - public OralProsthodonticMaterial fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("1".equals(codeString)) - return OralProsthodonticMaterial._1; - if ("2".equals(codeString)) - return OralProsthodonticMaterial._2; - if ("3".equals(codeString)) - return OralProsthodonticMaterial._3; - if ("4".equals(codeString)) - return OralProsthodonticMaterial._4; - throw new IllegalArgumentException("Unknown OralProsthodonticMaterial code '"+codeString+"'"); - } - - public String toCode(OralProsthodonticMaterial code) { - if (code == OralProsthodonticMaterial._1) - return "1"; - if (code == OralProsthodonticMaterial._2) - return "2"; - if (code == OralProsthodonticMaterial._3) - return "3"; - if (code == OralProsthodonticMaterial._4) - return "4"; - return "?"; - } - - public String toSystem(OralProsthodonticMaterial code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatchEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatchEnumFactory.java deleted file mode 100644 index 347ed51ad57..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatchEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PatientMpiMatchEnumFactory implements EnumFactory { - - public PatientMpiMatch fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("certain".equals(codeString)) - return PatientMpiMatch.CERTAIN; - if ("probable".equals(codeString)) - return PatientMpiMatch.PROBABLE; - if ("possible".equals(codeString)) - return PatientMpiMatch.POSSIBLE; - if ("certainly-not".equals(codeString)) - return PatientMpiMatch.CERTAINLYNOT; - throw new IllegalArgumentException("Unknown PatientMpiMatch code '"+codeString+"'"); - } - - public String toCode(PatientMpiMatch code) { - if (code == PatientMpiMatch.CERTAIN) - return "certain"; - if (code == PatientMpiMatch.PROBABLE) - return "probable"; - if (code == PatientMpiMatch.POSSIBLE) - return "possible"; - if (code == PatientMpiMatch.CERTAINLYNOT) - return "certainly-not"; - return "?"; - } - - public String toSystem(PatientMpiMatch code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PayeetypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PayeetypeEnumFactory.java deleted file mode 100644 index 36d21b9277a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PayeetypeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PayeetypeEnumFactory implements EnumFactory { - - public Payeetype fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("subscriber".equals(codeString)) - return Payeetype.SUBSCRIBER; - if ("provider".equals(codeString)) - return Payeetype.PROVIDER; - if ("other".equals(codeString)) - return Payeetype.OTHER; - throw new IllegalArgumentException("Unknown Payeetype code '"+codeString+"'"); - } - - public String toCode(Payeetype code) { - if (code == Payeetype.SUBSCRIBER) - return "subscriber"; - if (code == Payeetype.PROVIDER) - return "provider"; - if (code == Payeetype.OTHER) - return "other"; - return "?"; - } - - public String toSystem(Payeetype code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReasonEnumFactory.java deleted file mode 100644 index 749688b5860..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReasonEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PaymentAdjustmentReasonEnumFactory implements EnumFactory { - - public PaymentAdjustmentReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("a001".equals(codeString)) - return PaymentAdjustmentReason.A001; - if ("a002".equals(codeString)) - return PaymentAdjustmentReason.A002; - throw new IllegalArgumentException("Unknown PaymentAdjustmentReason code '"+codeString+"'"); - } - - public String toCode(PaymentAdjustmentReason code) { - if (code == PaymentAdjustmentReason.A001) - return "a001"; - if (code == PaymentAdjustmentReason.A002) - return "a002"; - return "?"; - } - - public String toSystem(PaymentAdjustmentReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatusEnumFactory.java deleted file mode 100644 index 3d4c5c59a94..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatusEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PaymentStatusEnumFactory implements EnumFactory { - - public PaymentStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("paid".equals(codeString)) - return PaymentStatus.PAID; - if ("cleared".equals(codeString)) - return PaymentStatus.CLEARED; - throw new IllegalArgumentException("Unknown PaymentStatus code '"+codeString+"'"); - } - - public String toCode(PaymentStatus code) { - if (code == PaymentStatus.PAID) - return "paid"; - if (code == PaymentStatus.CLEARED) - return "cleared"; - return "?"; - } - - public String toSystem(PaymentStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentTypeEnumFactory.java deleted file mode 100644 index cc8ab2d81f1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentTypeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PaymentTypeEnumFactory implements EnumFactory { - - public PaymentType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("payment".equals(codeString)) - return PaymentType.PAYMENT; - if ("adjustment".equals(codeString)) - return PaymentType.ADJUSTMENT; - if ("advance".equals(codeString)) - return PaymentType.ADVANCE; - throw new IllegalArgumentException("Unknown PaymentType code '"+codeString+"'"); - } - - public String toCode(PaymentType code) { - if (code == PaymentType.PAYMENT) - return "payment"; - if (code == PaymentType.ADJUSTMENT) - return "adjustment"; - if (code == PaymentType.ADVANCE) - return "advance"; - return "?"; - } - - public String toSystem(PaymentType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRoleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRoleEnumFactory.java deleted file mode 100644 index 0475c2b5ef3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRoleEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PractitionerRoleEnumFactory implements EnumFactory { - - public PractitionerRole fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("doctor".equals(codeString)) - return PractitionerRole.DOCTOR; - if ("nurse".equals(codeString)) - return PractitionerRole.NURSE; - if ("pharmacist".equals(codeString)) - return PractitionerRole.PHARMACIST; - if ("researcher".equals(codeString)) - return PractitionerRole.RESEARCHER; - if ("teacher".equals(codeString)) - return PractitionerRole.TEACHER; - if ("ict".equals(codeString)) - return PractitionerRole.ICT; - throw new IllegalArgumentException("Unknown PractitionerRole code '"+codeString+"'"); - } - - public String toCode(PractitionerRole code) { - if (code == PractitionerRole.DOCTOR) - return "doctor"; - if (code == PractitionerRole.NURSE) - return "nurse"; - if (code == PractitionerRole.PHARMACIST) - return "pharmacist"; - if (code == PractitionerRole.RESEARCHER) - return "researcher"; - if (code == PractitionerRole.TEACHER) - return "teacher"; - if (code == PractitionerRole.ICT) - return "ict"; - return "?"; - } - - public String toSystem(PractitionerRole code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialtyEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialtyEnumFactory.java deleted file mode 100644 index 9c7a2da43f2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialtyEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class PractitionerSpecialtyEnumFactory implements EnumFactory { - - public PractitionerSpecialty fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("cardio".equals(codeString)) - return PractitionerSpecialty.CARDIO; - if ("dent".equals(codeString)) - return PractitionerSpecialty.DENT; - if ("dietary".equals(codeString)) - return PractitionerSpecialty.DIETARY; - if ("midw".equals(codeString)) - return PractitionerSpecialty.MIDW; - if ("sysarch".equals(codeString)) - return PractitionerSpecialty.SYSARCH; - throw new IllegalArgumentException("Unknown PractitionerSpecialty code '"+codeString+"'"); - } - - public String toCode(PractitionerSpecialty code) { - if (code == PractitionerSpecialty.CARDIO) - return "cardio"; - if (code == PractitionerSpecialty.DENT) - return "dent"; - if (code == PractitionerSpecialty.DIETARY) - return "dietary"; - if (code == PractitionerSpecialty.MIDW) - return "midw"; - if (code == PractitionerSpecialty.SYSARCH) - return "sysarch"; - return "?"; - } - - public String toSystem(PractitionerSpecialty code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java deleted file mode 100644 index 73e4a20caa9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ProcedureProgressStatusCodesEnumFactory implements EnumFactory { - - public ProcedureProgressStatusCodes fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("a".equals(codeString)) - return ProcedureProgressStatusCodes.A; - if ("b".equals(codeString)) - return ProcedureProgressStatusCodes.B; - if ("c".equals(codeString)) - return ProcedureProgressStatusCodes.C; - if ("d".equals(codeString)) - return ProcedureProgressStatusCodes.D; - if ("e".equals(codeString)) - return ProcedureProgressStatusCodes.E; - if ("f".equals(codeString)) - return ProcedureProgressStatusCodes.F; - throw new IllegalArgumentException("Unknown ProcedureProgressStatusCodes code '"+codeString+"'"); - } - - public String toCode(ProcedureProgressStatusCodes code) { - if (code == ProcedureProgressStatusCodes.A) - return "a"; - if (code == ProcedureProgressStatusCodes.B) - return "b"; - if (code == ProcedureProgressStatusCodes.C) - return "c"; - if (code == ProcedureProgressStatusCodes.D) - return "d"; - if (code == ProcedureProgressStatusCodes.E) - return "e"; - if (code == ProcedureProgressStatusCodes.F) - return "f"; - return "?"; - } - - public String toSystem(ProcedureProgressStatusCodes code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipTypeEnumFactory.java deleted file mode 100644 index 68dfe0bdcf1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipTypeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ProcedureRelationshipTypeEnumFactory implements EnumFactory { - - public ProcedureRelationshipType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("caused-by".equals(codeString)) - return ProcedureRelationshipType.CAUSEDBY; - if ("because-of".equals(codeString)) - return ProcedureRelationshipType.BECAUSEOF; - throw new IllegalArgumentException("Unknown ProcedureRelationshipType code '"+codeString+"'"); - } - - public String toCode(ProcedureRelationshipType code) { - if (code == ProcedureRelationshipType.CAUSEDBY) - return "caused-by"; - if (code == ProcedureRelationshipType.BECAUSEOF) - return "because-of"; - return "?"; - } - - public String toSystem(ProcedureRelationshipType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcomeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcomeEnumFactory.java deleted file mode 100644 index 85ae04ab0dd..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcomeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ProcessOutcomeEnumFactory implements EnumFactory { - - public ProcessOutcome fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("complete".equals(codeString)) - return ProcessOutcome.COMPLETE; - if ("pended".equals(codeString)) - return ProcessOutcome.PENDED; - if ("error".equals(codeString)) - return ProcessOutcome.ERROR; - throw new IllegalArgumentException("Unknown ProcessOutcome code '"+codeString+"'"); - } - - public String toCode(ProcessOutcome code) { - if (code == ProcessOutcome.COMPLETE) - return "complete"; - if (code == ProcessOutcome.PENDED) - return "pended"; - if (code == ProcessOutcome.ERROR) - return "error"; - return "?"; - } - - public String toSystem(ProcessOutcome code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriorityEnumFactory.java deleted file mode 100644 index f094988735c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriorityEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ProcessPriorityEnumFactory implements EnumFactory { - - public ProcessPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("stat".equals(codeString)) - return ProcessPriority.STAT; - if ("normal".equals(codeString)) - return ProcessPriority.NORMAL; - if ("deferred".equals(codeString)) - return ProcessPriority.DEFERRED; - throw new IllegalArgumentException("Unknown ProcessPriority code '"+codeString+"'"); - } - - public String toCode(ProcessPriority code) { - if (code == ProcessPriority.STAT) - return "stat"; - if (code == ProcessPriority.NORMAL) - return "normal"; - if (code == ProcessPriority.DEFERRED) - return "deferred"; - return "?"; - } - - public String toSystem(ProcessPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentTypeEnumFactory.java deleted file mode 100644 index 2352515000b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentTypeEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ProvenanceAgentTypeEnumFactory implements EnumFactory { - - public ProvenanceAgentType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("person".equals(codeString)) - return ProvenanceAgentType.PERSON; - if ("practitioner".equals(codeString)) - return ProvenanceAgentType.PRACTITIONER; - if ("organization".equals(codeString)) - return ProvenanceAgentType.ORGANIZATION; - if ("software".equals(codeString)) - return ProvenanceAgentType.SOFTWARE; - if ("patient".equals(codeString)) - return ProvenanceAgentType.PATIENT; - if ("device".equals(codeString)) - return ProvenanceAgentType.DEVICE; - if ("related-person".equals(codeString)) - return ProvenanceAgentType.RELATEDPERSON; - throw new IllegalArgumentException("Unknown ProvenanceAgentType code '"+codeString+"'"); - } - - public String toCode(ProvenanceAgentType code) { - if (code == ProvenanceAgentType.PERSON) - return "person"; - if (code == ProvenanceAgentType.PRACTITIONER) - return "practitioner"; - if (code == ProvenanceAgentType.ORGANIZATION) - return "organization"; - if (code == ProvenanceAgentType.SOFTWARE) - return "software"; - if (code == ProvenanceAgentType.PATIENT) - return "patient"; - if (code == ProvenanceAgentType.DEVICE) - return "device"; - if (code == ProvenanceAgentType.RELATEDPERSON) - return "related-person"; - return "?"; - } - - public String toSystem(ProvenanceAgentType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccursEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccursEnumFactory.java deleted file mode 100644 index 9df57543636..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccursEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class QuestionMaxOccursEnumFactory implements EnumFactory { - - public QuestionMaxOccurs fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("*".equals(codeString)) - return QuestionMaxOccurs.ASTERISK; - throw new IllegalArgumentException("Unknown QuestionMaxOccurs code '"+codeString+"'"); - } - - public String toCode(QuestionMaxOccurs code) { - if (code == QuestionMaxOccurs.ASTERISK) - return "*"; - return "?"; - } - - public String toSystem(QuestionMaxOccurs code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java deleted file mode 100644 index c0bbd211e64..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class QuestionnaireDisplayCategoryEnumFactory implements EnumFactory { - - public QuestionnaireDisplayCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("instructions".equals(codeString)) - return QuestionnaireDisplayCategory.INSTRUCTIONS; - if ("security".equals(codeString)) - return QuestionnaireDisplayCategory.SECURITY; - throw new IllegalArgumentException("Unknown QuestionnaireDisplayCategory code '"+codeString+"'"); - } - - public String toCode(QuestionnaireDisplayCategory code) { - if (code == QuestionnaireDisplayCategory.INSTRUCTIONS) - return "instructions"; - if (code == QuestionnaireDisplayCategory.SECURITY) - return "security"; - return "?"; - } - - public String toSystem(QuestionnaireDisplayCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java deleted file mode 100644 index c740991f9e8..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ReasonMedicationGivenCodesEnumFactory implements EnumFactory { - - public ReasonMedicationGivenCodes fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("a".equals(codeString)) - return ReasonMedicationGivenCodes.A; - if ("b".equals(codeString)) - return ReasonMedicationGivenCodes.B; - if ("c".equals(codeString)) - return ReasonMedicationGivenCodes.C; - throw new IllegalArgumentException("Unknown ReasonMedicationGivenCodes code '"+codeString+"'"); - } - - public String toCode(ReasonMedicationGivenCodes code) { - if (code == ReasonMedicationGivenCodes.A) - return "a"; - if (code == ReasonMedicationGivenCodes.B) - return "b"; - if (code == ReasonMedicationGivenCodes.C) - return "c"; - return "?"; - } - - public String toSystem(ReasonMedicationGivenCodes code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java deleted file mode 100644 index b3ac81e1f22..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ReasonMedicationNotGivenCodesEnumFactory implements EnumFactory { - - public ReasonMedicationNotGivenCodes fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("a".equals(codeString)) - return ReasonMedicationNotGivenCodes.A; - if ("b".equals(codeString)) - return ReasonMedicationNotGivenCodes.B; - if ("c".equals(codeString)) - return ReasonMedicationNotGivenCodes.C; - if ("d".equals(codeString)) - return ReasonMedicationNotGivenCodes.D; - throw new IllegalArgumentException("Unknown ReasonMedicationNotGivenCodes code '"+codeString+"'"); - } - - public String toCode(ReasonMedicationNotGivenCodes code) { - if (code == ReasonMedicationNotGivenCodes.A) - return "a"; - if (code == ReasonMedicationNotGivenCodes.B) - return "b"; - if (code == ReasonMedicationNotGivenCodes.C) - return "c"; - if (code == ReasonMedicationNotGivenCodes.D) - return "d"; - return "?"; - } - - public String toSystem(ReasonMedicationNotGivenCodes code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RelationshipEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RelationshipEnumFactory.java deleted file mode 100644 index 61604502e2d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RelationshipEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class RelationshipEnumFactory implements EnumFactory { - - public Relationship fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("1".equals(codeString)) - return Relationship._1; - if ("2".equals(codeString)) - return Relationship._2; - if ("3".equals(codeString)) - return Relationship._3; - if ("4".equals(codeString)) - return Relationship._4; - if ("5".equals(codeString)) - return Relationship._5; - throw new IllegalArgumentException("Unknown Relationship code '"+codeString+"'"); - } - - public String toCode(Relationship code) { - if (code == Relationship._1) - return "1"; - if (code == Relationship._2) - return "2"; - if (code == Relationship._3) - return "3"; - if (code == Relationship._4) - return "4"; - if (code == Relationship._5) - return "5"; - return "?"; - } - - public String toSystem(Relationship code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationModeEnumFactory.java deleted file mode 100644 index 9c53d1219d8..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationModeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ResourceValidationModeEnumFactory implements EnumFactory { - - public ResourceValidationMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("create".equals(codeString)) - return ResourceValidationMode.CREATE; - if ("update".equals(codeString)) - return ResourceValidationMode.UPDATE; - if ("delete".equals(codeString)) - return ResourceValidationMode.DELETE; - throw new IllegalArgumentException("Unknown ResourceValidationMode code '"+codeString+"'"); - } - - public String toCode(ResourceValidationMode code) { - if (code == ResourceValidationMode.CREATE) - return "create"; - if (code == ResourceValidationMode.UPDATE) - return "update"; - if (code == ResourceValidationMode.DELETE) - return "delete"; - return "?"; - } - - public String toSystem(ResourceValidationMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityServiceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityServiceEnumFactory.java deleted file mode 100644 index 2ff5af00322..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityServiceEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class RestfulSecurityServiceEnumFactory implements EnumFactory { - - public RestfulSecurityService fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("OAuth".equals(codeString)) - return RestfulSecurityService.OAUTH; - if ("SMART-on-FHIR".equals(codeString)) - return RestfulSecurityService.SMARTONFHIR; - if ("NTLM".equals(codeString)) - return RestfulSecurityService.NTLM; - if ("Basic".equals(codeString)) - return RestfulSecurityService.BASIC; - if ("Kerberos".equals(codeString)) - return RestfulSecurityService.KERBEROS; - if ("Certificates".equals(codeString)) - return RestfulSecurityService.CERTIFICATES; - throw new IllegalArgumentException("Unknown RestfulSecurityService code '"+codeString+"'"); - } - - public String toCode(RestfulSecurityService code) { - if (code == RestfulSecurityService.OAUTH) - return "OAuth"; - if (code == RestfulSecurityService.SMARTONFHIR) - return "SMART-on-FHIR"; - if (code == RestfulSecurityService.NTLM) - return "NTLM"; - if (code == RestfulSecurityService.BASIC) - return "Basic"; - if (code == RestfulSecurityService.KERBEROS) - return "Kerberos"; - if (code == RestfulSecurityService.CERTIFICATES) - return "Certificates"; - return "?"; - } - - public String toSystem(RestfulSecurityService code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbabilityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbabilityEnumFactory.java deleted file mode 100644 index 0da42e1ffda..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbabilityEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class RiskProbabilityEnumFactory implements EnumFactory { - - public RiskProbability fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("negligible".equals(codeString)) - return RiskProbability.NEGLIGIBLE; - if ("low".equals(codeString)) - return RiskProbability.LOW; - if ("moderate".equals(codeString)) - return RiskProbability.MODERATE; - if ("high".equals(codeString)) - return RiskProbability.HIGH; - if ("certain".equals(codeString)) - return RiskProbability.CERTAIN; - throw new IllegalArgumentException("Unknown RiskProbability code '"+codeString+"'"); - } - - public String toCode(RiskProbability code) { - if (code == RiskProbability.NEGLIGIBLE) - return "negligible"; - if (code == RiskProbability.LOW) - return "low"; - if (code == RiskProbability.MODERATE) - return "moderate"; - if (code == RiskProbability.HIGH) - return "high"; - if (code == RiskProbability.CERTAIN) - return "certain"; - return "?"; - } - - public String toSystem(RiskProbability code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RulesetEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RulesetEnumFactory.java deleted file mode 100644 index 6bf54082637..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RulesetEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class RulesetEnumFactory implements EnumFactory { - - public Ruleset fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("x12-4010".equals(codeString)) - return Ruleset.X124010; - if ("x12-5010".equals(codeString)) - return Ruleset.X125010; - if ("x12-7010".equals(codeString)) - return Ruleset.X127010; - if ("cdanet-v2".equals(codeString)) - return Ruleset.CDANETV2; - if ("cdanet-v4".equals(codeString)) - return Ruleset.CDANETV4; - if ("cpha-3".equals(codeString)) - return Ruleset.CPHA3; - throw new IllegalArgumentException("Unknown Ruleset code '"+codeString+"'"); - } - - public String toCode(Ruleset code) { - if (code == Ruleset.X124010) - return "x12-4010"; - if (code == Ruleset.X125010) - return "x12-5010"; - if (code == Ruleset.X127010) - return "x12-7010"; - if (code == Ruleset.CDANETV2) - return "cdanet-v2"; - if (code == Ruleset.CDANETV4) - return "cdanet-v4"; - if (code == Ruleset.CPHA3) - return "cpha-3"; - return "?"; - } - - public String toSystem(Ruleset code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacyEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacyEnumFactory.java deleted file mode 100644 index 232d11b0775..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacyEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ServicePharmacyEnumFactory implements EnumFactory { - - public ServicePharmacy fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("smokecess".equals(codeString)) - return ServicePharmacy.SMOKECESS; - if ("flushot".equals(codeString)) - return ServicePharmacy.FLUSHOT; - throw new IllegalArgumentException("Unknown ServicePharmacy code '"+codeString+"'"); - } - - public String toCode(ServicePharmacy code) { - if (code == ServicePharmacy.SMOKECESS) - return "smokecess"; - if (code == ServicePharmacy.FLUSHOT) - return "flushot"; - return "?"; - } - - public String toSystem(ServicePharmacy code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlaceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlaceEnumFactory.java deleted file mode 100644 index 259a54f33d0..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlaceEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ServicePlaceEnumFactory implements EnumFactory { - - public ServicePlace fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("emergency".equals(codeString)) - return ServicePlace.EMERGENCY; - if ("clinic".equals(codeString)) - return ServicePlace.CLINIC; - throw new IllegalArgumentException("Unknown ServicePlace code '"+codeString+"'"); - } - - public String toCode(ServicePlace code) { - if (code == ServicePlace.EMERGENCY) - return "emergency"; - if (code == ServicePlace.CLINIC) - return "clinic"; - return "?"; - } - - public String toSystem(ServicePlace code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProductEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProductEnumFactory.java deleted file mode 100644 index 209efda8811..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProductEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ServiceProductEnumFactory implements EnumFactory { - - public ServiceProduct fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("exam".equals(codeString)) - return ServiceProduct.EXAM; - if ("flushot".equals(codeString)) - return ServiceProduct.FLUSHOT; - throw new IllegalArgumentException("Unknown ServiceProduct code '"+codeString+"'"); - } - - public String toCode(ServiceProduct code) { - if (code == ServiceProduct.EXAM) - return "exam"; - if (code == ServiceProduct.FLUSHOT) - return "flushot"; - return "?"; - } - - public String toSystem(ServiceProduct code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditionsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditionsEnumFactory.java deleted file mode 100644 index fd9a2c6cd17..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditionsEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ServiceProvisionConditionsEnumFactory implements EnumFactory { - - public ServiceProvisionConditions fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("free".equals(codeString)) - return ServiceProvisionConditions.FREE; - if ("disc".equals(codeString)) - return ServiceProvisionConditions.DISC; - if ("cost".equals(codeString)) - return ServiceProvisionConditions.COST; - throw new IllegalArgumentException("Unknown ServiceProvisionConditions code '"+codeString+"'"); - } - - public String toCode(ServiceProvisionConditions code) { - if (code == ServiceProvisionConditions.FREE) - return "free"; - if (code == ServiceProvisionConditions.DISC) - return "disc"; - if (code == ServiceProvisionConditions.COST) - return "cost"; - return "?"; - } - - public String toSystem(ServiceProvisionConditions code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethodEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethodEnumFactory.java deleted file mode 100644 index 80491a0eb2f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethodEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class ServiceReferralMethodEnumFactory implements EnumFactory { - - public ServiceReferralMethod fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("fax".equals(codeString)) - return ServiceReferralMethod.FAX; - if ("phone".equals(codeString)) - return ServiceReferralMethod.PHONE; - if ("elec".equals(codeString)) - return ServiceReferralMethod.ELEC; - if ("semail".equals(codeString)) - return ServiceReferralMethod.SEMAIL; - if ("mail".equals(codeString)) - return ServiceReferralMethod.MAIL; - throw new IllegalArgumentException("Unknown ServiceReferralMethod code '"+codeString+"'"); - } - - public String toCode(ServiceReferralMethod code) { - if (code == ServiceReferralMethod.FAX) - return "fax"; - if (code == ServiceReferralMethod.PHONE) - return "phone"; - if (code == ServiceReferralMethod.ELEC) - return "elec"; - if (code == ServiceReferralMethod.SEMAIL) - return "semail"; - if (code == ServiceReferralMethod.MAIL) - return "mail"; - return "?"; - } - - public String toSystem(ServiceReferralMethod code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTagEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTagEnumFactory.java deleted file mode 100644 index 338b8b57acf..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTagEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SubscriptionTagEnumFactory implements EnumFactory { - - public SubscriptionTag fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("queued".equals(codeString)) - return SubscriptionTag.QUEUED; - if ("delivered".equals(codeString)) - return SubscriptionTag.DELIVERED; - throw new IllegalArgumentException("Unknown SubscriptionTag code '"+codeString+"'"); - } - - public String toCode(SubscriptionTag code) { - if (code == SubscriptionTag.QUEUED) - return "queued"; - if (code == SubscriptionTag.DELIVERED) - return "delivered"; - return "?"; - } - - public String toSystem(SubscriptionTag code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategoryEnumFactory.java deleted file mode 100644 index 349eac74533..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategoryEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SubstanceCategoryEnumFactory implements EnumFactory { - - public SubstanceCategory fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("allergen".equals(codeString)) - return SubstanceCategory.ALLERGEN; - if ("biological".equals(codeString)) - return SubstanceCategory.BIOLOGICAL; - if ("body".equals(codeString)) - return SubstanceCategory.BODY; - if ("chemical".equals(codeString)) - return SubstanceCategory.CHEMICAL; - if ("food".equals(codeString)) - return SubstanceCategory.FOOD; - if ("drug".equals(codeString)) - return SubstanceCategory.DRUG; - if ("material".equals(codeString)) - return SubstanceCategory.MATERIAL; - throw new IllegalArgumentException("Unknown SubstanceCategory code '"+codeString+"'"); - } - - public String toCode(SubstanceCategory code) { - if (code == SubstanceCategory.ALLERGEN) - return "allergen"; - if (code == SubstanceCategory.BIOLOGICAL) - return "biological"; - if (code == SubstanceCategory.BODY) - return "body"; - if (code == SubstanceCategory.CHEMICAL) - return "chemical"; - if (code == SubstanceCategory.FOOD) - return "food"; - if (code == SubstanceCategory.DRUG) - return "drug"; - if (code == SubstanceCategory.MATERIAL) - return "material"; - return "?"; - } - - public String toSystem(SubstanceCategory code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryTypeEnumFactory.java deleted file mode 100644 index fb15140ebb4..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryTypeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SupplydeliveryTypeEnumFactory implements EnumFactory { - - public SupplydeliveryType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("medication".equals(codeString)) - return SupplydeliveryType.MEDICATION; - if ("device".equals(codeString)) - return SupplydeliveryType.DEVICE; - throw new IllegalArgumentException("Unknown SupplydeliveryType code '"+codeString+"'"); - } - - public String toCode(SupplydeliveryType code) { - if (code == SupplydeliveryType.MEDICATION) - return "medication"; - if (code == SupplydeliveryType.DEVICE) - return "device"; - return "?"; - } - - public String toSystem(SupplydeliveryType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKindEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKindEnumFactory.java deleted file mode 100644 index 818637537e3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKindEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SupplyrequestKindEnumFactory implements EnumFactory { - - public SupplyrequestKind fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("central".equals(codeString)) - return SupplyrequestKind.CENTRAL; - if ("nonstock".equals(codeString)) - return SupplyrequestKind.NONSTOCK; - throw new IllegalArgumentException("Unknown SupplyrequestKind code '"+codeString+"'"); - } - - public String toCode(SupplyrequestKind code) { - if (code == SupplyrequestKind.CENTRAL) - return "central"; - if (code == SupplyrequestKind.NONSTOCK) - return "nonstock"; - return "?"; - } - - public String toSystem(SupplyrequestKind code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReasonEnumFactory.java deleted file mode 100644 index 0e04bd8acf0..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReasonEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SupplyrequestReasonEnumFactory implements EnumFactory { - - public SupplyrequestReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("patient-care".equals(codeString)) - return SupplyrequestReason.PATIENTCARE; - if ("ward-stock".equals(codeString)) - return SupplyrequestReason.WARDSTOCK; - throw new IllegalArgumentException("Unknown SupplyrequestReason code '"+codeString+"'"); - } - - public String toCode(SupplyrequestReason code) { - if (code == SupplyrequestReason.PATIENTCARE) - return "patient-care"; - if (code == SupplyrequestReason.WARDSTOCK) - return "ward-stock"; - return "?"; - } - - public String toSystem(SupplyrequestReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SurfaceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SurfaceEnumFactory.java deleted file mode 100644 index d915dc22d54..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SurfaceEnumFactory.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class SurfaceEnumFactory implements EnumFactory { - - public Surface fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("M".equals(codeString)) - return Surface.M; - if ("O".equals(codeString)) - return Surface.O; - if ("I".equals(codeString)) - return Surface.I; - if ("D".equals(codeString)) - return Surface.D; - if ("B".equals(codeString)) - return Surface.B; - if ("V".equals(codeString)) - return Surface.V; - if ("L".equals(codeString)) - return Surface.L; - if ("MO".equals(codeString)) - return Surface.MO; - if ("DO".equals(codeString)) - return Surface.DO; - if ("DI".equals(codeString)) - return Surface.DI; - if ("MOD".equals(codeString)) - return Surface.MOD; - throw new IllegalArgumentException("Unknown Surface code '"+codeString+"'"); - } - - public String toCode(Surface code) { - if (code == Surface.M) - return "M"; - if (code == Surface.O) - return "O"; - if (code == Surface.I) - return "I"; - if (code == Surface.D) - return "D"; - if (code == Surface.B) - return "B"; - if (code == Surface.V) - return "V"; - if (code == Surface.L) - return "L"; - if (code == Surface.MO) - return "MO"; - if (code == Surface.DO) - return "DO"; - if (code == Surface.DI) - return "DI"; - if (code == Surface.MOD) - return "MOD"; - return "?"; - } - - public String toSystem(Surface code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/UdiEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/UdiEnumFactory.java deleted file mode 100644 index 447f5ae3402..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/UdiEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class UdiEnumFactory implements EnumFactory { - - public Udi fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("gudid".equals(codeString)) - return Udi.GUDID; - throw new IllegalArgumentException("Unknown Udi code '"+codeString+"'"); - } - - public String toCode(Udi code) { - if (code == Udi.GUDID) - return "gudid"; - return "?"; - } - - public String toSystem(Udi code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementConditionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementConditionEnumFactory.java deleted file mode 100644 index 191f57eb1a9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementConditionEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3AcknowledgementConditionEnumFactory implements EnumFactory { - - public V3AcknowledgementCondition fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AL".equals(codeString)) - return V3AcknowledgementCondition.AL; - if ("ER".equals(codeString)) - return V3AcknowledgementCondition.ER; - if ("NE".equals(codeString)) - return V3AcknowledgementCondition.NE; - if ("SU".equals(codeString)) - return V3AcknowledgementCondition.SU; - throw new IllegalArgumentException("Unknown V3AcknowledgementCondition code '"+codeString+"'"); - } - - public String toCode(V3AcknowledgementCondition code) { - if (code == V3AcknowledgementCondition.AL) - return "AL"; - if (code == V3AcknowledgementCondition.ER) - return "ER"; - if (code == V3AcknowledgementCondition.NE) - return "NE"; - if (code == V3AcknowledgementCondition.SU) - return "SU"; - return "?"; - } - - public String toSystem(V3AcknowledgementCondition code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java deleted file mode 100644 index 0224be76a28..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3AcknowledgementDetailTypeEnumFactory implements EnumFactory { - - public V3AcknowledgementDetailType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("E".equals(codeString)) - return V3AcknowledgementDetailType.E; - if ("I".equals(codeString)) - return V3AcknowledgementDetailType.I; - if ("W".equals(codeString)) - return V3AcknowledgementDetailType.W; - if ("ERR".equals(codeString)) - return V3AcknowledgementDetailType.ERR; - if ("INFO".equals(codeString)) - return V3AcknowledgementDetailType.INFO; - if ("WARN".equals(codeString)) - return V3AcknowledgementDetailType.WARN; - throw new IllegalArgumentException("Unknown V3AcknowledgementDetailType code '"+codeString+"'"); - } - - public String toCode(V3AcknowledgementDetailType code) { - if (code == V3AcknowledgementDetailType.E) - return "E"; - if (code == V3AcknowledgementDetailType.I) - return "I"; - if (code == V3AcknowledgementDetailType.W) - return "W"; - if (code == V3AcknowledgementDetailType.ERR) - return "ERR"; - if (code == V3AcknowledgementDetailType.INFO) - return "INFO"; - if (code == V3AcknowledgementDetailType.WARN) - return "WARN"; - return "?"; - } - - public String toSystem(V3AcknowledgementDetailType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementTypeEnumFactory.java deleted file mode 100644 index de99a4b6c81..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementTypeEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3AcknowledgementTypeEnumFactory implements EnumFactory { - - public V3AcknowledgementType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AA".equals(codeString)) - return V3AcknowledgementType.AA; - if ("AE".equals(codeString)) - return V3AcknowledgementType.AE; - if ("AR".equals(codeString)) - return V3AcknowledgementType.AR; - if ("CA".equals(codeString)) - return V3AcknowledgementType.CA; - if ("CE".equals(codeString)) - return V3AcknowledgementType.CE; - if ("CR".equals(codeString)) - return V3AcknowledgementType.CR; - throw new IllegalArgumentException("Unknown V3AcknowledgementType code '"+codeString+"'"); - } - - public String toCode(V3AcknowledgementType code) { - if (code == V3AcknowledgementType.AA) - return "AA"; - if (code == V3AcknowledgementType.AE) - return "AE"; - if (code == V3AcknowledgementType.AR) - return "AR"; - if (code == V3AcknowledgementType.CA) - return "CA"; - if (code == V3AcknowledgementType.CE) - return "CE"; - if (code == V3AcknowledgementType.CR) - return "CR"; - return "?"; - } - - public String toSystem(V3AcknowledgementType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCodeEnumFactory.java deleted file mode 100644 index 01e1fbaa6fd..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCodeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActExposureLevelCodeEnumFactory implements EnumFactory { - - public V3ActExposureLevelCode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_ActExposureLevelCode".equals(codeString)) - return V3ActExposureLevelCode._ACTEXPOSURELEVELCODE; - if ("HIGH".equals(codeString)) - return V3ActExposureLevelCode.HIGH; - if ("LOW".equals(codeString)) - return V3ActExposureLevelCode.LOW; - if ("MEDIUM".equals(codeString)) - return V3ActExposureLevelCode.MEDIUM; - throw new IllegalArgumentException("Unknown V3ActExposureLevelCode code '"+codeString+"'"); - } - - public String toCode(V3ActExposureLevelCode code) { - if (code == V3ActExposureLevelCode._ACTEXPOSURELEVELCODE) - return "_ActExposureLevelCode"; - if (code == V3ActExposureLevelCode.HIGH) - return "HIGH"; - if (code == V3ActExposureLevelCode.LOW) - return "LOW"; - if (code == V3ActExposureLevelCode.MEDIUM) - return "MEDIUM"; - return "?"; - } - - public String toSystem(V3ActExposureLevelCode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java deleted file mode 100644 index 91491346928..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActInvoiceElementModifierEnumFactory implements EnumFactory { - - public V3ActInvoiceElementModifier fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("EFORM".equals(codeString)) - return V3ActInvoiceElementModifier.EFORM; - if ("FAX".equals(codeString)) - return V3ActInvoiceElementModifier.FAX; - if ("LINV".equals(codeString)) - return V3ActInvoiceElementModifier.LINV; - if ("PAPER".equals(codeString)) - return V3ActInvoiceElementModifier.PAPER; - throw new IllegalArgumentException("Unknown V3ActInvoiceElementModifier code '"+codeString+"'"); - } - - public String toCode(V3ActInvoiceElementModifier code) { - if (code == V3ActInvoiceElementModifier.EFORM) - return "EFORM"; - if (code == V3ActInvoiceElementModifier.FAX) - return "FAX"; - if (code == V3ActInvoiceElementModifier.LINV) - return "LINV"; - if (code == V3ActInvoiceElementModifier.PAPER) - return "PAPER"; - return "?"; - } - - public String toSystem(V3ActInvoiceElementModifier code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java deleted file mode 100644 index 473f06af4b2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActRelationshipCheckpointEnumFactory implements EnumFactory { - - public V3ActRelationshipCheckpoint fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("B".equals(codeString)) - return V3ActRelationshipCheckpoint.B; - if ("E".equals(codeString)) - return V3ActRelationshipCheckpoint.E; - if ("S".equals(codeString)) - return V3ActRelationshipCheckpoint.S; - if ("T".equals(codeString)) - return V3ActRelationshipCheckpoint.T; - if ("X".equals(codeString)) - return V3ActRelationshipCheckpoint.X; - throw new IllegalArgumentException("Unknown V3ActRelationshipCheckpoint code '"+codeString+"'"); - } - - public String toCode(V3ActRelationshipCheckpoint code) { - if (code == V3ActRelationshipCheckpoint.B) - return "B"; - if (code == V3ActRelationshipCheckpoint.E) - return "E"; - if (code == V3ActRelationshipCheckpoint.S) - return "S"; - if (code == V3ActRelationshipCheckpoint.T) - return "T"; - if (code == V3ActRelationshipCheckpoint.X) - return "X"; - return "?"; - } - - public String toSystem(V3ActRelationshipCheckpoint code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoinEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoinEnumFactory.java deleted file mode 100644 index 2e9fa981a09..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoinEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActRelationshipJoinEnumFactory implements EnumFactory { - - public V3ActRelationshipJoin fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("D".equals(codeString)) - return V3ActRelationshipJoin.D; - if ("K".equals(codeString)) - return V3ActRelationshipJoin.K; - if ("W".equals(codeString)) - return V3ActRelationshipJoin.W; - if ("X".equals(codeString)) - return V3ActRelationshipJoin.X; - throw new IllegalArgumentException("Unknown V3ActRelationshipJoin code '"+codeString+"'"); - } - - public String toCode(V3ActRelationshipJoin code) { - if (code == V3ActRelationshipJoin.D) - return "D"; - if (code == V3ActRelationshipJoin.K) - return "K"; - if (code == V3ActRelationshipJoin.W) - return "W"; - if (code == V3ActRelationshipJoin.X) - return "X"; - return "?"; - } - - public String toSystem(V3ActRelationshipJoin code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplitEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplitEnumFactory.java deleted file mode 100644 index c32a3c160ff..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplitEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActRelationshipSplitEnumFactory implements EnumFactory { - - public V3ActRelationshipSplit fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("E1".equals(codeString)) - return V3ActRelationshipSplit.E1; - if ("EW".equals(codeString)) - return V3ActRelationshipSplit.EW; - if ("I1".equals(codeString)) - return V3ActRelationshipSplit.I1; - if ("IW".equals(codeString)) - return V3ActRelationshipSplit.IW; - throw new IllegalArgumentException("Unknown V3ActRelationshipSplit code '"+codeString+"'"); - } - - public String toCode(V3ActRelationshipSplit code) { - if (code == V3ActRelationshipSplit.E1) - return "E1"; - if (code == V3ActRelationshipSplit.EW) - return "EW"; - if (code == V3ActRelationshipSplit.I1) - return "I1"; - if (code == V3ActRelationshipSplit.IW) - return "IW"; - return "?"; - } - - public String toSystem(V3ActRelationshipSplit code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLawEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLawEnumFactory.java deleted file mode 100644 index c1bcce5136e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLawEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActUSPrivacyLawEnumFactory implements EnumFactory { - - public V3ActUSPrivacyLaw fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_ActUSPrivacyLaw".equals(codeString)) - return V3ActUSPrivacyLaw._ACTUSPRIVACYLAW; - if ("42CFRPart2".equals(codeString)) - return V3ActUSPrivacyLaw._42CFRPART2; - if ("CommonRule".equals(codeString)) - return V3ActUSPrivacyLaw.COMMONRULE; - if ("HIPAANOPP".equals(codeString)) - return V3ActUSPrivacyLaw.HIPAANOPP; - if ("HIPAAPsyNotes".equals(codeString)) - return V3ActUSPrivacyLaw.HIPAAPSYNOTES; - if ("HIPAASelfPay".equals(codeString)) - return V3ActUSPrivacyLaw.HIPAASELFPAY; - if ("Title38Section7332".equals(codeString)) - return V3ActUSPrivacyLaw.TITLE38SECTION7332; - throw new IllegalArgumentException("Unknown V3ActUSPrivacyLaw code '"+codeString+"'"); - } - - public String toCode(V3ActUSPrivacyLaw code) { - if (code == V3ActUSPrivacyLaw._ACTUSPRIVACYLAW) - return "_ActUSPrivacyLaw"; - if (code == V3ActUSPrivacyLaw._42CFRPART2) - return "42CFRPart2"; - if (code == V3ActUSPrivacyLaw.COMMONRULE) - return "CommonRule"; - if (code == V3ActUSPrivacyLaw.HIPAANOPP) - return "HIPAANOPP"; - if (code == V3ActUSPrivacyLaw.HIPAAPSYNOTES) - return "HIPAAPsyNotes"; - if (code == V3ActUSPrivacyLaw.HIPAASELFPAY) - return "HIPAASelfPay"; - if (code == V3ActUSPrivacyLaw.TITLE38SECTION7332) - return "Title38Section7332"; - return "?"; - } - - public String toSystem(V3ActUSPrivacyLaw code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertaintyEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertaintyEnumFactory.java deleted file mode 100644 index f4041c40b6e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertaintyEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ActUncertaintyEnumFactory implements EnumFactory { - - public V3ActUncertainty fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("N".equals(codeString)) - return V3ActUncertainty.N; - if ("U".equals(codeString)) - return V3ActUncertainty.U; - throw new IllegalArgumentException("Unknown V3ActUncertainty code '"+codeString+"'"); - } - - public String toCode(V3ActUncertainty code) { - if (code == V3ActUncertainty.N) - return "N"; - if (code == V3ActUncertainty.U) - return "U"; - return "?"; - } - - public String toSystem(V3ActUncertainty code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGenderEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGenderEnumFactory.java deleted file mode 100644 index d4814ffe797..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGenderEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3AdministrativeGenderEnumFactory implements EnumFactory { - - public V3AdministrativeGender fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("F".equals(codeString)) - return V3AdministrativeGender.F; - if ("M".equals(codeString)) - return V3AdministrativeGender.M; - if ("UN".equals(codeString)) - return V3AdministrativeGender.UN; - throw new IllegalArgumentException("Unknown V3AdministrativeGender code '"+codeString+"'"); - } - - public String toCode(V3AdministrativeGender code) { - if (code == V3AdministrativeGender.F) - return "F"; - if (code == V3AdministrativeGender.M) - return "M"; - if (code == V3AdministrativeGender.UN) - return "UN"; - return "?"; - } - - public String toSystem(V3AdministrativeGender code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarEnumFactory.java deleted file mode 100644 index 19556a13dfb..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3CalendarEnumFactory implements EnumFactory { - - public V3Calendar fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("GREG".equals(codeString)) - return V3Calendar.GREG; - throw new IllegalArgumentException("Unknown V3Calendar code '"+codeString+"'"); - } - - public String toCode(V3Calendar code) { - if (code == V3Calendar.GREG) - return "GREG"; - return "?"; - } - - public String toSystem(V3Calendar code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarTypeEnumFactory.java deleted file mode 100644 index 1c90cc15f06..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarTypeEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3CalendarTypeEnumFactory implements EnumFactory { - - public V3CalendarType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("GREG".equals(codeString)) - return V3CalendarType.GREG; - throw new IllegalArgumentException("Unknown V3CalendarType code '"+codeString+"'"); - } - - public String toCode(V3CalendarType code) { - if (code == V3CalendarType.GREG) - return "GREG"; - return "?"; - } - - public String toSystem(V3CalendarType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationaleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationaleEnumFactory.java deleted file mode 100644 index f2ca5b5430c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationaleEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3CodingRationaleEnumFactory implements EnumFactory { - - public V3CodingRationale fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("O".equals(codeString)) - return V3CodingRationale.O; - if ("OR".equals(codeString)) - return V3CodingRationale.OR; - if ("P".equals(codeString)) - return V3CodingRationale.P; - if ("PR".equals(codeString)) - return V3CodingRationale.PR; - if ("R".equals(codeString)) - return V3CodingRationale.R; - if ("HL7".equals(codeString)) - return V3CodingRationale.HL7; - if ("SH".equals(codeString)) - return V3CodingRationale.SH; - if ("SRC".equals(codeString)) - return V3CodingRationale.SRC; - throw new IllegalArgumentException("Unknown V3CodingRationale code '"+codeString+"'"); - } - - public String toCode(V3CodingRationale code) { - if (code == V3CodingRationale.O) - return "O"; - if (code == V3CodingRationale.OR) - return "OR"; - if (code == V3CodingRationale.P) - return "P"; - if (code == V3CodingRationale.PR) - return "PR"; - if (code == V3CodingRationale.R) - return "R"; - if (code == V3CodingRationale.HL7) - return "HL7"; - if (code == V3CodingRationale.SH) - return "SH"; - if (code == V3CodingRationale.SRC) - return "SRC"; - return "?"; - } - - public String toSystem(V3CodingRationale code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java deleted file mode 100644 index 8263d0e1a4c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3CommunicationFunctionTypeEnumFactory implements EnumFactory { - - public V3CommunicationFunctionType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("RCV".equals(codeString)) - return V3CommunicationFunctionType.RCV; - if ("RSP".equals(codeString)) - return V3CommunicationFunctionType.RSP; - if ("SND".equals(codeString)) - return V3CommunicationFunctionType.SND; - throw new IllegalArgumentException("Unknown V3CommunicationFunctionType code '"+codeString+"'"); - } - - public String toCode(V3CommunicationFunctionType code) { - if (code == V3CommunicationFunctionType.RCV) - return "RCV"; - if (code == V3CommunicationFunctionType.RSP) - return "RSP"; - if (code == V3CommunicationFunctionType.SND) - return "SND"; - return "?"; - } - - public String toSystem(V3CommunicationFunctionType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithmEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithmEnumFactory.java deleted file mode 100644 index a9eec35f916..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithmEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3CompressionAlgorithmEnumFactory implements EnumFactory { - - public V3CompressionAlgorithm fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("BZ".equals(codeString)) - return V3CompressionAlgorithm.BZ; - if ("DF".equals(codeString)) - return V3CompressionAlgorithm.DF; - if ("GZ".equals(codeString)) - return V3CompressionAlgorithm.GZ; - if ("Z".equals(codeString)) - return V3CompressionAlgorithm.Z; - if ("Z7".equals(codeString)) - return V3CompressionAlgorithm.Z7; - if ("ZL".equals(codeString)) - return V3CompressionAlgorithm.ZL; - throw new IllegalArgumentException("Unknown V3CompressionAlgorithm code '"+codeString+"'"); - } - - public String toCode(V3CompressionAlgorithm code) { - if (code == V3CompressionAlgorithm.BZ) - return "BZ"; - if (code == V3CompressionAlgorithm.DF) - return "DF"; - if (code == V3CompressionAlgorithm.GZ) - return "GZ"; - if (code == V3CompressionAlgorithm.Z) - return "Z"; - if (code == V3CompressionAlgorithm.Z7) - return "Z7"; - if (code == V3CompressionAlgorithm.ZL) - return "ZL"; - return "?"; - } - - public String toSystem(V3CompressionAlgorithm code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCapEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCapEnumFactory.java deleted file mode 100644 index 8eeb4e171f3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCapEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ContainerCapEnumFactory implements EnumFactory { - - public V3ContainerCap fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_MedicationCap".equals(codeString)) - return V3ContainerCap._MEDICATIONCAP; - if ("CHILD".equals(codeString)) - return V3ContainerCap.CHILD; - if ("EASY".equals(codeString)) - return V3ContainerCap.EASY; - if ("FILM".equals(codeString)) - return V3ContainerCap.FILM; - if ("FOIL".equals(codeString)) - return V3ContainerCap.FOIL; - if ("PUSH".equals(codeString)) - return V3ContainerCap.PUSH; - if ("SCR".equals(codeString)) - return V3ContainerCap.SCR; - throw new IllegalArgumentException("Unknown V3ContainerCap code '"+codeString+"'"); - } - - public String toCode(V3ContainerCap code) { - if (code == V3ContainerCap._MEDICATIONCAP) - return "_MedicationCap"; - if (code == V3ContainerCap.CHILD) - return "CHILD"; - if (code == V3ContainerCap.EASY) - return "EASY"; - if (code == V3ContainerCap.FILM) - return "FILM"; - if (code == V3ContainerCap.FOIL) - return "FOIL"; - if (code == V3ContainerCap.PUSH) - return "PUSH"; - if (code == V3ContainerCap.SCR) - return "SCR"; - return "?"; - } - - public String toSystem(V3ContainerCap code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparatorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparatorEnumFactory.java deleted file mode 100644 index 37212ae05fc..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparatorEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ContainerSeparatorEnumFactory implements EnumFactory { - - public V3ContainerSeparator fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("GEL".equals(codeString)) - return V3ContainerSeparator.GEL; - if ("NONE".equals(codeString)) - return V3ContainerSeparator.NONE; - throw new IllegalArgumentException("Unknown V3ContainerSeparator code '"+codeString+"'"); - } - - public String toCode(V3ContainerSeparator code) { - if (code == V3ContainerSeparator.GEL) - return "GEL"; - if (code == V3ContainerSeparator.NONE) - return "NONE"; - return "?"; - } - - public String toSystem(V3ContainerSeparator code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingModeEnumFactory.java deleted file mode 100644 index e214a4d2b52..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingModeEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ContentProcessingModeEnumFactory implements EnumFactory { - - public V3ContentProcessingMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("SEQL".equals(codeString)) - return V3ContentProcessingMode.SEQL; - if ("UNOR".equals(codeString)) - return V3ContentProcessingMode.UNOR; - throw new IllegalArgumentException("Unknown V3ContentProcessingMode code '"+codeString+"'"); - } - - public String toCode(V3ContentProcessingMode code) { - if (code == V3ContentProcessingMode.SEQL) - return "SEQL"; - if (code == V3ContentProcessingMode.UNOR) - return "UNOR"; - return "?"; - } - - public String toSystem(V3ContentProcessingMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevelEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevelEnumFactory.java deleted file mode 100644 index 99b75b88490..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevelEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3DeviceAlertLevelEnumFactory implements EnumFactory { - - public V3DeviceAlertLevel fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("C".equals(codeString)) - return V3DeviceAlertLevel.C; - if ("N".equals(codeString)) - return V3DeviceAlertLevel.N; - if ("S".equals(codeString)) - return V3DeviceAlertLevel.S; - if ("W".equals(codeString)) - return V3DeviceAlertLevel.W; - throw new IllegalArgumentException("Unknown V3DeviceAlertLevel code '"+codeString+"'"); - } - - public String toCode(V3DeviceAlertLevel code) { - if (code == V3DeviceAlertLevel.C) - return "C"; - if (code == V3DeviceAlertLevel.N) - return "N"; - if (code == V3DeviceAlertLevel.S) - return "S"; - if (code == V3DeviceAlertLevel.W) - return "W"; - return "?"; - } - - public String toSystem(V3DeviceAlertLevel code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletionEnumFactory.java deleted file mode 100644 index 02976088c6e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletionEnumFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3DocumentCompletionEnumFactory implements EnumFactory { - - public V3DocumentCompletion fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AU".equals(codeString)) - return V3DocumentCompletion.AU; - if ("DI".equals(codeString)) - return V3DocumentCompletion.DI; - if ("DO".equals(codeString)) - return V3DocumentCompletion.DO; - if ("IN".equals(codeString)) - return V3DocumentCompletion.IN; - if ("IP".equals(codeString)) - return V3DocumentCompletion.IP; - if ("LA".equals(codeString)) - return V3DocumentCompletion.LA; - if ("NU".equals(codeString)) - return V3DocumentCompletion.NU; - if ("PA".equals(codeString)) - return V3DocumentCompletion.PA; - if ("UC".equals(codeString)) - return V3DocumentCompletion.UC; - throw new IllegalArgumentException("Unknown V3DocumentCompletion code '"+codeString+"'"); - } - - public String toCode(V3DocumentCompletion code) { - if (code == V3DocumentCompletion.AU) - return "AU"; - if (code == V3DocumentCompletion.DI) - return "DI"; - if (code == V3DocumentCompletion.DO) - return "DO"; - if (code == V3DocumentCompletion.IN) - return "IN"; - if (code == V3DocumentCompletion.IP) - return "IP"; - if (code == V3DocumentCompletion.LA) - return "LA"; - if (code == V3DocumentCompletion.NU) - return "NU"; - if (code == V3DocumentCompletion.PA) - return "PA"; - if (code == V3DocumentCompletion.UC) - return "UC"; - return "?"; - } - - public String toSystem(V3DocumentCompletion code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorageEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorageEnumFactory.java deleted file mode 100644 index 83bffdd4448..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorageEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3DocumentStorageEnumFactory implements EnumFactory { - - public V3DocumentStorage fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AC".equals(codeString)) - return V3DocumentStorage.AC; - if ("AA".equals(codeString)) - return V3DocumentStorage.AA; - if ("AR".equals(codeString)) - return V3DocumentStorage.AR; - if ("PU".equals(codeString)) - return V3DocumentStorage.PU; - throw new IllegalArgumentException("Unknown V3DocumentStorage code '"+codeString+"'"); - } - - public String toCode(V3DocumentStorage code) { - if (code == V3DocumentStorage.AC) - return "AC"; - if (code == V3DocumentStorage.AA) - return "AA"; - if (code == V3DocumentStorage.AR) - return "AR"; - if (code == V3DocumentStorage.PU) - return "PU"; - return "?"; - } - - public String toSystem(V3DocumentStorage code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevelEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevelEnumFactory.java deleted file mode 100644 index 709d57d6a96..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevelEnumFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EducationLevelEnumFactory implements EnumFactory { - - public V3EducationLevel fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("ASSOC".equals(codeString)) - return V3EducationLevel.ASSOC; - if ("BD".equals(codeString)) - return V3EducationLevel.BD; - if ("ELEM".equals(codeString)) - return V3EducationLevel.ELEM; - if ("GD".equals(codeString)) - return V3EducationLevel.GD; - if ("HS".equals(codeString)) - return V3EducationLevel.HS; - if ("PB".equals(codeString)) - return V3EducationLevel.PB; - if ("POSTG".equals(codeString)) - return V3EducationLevel.POSTG; - if ("SCOL".equals(codeString)) - return V3EducationLevel.SCOL; - if ("SEC".equals(codeString)) - return V3EducationLevel.SEC; - throw new IllegalArgumentException("Unknown V3EducationLevel code '"+codeString+"'"); - } - - public String toCode(V3EducationLevel code) { - if (code == V3EducationLevel.ASSOC) - return "ASSOC"; - if (code == V3EducationLevel.BD) - return "BD"; - if (code == V3EducationLevel.ELEM) - return "ELEM"; - if (code == V3EducationLevel.GD) - return "GD"; - if (code == V3EducationLevel.HS) - return "HS"; - if (code == V3EducationLevel.PB) - return "PB"; - if (code == V3EducationLevel.POSTG) - return "POSTG"; - if (code == V3EducationLevel.SCOL) - return "SCOL"; - if (code == V3EducationLevel.SEC) - return "SEC"; - return "?"; - } - - public String toSystem(V3EducationLevel code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClassEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClassEnumFactory.java deleted file mode 100644 index 1400fb6c5ca..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClassEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EmployeeJobClassEnumFactory implements EnumFactory { - - public V3EmployeeJobClass fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("FT".equals(codeString)) - return V3EmployeeJobClass.FT; - if ("PT".equals(codeString)) - return V3EmployeeJobClass.PT; - throw new IllegalArgumentException("Unknown V3EmployeeJobClass code '"+codeString+"'"); - } - - public String toCode(V3EmployeeJobClass code) { - if (code == V3EmployeeJobClass.FT) - return "FT"; - if (code == V3EmployeeJobClass.PT) - return "PT"; - return "?"; - } - - public String toSystem(V3EmployeeJobClass code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java deleted file mode 100644 index 868e8cf6ae1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EncounterAdmissionSourceEnumFactory implements EnumFactory { - - public V3EncounterAdmissionSource fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("E".equals(codeString)) - return V3EncounterAdmissionSource.E; - if ("LD".equals(codeString)) - return V3EncounterAdmissionSource.LD; - if ("NB".equals(codeString)) - return V3EncounterAdmissionSource.NB; - throw new IllegalArgumentException("Unknown V3EncounterAdmissionSource code '"+codeString+"'"); - } - - public String toCode(V3EncounterAdmissionSource code) { - if (code == V3EncounterAdmissionSource.E) - return "E"; - if (code == V3EncounterAdmissionSource.LD) - return "LD"; - if (code == V3EncounterAdmissionSource.NB) - return "NB"; - return "?"; - } - - public String toSystem(V3EncounterAdmissionSource code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java deleted file mode 100644 index 920d58cc548..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EncounterSpecialCourtesyEnumFactory implements EnumFactory { - - public V3EncounterSpecialCourtesy fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("EXT".equals(codeString)) - return V3EncounterSpecialCourtesy.EXT; - if ("NRM".equals(codeString)) - return V3EncounterSpecialCourtesy.NRM; - if ("PRF".equals(codeString)) - return V3EncounterSpecialCourtesy.PRF; - if ("STF".equals(codeString)) - return V3EncounterSpecialCourtesy.STF; - if ("VIP".equals(codeString)) - return V3EncounterSpecialCourtesy.VIP; - throw new IllegalArgumentException("Unknown V3EncounterSpecialCourtesy code '"+codeString+"'"); - } - - public String toCode(V3EncounterSpecialCourtesy code) { - if (code == V3EncounterSpecialCourtesy.EXT) - return "EXT"; - if (code == V3EncounterSpecialCourtesy.NRM) - return "NRM"; - if (code == V3EncounterSpecialCourtesy.PRF) - return "PRF"; - if (code == V3EncounterSpecialCourtesy.STF) - return "STF"; - if (code == V3EncounterSpecialCourtesy.VIP) - return "VIP"; - return "?"; - } - - public String toSystem(V3EncounterSpecialCourtesy code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminerEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminerEnumFactory.java deleted file mode 100644 index 050ed98c33d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminerEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EntityDeterminerEnumFactory implements EnumFactory { - - public V3EntityDeterminer fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("INSTANCE".equals(codeString)) - return V3EntityDeterminer.INSTANCE; - if ("GROUP".equals(codeString)) - return V3EntityDeterminer.GROUP; - if ("KIND".equals(codeString)) - return V3EntityDeterminer.KIND; - if ("GROUPKIND".equals(codeString)) - return V3EntityDeterminer.GROUPKIND; - if ("QUANTIFIED_KIND".equals(codeString)) - return V3EntityDeterminer.QUANTIFIEDKIND; - throw new IllegalArgumentException("Unknown V3EntityDeterminer code '"+codeString+"'"); - } - - public String toCode(V3EntityDeterminer code) { - if (code == V3EntityDeterminer.INSTANCE) - return "INSTANCE"; - if (code == V3EntityDeterminer.GROUP) - return "GROUP"; - if (code == V3EntityDeterminer.KIND) - return "KIND"; - if (code == V3EntityDeterminer.GROUPKIND) - return "GROUPKIND"; - if (code == V3EntityDeterminer.QUANTIFIEDKIND) - return "QUANTIFIED_KIND"; - return "?"; - } - - public String toSystem(V3EntityDeterminer code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeEnumFactory.java deleted file mode 100644 index a101c24f5b2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EntityNamePartTypeEnumFactory implements EnumFactory { - - public V3EntityNamePartType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("DEL".equals(codeString)) - return V3EntityNamePartType.DEL; - if ("FAM".equals(codeString)) - return V3EntityNamePartType.FAM; - if ("GIV".equals(codeString)) - return V3EntityNamePartType.GIV; - if ("PFX".equals(codeString)) - return V3EntityNamePartType.PFX; - if ("SFX".equals(codeString)) - return V3EntityNamePartType.SFX; - throw new IllegalArgumentException("Unknown V3EntityNamePartType code '"+codeString+"'"); - } - - public String toCode(V3EntityNamePartType code) { - if (code == V3EntityNamePartType.DEL) - return "DEL"; - if (code == V3EntityNamePartType.FAM) - return "FAM"; - if (code == V3EntityNamePartType.GIV) - return "GIV"; - if (code == V3EntityNamePartType.PFX) - return "PFX"; - if (code == V3EntityNamePartType.SFX) - return "SFX"; - return "?"; - } - - public String toSystem(V3EntityNamePartType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java deleted file mode 100644 index 7131c64da6e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EntityNamePartTypeR2EnumFactory implements EnumFactory { - - public V3EntityNamePartTypeR2 fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("DEL".equals(codeString)) - return V3EntityNamePartTypeR2.DEL; - if ("FAM".equals(codeString)) - return V3EntityNamePartTypeR2.FAM; - if ("GIV".equals(codeString)) - return V3EntityNamePartTypeR2.GIV; - if ("TITLE".equals(codeString)) - return V3EntityNamePartTypeR2.TITLE; - throw new IllegalArgumentException("Unknown V3EntityNamePartTypeR2 code '"+codeString+"'"); - } - - public String toCode(V3EntityNamePartTypeR2 code) { - if (code == V3EntityNamePartTypeR2.DEL) - return "DEL"; - if (code == V3EntityNamePartTypeR2.FAM) - return "FAM"; - if (code == V3EntityNamePartTypeR2.GIV) - return "GIV"; - if (code == V3EntityNamePartTypeR2.TITLE) - return "TITLE"; - return "?"; - } - - public String toSystem(V3EntityNamePartTypeR2 code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRiskEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRiskEnumFactory.java deleted file mode 100644 index 56695e19a43..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRiskEnumFactory.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EntityRiskEnumFactory implements EnumFactory { - - public V3EntityRisk fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AGG".equals(codeString)) - return V3EntityRisk.AGG; - if ("BIO".equals(codeString)) - return V3EntityRisk.BIO; - if ("COR".equals(codeString)) - return V3EntityRisk.COR; - if ("ESC".equals(codeString)) - return V3EntityRisk.ESC; - if ("IFL".equals(codeString)) - return V3EntityRisk.IFL; - if ("EXP".equals(codeString)) - return V3EntityRisk.EXP; - if ("INF".equals(codeString)) - return V3EntityRisk.INF; - if ("BHZ".equals(codeString)) - return V3EntityRisk.BHZ; - if ("INJ".equals(codeString)) - return V3EntityRisk.INJ; - if ("POI".equals(codeString)) - return V3EntityRisk.POI; - if ("RAD".equals(codeString)) - return V3EntityRisk.RAD; - throw new IllegalArgumentException("Unknown V3EntityRisk code '"+codeString+"'"); - } - - public String toCode(V3EntityRisk code) { - if (code == V3EntityRisk.AGG) - return "AGG"; - if (code == V3EntityRisk.BIO) - return "BIO"; - if (code == V3EntityRisk.COR) - return "COR"; - if (code == V3EntityRisk.ESC) - return "ESC"; - if (code == V3EntityRisk.IFL) - return "IFL"; - if (code == V3EntityRisk.EXP) - return "EXP"; - if (code == V3EntityRisk.INF) - return "INF"; - if (code == V3EntityRisk.BHZ) - return "BHZ"; - if (code == V3EntityRisk.INJ) - return "INJ"; - if (code == V3EntityRisk.POI) - return "POI"; - if (code == V3EntityRisk.RAD) - return "RAD"; - return "?"; - } - - public String toSystem(V3EntityRisk code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatusEnumFactory.java deleted file mode 100644 index dfc5ae3ef84..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatusEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EntityStatusEnumFactory implements EnumFactory { - - public V3EntityStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("normal".equals(codeString)) - return V3EntityStatus.NORMAL; - if ("active".equals(codeString)) - return V3EntityStatus.ACTIVE; - if ("inactive".equals(codeString)) - return V3EntityStatus.INACTIVE; - if ("terminated".equals(codeString)) - return V3EntityStatus.TERMINATED; - if ("nullified".equals(codeString)) - return V3EntityStatus.NULLIFIED; - throw new IllegalArgumentException("Unknown V3EntityStatus code '"+codeString+"'"); - } - - public String toCode(V3EntityStatus code) { - if (code == V3EntityStatus.NORMAL) - return "normal"; - if (code == V3EntityStatus.ACTIVE) - return "active"; - if (code == V3EntityStatus.INACTIVE) - return "inactive"; - if (code == V3EntityStatus.TERMINATED) - return "terminated"; - if (code == V3EntityStatus.NULLIFIED) - return "nullified"; - return "?"; - } - - public String toSystem(V3EntityStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevelEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevelEnumFactory.java deleted file mode 100644 index eb60a60ea4f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevelEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3EquipmentAlertLevelEnumFactory implements EnumFactory { - - public V3EquipmentAlertLevel fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("C".equals(codeString)) - return V3EquipmentAlertLevel.C; - if ("N".equals(codeString)) - return V3EquipmentAlertLevel.N; - if ("S".equals(codeString)) - return V3EquipmentAlertLevel.S; - if ("W".equals(codeString)) - return V3EquipmentAlertLevel.W; - throw new IllegalArgumentException("Unknown V3EquipmentAlertLevel code '"+codeString+"'"); - } - - public String toCode(V3EquipmentAlertLevel code) { - if (code == V3EquipmentAlertLevel.C) - return "C"; - if (code == V3EquipmentAlertLevel.N) - return "N"; - if (code == V3EquipmentAlertLevel.S) - return "S"; - if (code == V3EquipmentAlertLevel.W) - return "W"; - return "?"; - } - - public String toSystem(V3EquipmentAlertLevel code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureModeEnumFactory.java deleted file mode 100644 index 1097578b397..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureModeEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ExposureModeEnumFactory implements EnumFactory { - - public V3ExposureMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_ExposureMode".equals(codeString)) - return V3ExposureMode._EXPOSUREMODE; - if ("AIRBORNE".equals(codeString)) - return V3ExposureMode.AIRBORNE; - if ("CONTACT".equals(codeString)) - return V3ExposureMode.CONTACT; - if ("FOODBORNE".equals(codeString)) - return V3ExposureMode.FOODBORNE; - if ("WATERBORNE".equals(codeString)) - return V3ExposureMode.WATERBORNE; - throw new IllegalArgumentException("Unknown V3ExposureMode code '"+codeString+"'"); - } - - public String toCode(V3ExposureMode code) { - if (code == V3ExposureMode._EXPOSUREMODE) - return "_ExposureMode"; - if (code == V3ExposureMode.AIRBORNE) - return "AIRBORNE"; - if (code == V3ExposureMode.CONTACT) - return "CONTACT"; - if (code == V3ExposureMode.FOODBORNE) - return "FOODBORNE"; - if (code == V3ExposureMode.WATERBORNE) - return "WATERBORNE"; - return "?"; - } - - public String toSystem(V3ExposureMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatusEnumFactory.java deleted file mode 100644 index 60e60af4e7c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatusEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3GenderStatusEnumFactory implements EnumFactory { - - public V3GenderStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("I".equals(codeString)) - return V3GenderStatus.I; - if ("N".equals(codeString)) - return V3GenderStatus.N; - throw new IllegalArgumentException("Unknown V3GenderStatus code '"+codeString+"'"); - } - - public String toCode(V3GenderStatus code) { - if (code == V3GenderStatus.I) - return "I"; - if (code == V3GenderStatus.N) - return "N"; - return "?"; - } - - public String toSystem(V3GenderStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3ConformanceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3ConformanceEnumFactory.java deleted file mode 100644 index 0c82e6e6e6d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3ConformanceEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3Hl7V3ConformanceEnumFactory implements EnumFactory { - - public V3Hl7V3Conformance fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("I".equals(codeString)) - return V3Hl7V3Conformance.I; - if ("NP".equals(codeString)) - return V3Hl7V3Conformance.NP; - if ("R".equals(codeString)) - return V3Hl7V3Conformance.R; - if ("RC".equals(codeString)) - return V3Hl7V3Conformance.RC; - if ("RI".equals(codeString)) - return V3Hl7V3Conformance.RI; - if ("U".equals(codeString)) - return V3Hl7V3Conformance.U; - throw new IllegalArgumentException("Unknown V3Hl7V3Conformance code '"+codeString+"'"); - } - - public String toCode(V3Hl7V3Conformance code) { - if (code == V3Hl7V3Conformance.I) - return "I"; - if (code == V3Hl7V3Conformance.NP) - return "NP"; - if (code == V3Hl7V3Conformance.R) - return "R"; - if (code == V3Hl7V3Conformance.RC) - return "RC"; - if (code == V3Hl7V3Conformance.RI) - return "RI"; - if (code == V3Hl7V3Conformance.U) - return "U"; - return "?"; - } - - public String toSystem(V3Hl7V3Conformance code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliabilityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliabilityEnumFactory.java deleted file mode 100644 index fcd08d9a747..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliabilityEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3IdentifierReliabilityEnumFactory implements EnumFactory { - - public V3IdentifierReliability fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("ISS".equals(codeString)) - return V3IdentifierReliability.ISS; - if ("UNV".equals(codeString)) - return V3IdentifierReliability.UNV; - if ("VRF".equals(codeString)) - return V3IdentifierReliability.VRF; - throw new IllegalArgumentException("Unknown V3IdentifierReliability code '"+codeString+"'"); - } - - public String toCode(V3IdentifierReliability code) { - if (code == V3IdentifierReliability.ISS) - return "ISS"; - if (code == V3IdentifierReliability.UNV) - return "UNV"; - if (code == V3IdentifierReliability.VRF) - return "VRF"; - return "?"; - } - - public String toSystem(V3IdentifierReliability code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScopeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScopeEnumFactory.java deleted file mode 100644 index 36fba82607f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScopeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3IdentifierScopeEnumFactory implements EnumFactory { - - public V3IdentifierScope fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("BUSN".equals(codeString)) - return V3IdentifierScope.BUSN; - if ("OBJ".equals(codeString)) - return V3IdentifierScope.OBJ; - if ("VER".equals(codeString)) - return V3IdentifierScope.VER; - if ("VW".equals(codeString)) - return V3IdentifierScope.VW; - throw new IllegalArgumentException("Unknown V3IdentifierScope code '"+codeString+"'"); - } - - public String toCode(V3IdentifierScope code) { - if (code == V3IdentifierScope.BUSN) - return "BUSN"; - if (code == V3IdentifierScope.OBJ) - return "OBJ"; - if (code == V3IdentifierScope.VER) - return "VER"; - if (code == V3IdentifierScope.VW) - return "VW"; - return "?"; - } - - public String toSystem(V3IdentifierScope code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java deleted file mode 100644 index 299441dfa68..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3IntegrityCheckAlgorithmEnumFactory implements EnumFactory { - - public V3IntegrityCheckAlgorithm fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("SHA-1".equals(codeString)) - return V3IntegrityCheckAlgorithm.SHA1; - if ("SHA-256".equals(codeString)) - return V3IntegrityCheckAlgorithm.SHA256; - throw new IllegalArgumentException("Unknown V3IntegrityCheckAlgorithm code '"+codeString+"'"); - } - - public String toCode(V3IntegrityCheckAlgorithm code) { - if (code == V3IntegrityCheckAlgorithm.SHA1) - return "SHA-1"; - if (code == V3IntegrityCheckAlgorithm.SHA256) - return "SHA-256"; - return "?"; - } - - public String toSystem(V3IntegrityCheckAlgorithm code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityModeEnumFactory.java deleted file mode 100644 index 6c22d751a4a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityModeEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3LanguageAbilityModeEnumFactory implements EnumFactory { - - public V3LanguageAbilityMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("ESGN".equals(codeString)) - return V3LanguageAbilityMode.ESGN; - if ("ESP".equals(codeString)) - return V3LanguageAbilityMode.ESP; - if ("EWR".equals(codeString)) - return V3LanguageAbilityMode.EWR; - if ("RSGN".equals(codeString)) - return V3LanguageAbilityMode.RSGN; - if ("RSP".equals(codeString)) - return V3LanguageAbilityMode.RSP; - if ("RWR".equals(codeString)) - return V3LanguageAbilityMode.RWR; - throw new IllegalArgumentException("Unknown V3LanguageAbilityMode code '"+codeString+"'"); - } - - public String toCode(V3LanguageAbilityMode code) { - if (code == V3LanguageAbilityMode.ESGN) - return "ESGN"; - if (code == V3LanguageAbilityMode.ESP) - return "ESP"; - if (code == V3LanguageAbilityMode.EWR) - return "EWR"; - if (code == V3LanguageAbilityMode.RSGN) - return "RSGN"; - if (code == V3LanguageAbilityMode.RSP) - return "RSP"; - if (code == V3LanguageAbilityMode.RWR) - return "RWR"; - return "?"; - } - - public String toSystem(V3LanguageAbilityMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java deleted file mode 100644 index 584a3c2cd24..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3LanguageAbilityProficiencyEnumFactory implements EnumFactory { - - public V3LanguageAbilityProficiency fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("E".equals(codeString)) - return V3LanguageAbilityProficiency.E; - if ("F".equals(codeString)) - return V3LanguageAbilityProficiency.F; - if ("G".equals(codeString)) - return V3LanguageAbilityProficiency.G; - if ("P".equals(codeString)) - return V3LanguageAbilityProficiency.P; - throw new IllegalArgumentException("Unknown V3LanguageAbilityProficiency code '"+codeString+"'"); - } - - public String toCode(V3LanguageAbilityProficiency code) { - if (code == V3LanguageAbilityProficiency.E) - return "E"; - if (code == V3LanguageAbilityProficiency.F) - return "F"; - if (code == V3LanguageAbilityProficiency.G) - return "G"; - if (code == V3LanguageAbilityProficiency.P) - return "P"; - return "?"; - } - - public String toSystem(V3LanguageAbilityProficiency code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java deleted file mode 100644 index 401e9afef97..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3LocalMarkupIgnoreEnumFactory implements EnumFactory { - - public V3LocalMarkupIgnore fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("all".equals(codeString)) - return V3LocalMarkupIgnore.ALL; - if ("markup".equals(codeString)) - return V3LocalMarkupIgnore.MARKUP; - throw new IllegalArgumentException("Unknown V3LocalMarkupIgnore code '"+codeString+"'"); - } - - public String toCode(V3LocalMarkupIgnore code) { - if (code == V3LocalMarkupIgnore.ALL) - return "all"; - if (code == V3LocalMarkupIgnore.MARKUP) - return "markup"; - return "?"; - } - - public String toSystem(V3LocalMarkupIgnore code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlStateEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlStateEnumFactory.java deleted file mode 100644 index e368f604bae..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlStateEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3LocalRemoteControlStateEnumFactory implements EnumFactory { - - public V3LocalRemoteControlState fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("L".equals(codeString)) - return V3LocalRemoteControlState.L; - if ("R".equals(codeString)) - return V3LocalRemoteControlState.R; - throw new IllegalArgumentException("Unknown V3LocalRemoteControlState code '"+codeString+"'"); - } - - public String toCode(V3LocalRemoteControlState code) { - if (code == V3LocalRemoteControlState.L) - return "L"; - if (code == V3LocalRemoteControlState.R) - return "R"; - return "?"; - } - - public String toSystem(V3LocalRemoteControlState code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatusEnumFactory.java deleted file mode 100644 index 518a37ccee9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatusEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ManagedParticipationStatusEnumFactory implements EnumFactory { - - public V3ManagedParticipationStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("normal".equals(codeString)) - return V3ManagedParticipationStatus.NORMAL; - if ("active".equals(codeString)) - return V3ManagedParticipationStatus.ACTIVE; - if ("cancelled".equals(codeString)) - return V3ManagedParticipationStatus.CANCELLED; - if ("completed".equals(codeString)) - return V3ManagedParticipationStatus.COMPLETED; - if ("pending".equals(codeString)) - return V3ManagedParticipationStatus.PENDING; - if ("nullified".equals(codeString)) - return V3ManagedParticipationStatus.NULLIFIED; - throw new IllegalArgumentException("Unknown V3ManagedParticipationStatus code '"+codeString+"'"); - } - - public String toCode(V3ManagedParticipationStatus code) { - if (code == V3ManagedParticipationStatus.NORMAL) - return "normal"; - if (code == V3ManagedParticipationStatus.ACTIVE) - return "active"; - if (code == V3ManagedParticipationStatus.CANCELLED) - return "cancelled"; - if (code == V3ManagedParticipationStatus.COMPLETED) - return "completed"; - if (code == V3ManagedParticipationStatus.PENDING) - return "pending"; - if (code == V3ManagedParticipationStatus.NULLIFIED) - return "nullified"; - return "?"; - } - - public String toSystem(V3ManagedParticipationStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationshipEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationshipEnumFactory.java deleted file mode 100644 index 2613d9cd307..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationshipEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3MapRelationshipEnumFactory implements EnumFactory { - - public V3MapRelationship fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("BT".equals(codeString)) - return V3MapRelationship.BT; - if ("E".equals(codeString)) - return V3MapRelationship.E; - if ("NT".equals(codeString)) - return V3MapRelationship.NT; - throw new IllegalArgumentException("Unknown V3MapRelationship code '"+codeString+"'"); - } - - public String toCode(V3MapRelationship code) { - if (code == V3MapRelationship.BT) - return "BT"; - if (code == V3MapRelationship.E) - return "E"; - if (code == V3MapRelationship.NT) - return "NT"; - return "?"; - } - - public String toSystem(V3MapRelationship code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatusEnumFactory.java deleted file mode 100644 index 812f123c4a3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatusEnumFactory.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3MaritalStatusEnumFactory implements EnumFactory { - - public V3MaritalStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("A".equals(codeString)) - return V3MaritalStatus.A; - if ("D".equals(codeString)) - return V3MaritalStatus.D; - if ("I".equals(codeString)) - return V3MaritalStatus.I; - if ("L".equals(codeString)) - return V3MaritalStatus.L; - if ("M".equals(codeString)) - return V3MaritalStatus.M; - if ("P".equals(codeString)) - return V3MaritalStatus.P; - if ("S".equals(codeString)) - return V3MaritalStatus.S; - if ("T".equals(codeString)) - return V3MaritalStatus.T; - if ("U".equals(codeString)) - return V3MaritalStatus.U; - if ("W".equals(codeString)) - return V3MaritalStatus.W; - throw new IllegalArgumentException("Unknown V3MaritalStatus code '"+codeString+"'"); - } - - public String toCode(V3MaritalStatus code) { - if (code == V3MaritalStatus.A) - return "A"; - if (code == V3MaritalStatus.D) - return "D"; - if (code == V3MaritalStatus.I) - return "I"; - if (code == V3MaritalStatus.L) - return "L"; - if (code == V3MaritalStatus.M) - return "M"; - if (code == V3MaritalStatus.P) - return "P"; - if (code == V3MaritalStatus.S) - return "S"; - if (code == V3MaritalStatus.T) - return "T"; - if (code == V3MaritalStatus.U) - return "U"; - if (code == V3MaritalStatus.W) - return "W"; - return "?"; - } - - public String toSystem(V3MaritalStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriorityEnumFactory.java deleted file mode 100644 index 20492af1d4a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriorityEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3MessageWaitingPriorityEnumFactory implements EnumFactory { - - public V3MessageWaitingPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("H".equals(codeString)) - return V3MessageWaitingPriority.H; - if ("L".equals(codeString)) - return V3MessageWaitingPriority.L; - if ("M".equals(codeString)) - return V3MessageWaitingPriority.M; - throw new IllegalArgumentException("Unknown V3MessageWaitingPriority code '"+codeString+"'"); - } - - public String toCode(V3MessageWaitingPriority code) { - if (code == V3MessageWaitingPriority.H) - return "H"; - if (code == V3MessageWaitingPriority.L) - return "L"; - if (code == V3MessageWaitingPriority.M) - return "M"; - return "?"; - } - - public String toSystem(V3MessageWaitingPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicatorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicatorEnumFactory.java deleted file mode 100644 index 4007c7fffe9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicatorEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ModifyIndicatorEnumFactory implements EnumFactory { - - public V3ModifyIndicator fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("M".equals(codeString)) - return V3ModifyIndicator.M; - if ("N".equals(codeString)) - return V3ModifyIndicator.N; - throw new IllegalArgumentException("Unknown V3ModifyIndicator code '"+codeString+"'"); - } - - public String toCode(V3ModifyIndicator code) { - if (code == V3ModifyIndicator.M) - return "M"; - if (code == V3ModifyIndicator.N) - return "N"; - return "?"; - } - - public String toSystem(V3ModifyIndicator code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignatureEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignatureEnumFactory.java deleted file mode 100644 index a42a5343dca..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignatureEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ParticipationSignatureEnumFactory implements EnumFactory { - - public V3ParticipationSignature fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("I".equals(codeString)) - return V3ParticipationSignature.I; - if ("S".equals(codeString)) - return V3ParticipationSignature.S; - if ("X".equals(codeString)) - return V3ParticipationSignature.X; - throw new IllegalArgumentException("Unknown V3ParticipationSignature code '"+codeString+"'"); - } - - public String toCode(V3ParticipationSignature code) { - if (code == V3ParticipationSignature.I) - return "I"; - if (code == V3ParticipationSignature.S) - return "S"; - if (code == V3ParticipationSignature.X) - return "X"; - return "?"; - } - - public String toSystem(V3ParticipationSignature code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportanceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportanceEnumFactory.java deleted file mode 100644 index 3afae1ff537..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportanceEnumFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3PatientImportanceEnumFactory implements EnumFactory { - - public V3PatientImportance fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("BM".equals(codeString)) - return V3PatientImportance.BM; - if ("DFM".equals(codeString)) - return V3PatientImportance.DFM; - if ("DR".equals(codeString)) - return V3PatientImportance.DR; - if ("FD".equals(codeString)) - return V3PatientImportance.FD; - if ("FOR".equals(codeString)) - return V3PatientImportance.FOR; - if ("GOVT".equals(codeString)) - return V3PatientImportance.GOVT; - if ("SFM".equals(codeString)) - return V3PatientImportance.SFM; - if ("STF".equals(codeString)) - return V3PatientImportance.STF; - if ("VIP".equals(codeString)) - return V3PatientImportance.VIP; - throw new IllegalArgumentException("Unknown V3PatientImportance code '"+codeString+"'"); - } - - public String toCode(V3PatientImportance code) { - if (code == V3PatientImportance.BM) - return "BM"; - if (code == V3PatientImportance.DFM) - return "DFM"; - if (code == V3PatientImportance.DR) - return "DR"; - if (code == V3PatientImportance.FD) - return "FD"; - if (code == V3PatientImportance.FOR) - return "FOR"; - if (code == V3PatientImportance.GOVT) - return "GOVT"; - if (code == V3PatientImportance.SFM) - return "SFM"; - if (code == V3PatientImportance.STF) - return "STF"; - if (code == V3PatientImportance.VIP) - return "VIP"; - return "?"; - } - - public String toSystem(V3PatientImportance code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTermsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTermsEnumFactory.java deleted file mode 100644 index 36734171b68..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTermsEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3PaymentTermsEnumFactory implements EnumFactory { - - public V3PaymentTerms fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("COD".equals(codeString)) - return V3PaymentTerms.COD; - if ("N30".equals(codeString)) - return V3PaymentTerms.N30; - if ("N60".equals(codeString)) - return V3PaymentTerms.N60; - if ("N90".equals(codeString)) - return V3PaymentTerms.N90; - throw new IllegalArgumentException("Unknown V3PaymentTerms code '"+codeString+"'"); - } - - public String toCode(V3PaymentTerms code) { - if (code == V3PaymentTerms.COD) - return "COD"; - if (code == V3PaymentTerms.N30) - return "N30"; - if (code == V3PaymentTerms.N60) - return "N60"; - if (code == V3PaymentTerms.N90) - return "N90"; - return "?"; - } - - public String toSystem(V3PaymentTerms code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingIDEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingIDEnumFactory.java deleted file mode 100644 index ea5a32e0851..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingIDEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ProcessingIDEnumFactory implements EnumFactory { - - public V3ProcessingID fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("D".equals(codeString)) - return V3ProcessingID.D; - if ("P".equals(codeString)) - return V3ProcessingID.P; - if ("T".equals(codeString)) - return V3ProcessingID.T; - throw new IllegalArgumentException("Unknown V3ProcessingID code '"+codeString+"'"); - } - - public String toCode(V3ProcessingID code) { - if (code == V3ProcessingID.D) - return "D"; - if (code == V3ProcessingID.P) - return "P"; - if (code == V3ProcessingID.T) - return "T"; - return "?"; - } - - public String toSystem(V3ProcessingID code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingModeEnumFactory.java deleted file mode 100644 index d758c9a8b00..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingModeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ProcessingModeEnumFactory implements EnumFactory { - - public V3ProcessingMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("A".equals(codeString)) - return V3ProcessingMode.A; - if ("I".equals(codeString)) - return V3ProcessingMode.I; - if ("R".equals(codeString)) - return V3ProcessingMode.R; - if ("T".equals(codeString)) - return V3ProcessingMode.T; - throw new IllegalArgumentException("Unknown V3ProcessingMode code '"+codeString+"'"); - } - - public String toCode(V3ProcessingMode code) { - if (code == V3ProcessingMode.A) - return "A"; - if (code == V3ProcessingMode.I) - return "I"; - if (code == V3ProcessingMode.R) - return "R"; - if (code == V3ProcessingMode.T) - return "T"; - return "?"; - } - - public String toSystem(V3ProcessingMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriorityEnumFactory.java deleted file mode 100644 index 04846b70041..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriorityEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3QueryPriorityEnumFactory implements EnumFactory { - - public V3QueryPriority fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("D".equals(codeString)) - return V3QueryPriority.D; - if ("I".equals(codeString)) - return V3QueryPriority.I; - throw new IllegalArgumentException("Unknown V3QueryPriority code '"+codeString+"'"); - } - - public String toCode(V3QueryPriority code) { - if (code == V3QueryPriority.D) - return "D"; - if (code == V3QueryPriority.I) - return "I"; - return "?"; - } - - public String toSystem(V3QueryPriority code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimitEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimitEnumFactory.java deleted file mode 100644 index c20bdd27c96..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimitEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3QueryRequestLimitEnumFactory implements EnumFactory { - - public V3QueryRequestLimit fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_QueryRequestLimit".equals(codeString)) - return V3QueryRequestLimit._QUERYREQUESTLIMIT; - if ("RD".equals(codeString)) - return V3QueryRequestLimit.RD; - throw new IllegalArgumentException("Unknown V3QueryRequestLimit code '"+codeString+"'"); - } - - public String toCode(V3QueryRequestLimit code) { - if (code == V3QueryRequestLimit._QUERYREQUESTLIMIT) - return "_QueryRequestLimit"; - if (code == V3QueryRequestLimit.RD) - return "RD"; - return "?"; - } - - public String toSystem(V3QueryRequestLimit code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponseEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponseEnumFactory.java deleted file mode 100644 index 6da09c9d6b3..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponseEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3QueryResponseEnumFactory implements EnumFactory { - - public V3QueryResponse fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AE".equals(codeString)) - return V3QueryResponse.AE; - if ("NF".equals(codeString)) - return V3QueryResponse.NF; - if ("OK".equals(codeString)) - return V3QueryResponse.OK; - if ("QE".equals(codeString)) - return V3QueryResponse.QE; - throw new IllegalArgumentException("Unknown V3QueryResponse code '"+codeString+"'"); - } - - public String toCode(V3QueryResponse code) { - if (code == V3QueryResponse.AE) - return "AE"; - if (code == V3QueryResponse.NF) - return "NF"; - if (code == V3QueryResponse.OK) - return "OK"; - if (code == V3QueryResponse.QE) - return "QE"; - return "?"; - } - - public String toSystem(V3QueryResponse code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCodeEnumFactory.java deleted file mode 100644 index 0c4b633f617..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCodeEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3QueryStatusCodeEnumFactory implements EnumFactory { - - public V3QueryStatusCode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("aborted".equals(codeString)) - return V3QueryStatusCode.ABORTED; - if ("deliveredResponse".equals(codeString)) - return V3QueryStatusCode.DELIVEREDRESPONSE; - if ("executing".equals(codeString)) - return V3QueryStatusCode.EXECUTING; - if ("new".equals(codeString)) - return V3QueryStatusCode.NEW; - if ("waitContinuedQueryResponse".equals(codeString)) - return V3QueryStatusCode.WAITCONTINUEDQUERYRESPONSE; - throw new IllegalArgumentException("Unknown V3QueryStatusCode code '"+codeString+"'"); - } - - public String toCode(V3QueryStatusCode code) { - if (code == V3QueryStatusCode.ABORTED) - return "aborted"; - if (code == V3QueryStatusCode.DELIVEREDRESPONSE) - return "deliveredResponse"; - if (code == V3QueryStatusCode.EXECUTING) - return "executing"; - if (code == V3QueryStatusCode.NEW) - return "new"; - if (code == V3QueryStatusCode.WAITCONTINUEDQUERYRESPONSE) - return "waitContinuedQueryResponse"; - return "?"; - } - - public String toSystem(V3QueryStatusCode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperatorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperatorEnumFactory.java deleted file mode 100644 index 87b6e76c76e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperatorEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3RelationalOperatorEnumFactory implements EnumFactory { - - public V3RelationalOperator fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("CT".equals(codeString)) - return V3RelationalOperator.CT; - if ("EQ".equals(codeString)) - return V3RelationalOperator.EQ; - if ("GE".equals(codeString)) - return V3RelationalOperator.GE; - if ("GN".equals(codeString)) - return V3RelationalOperator.GN; - if ("GT".equals(codeString)) - return V3RelationalOperator.GT; - if ("LE".equals(codeString)) - return V3RelationalOperator.LE; - if ("LT".equals(codeString)) - return V3RelationalOperator.LT; - if ("NE".equals(codeString)) - return V3RelationalOperator.NE; - throw new IllegalArgumentException("Unknown V3RelationalOperator code '"+codeString+"'"); - } - - public String toCode(V3RelationalOperator code) { - if (code == V3RelationalOperator.CT) - return "CT"; - if (code == V3RelationalOperator.EQ) - return "EQ"; - if (code == V3RelationalOperator.GE) - return "GE"; - if (code == V3RelationalOperator.GN) - return "GN"; - if (code == V3RelationalOperator.GT) - return "GT"; - if (code == V3RelationalOperator.LE) - return "LE"; - if (code == V3RelationalOperator.LT) - return "LT"; - if (code == V3RelationalOperator.NE) - return "NE"; - return "?"; - } - - public String toSystem(V3RelationalOperator code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunctionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunctionEnumFactory.java deleted file mode 100644 index f6e6a5bfd66..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunctionEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3RelationshipConjunctionEnumFactory implements EnumFactory { - - public V3RelationshipConjunction fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("AND".equals(codeString)) - return V3RelationshipConjunction.AND; - if ("OR".equals(codeString)) - return V3RelationshipConjunction.OR; - if ("XOR".equals(codeString)) - return V3RelationshipConjunction.XOR; - throw new IllegalArgumentException("Unknown V3RelationshipConjunction code '"+codeString+"'"); - } - - public String toCode(V3RelationshipConjunction code) { - if (code == V3RelationshipConjunction.AND) - return "AND"; - if (code == V3RelationshipConjunction.OR) - return "OR"; - if (code == V3RelationshipConjunction.XOR) - return "XOR"; - return "?"; - } - - public String toSystem(V3RelationshipConjunction code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevelEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevelEnumFactory.java deleted file mode 100644 index 0af5caa7f24..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevelEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ResponseLevelEnumFactory implements EnumFactory { - - public V3ResponseLevel fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("C".equals(codeString)) - return V3ResponseLevel.C; - if ("D".equals(codeString)) - return V3ResponseLevel.D; - if ("E".equals(codeString)) - return V3ResponseLevel.E; - if ("F".equals(codeString)) - return V3ResponseLevel.F; - if ("N".equals(codeString)) - return V3ResponseLevel.N; - if ("R".equals(codeString)) - return V3ResponseLevel.R; - if ("X".equals(codeString)) - return V3ResponseLevel.X; - throw new IllegalArgumentException("Unknown V3ResponseLevel code '"+codeString+"'"); - } - - public String toCode(V3ResponseLevel code) { - if (code == V3ResponseLevel.C) - return "C"; - if (code == V3ResponseLevel.D) - return "D"; - if (code == V3ResponseLevel.E) - return "E"; - if (code == V3ResponseLevel.F) - return "F"; - if (code == V3ResponseLevel.N) - return "N"; - if (code == V3ResponseLevel.R) - return "R"; - if (code == V3ResponseLevel.X) - return "X"; - return "?"; - } - - public String toSystem(V3ResponseLevel code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModalityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModalityEnumFactory.java deleted file mode 100644 index 1cf6714214f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModalityEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ResponseModalityEnumFactory implements EnumFactory { - - public V3ResponseModality fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("B".equals(codeString)) - return V3ResponseModality.B; - if ("R".equals(codeString)) - return V3ResponseModality.R; - if ("T".equals(codeString)) - return V3ResponseModality.T; - throw new IllegalArgumentException("Unknown V3ResponseModality code '"+codeString+"'"); - } - - public String toCode(V3ResponseModality code) { - if (code == V3ResponseModality.B) - return "B"; - if (code == V3ResponseModality.R) - return "R"; - if (code == V3ResponseModality.T) - return "T"; - return "?"; - } - - public String toSystem(V3ResponseModality code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModeEnumFactory.java deleted file mode 100644 index a8ff7ed30db..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModeEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3ResponseModeEnumFactory implements EnumFactory { - - public V3ResponseMode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("D".equals(codeString)) - return V3ResponseMode.D; - if ("I".equals(codeString)) - return V3ResponseMode.I; - if ("Q".equals(codeString)) - return V3ResponseMode.Q; - throw new IllegalArgumentException("Unknown V3ResponseMode code '"+codeString+"'"); - } - - public String toCode(V3ResponseMode code) { - if (code == V3ResponseMode.D) - return "D"; - if (code == V3ResponseMode.I) - return "I"; - if (code == V3ResponseMode.Q) - return "Q"; - return "?"; - } - - public String toSystem(V3ResponseMode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatusEnumFactory.java deleted file mode 100644 index c4c7bd88c0f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatusEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3RoleLinkStatusEnumFactory implements EnumFactory { - - public V3RoleLinkStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("NORMAL".equals(codeString)) - return V3RoleLinkStatus.NORMAL; - if ("ACTIVE".equals(codeString)) - return V3RoleLinkStatus.ACTIVE; - if ("CANCELLED".equals(codeString)) - return V3RoleLinkStatus.CANCELLED; - if ("COMPLETED".equals(codeString)) - return V3RoleLinkStatus.COMPLETED; - if ("PENDING".equals(codeString)) - return V3RoleLinkStatus.PENDING; - if ("NULLIFIED".equals(codeString)) - return V3RoleLinkStatus.NULLIFIED; - throw new IllegalArgumentException("Unknown V3RoleLinkStatus code '"+codeString+"'"); - } - - public String toCode(V3RoleLinkStatus code) { - if (code == V3RoleLinkStatus.NORMAL) - return "NORMAL"; - if (code == V3RoleLinkStatus.ACTIVE) - return "ACTIVE"; - if (code == V3RoleLinkStatus.CANCELLED) - return "CANCELLED"; - if (code == V3RoleLinkStatus.COMPLETED) - return "COMPLETED"; - if (code == V3RoleLinkStatus.PENDING) - return "PENDING"; - if (code == V3RoleLinkStatus.NULLIFIED) - return "NULLIFIED"; - return "?"; - } - - public String toSystem(V3RoleLinkStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkTypeEnumFactory.java deleted file mode 100644 index bb643d7ac78..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkTypeEnumFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3RoleLinkTypeEnumFactory implements EnumFactory { - - public V3RoleLinkType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("REL".equals(codeString)) - return V3RoleLinkType.REL; - if ("BACKUP".equals(codeString)) - return V3RoleLinkType.BACKUP; - if ("CONT".equals(codeString)) - return V3RoleLinkType.CONT; - if ("DIRAUTH".equals(codeString)) - return V3RoleLinkType.DIRAUTH; - if ("IDENT".equals(codeString)) - return V3RoleLinkType.IDENT; - if ("INDAUTH".equals(codeString)) - return V3RoleLinkType.INDAUTH; - if ("PART".equals(codeString)) - return V3RoleLinkType.PART; - if ("REPL".equals(codeString)) - return V3RoleLinkType.REPL; - throw new IllegalArgumentException("Unknown V3RoleLinkType code '"+codeString+"'"); - } - - public String toCode(V3RoleLinkType code) { - if (code == V3RoleLinkType.REL) - return "REL"; - if (code == V3RoleLinkType.BACKUP) - return "BACKUP"; - if (code == V3RoleLinkType.CONT) - return "CONT"; - if (code == V3RoleLinkType.DIRAUTH) - return "DIRAUTH"; - if (code == V3RoleLinkType.IDENT) - return "IDENT"; - if (code == V3RoleLinkType.INDAUTH) - return "INDAUTH"; - if (code == V3RoleLinkType.PART) - return "PART"; - if (code == V3RoleLinkType.REPL) - return "REPL"; - return "?"; - } - - public String toSystem(V3RoleLinkType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatusEnumFactory.java deleted file mode 100644 index fe3a727549f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatusEnumFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3RoleStatusEnumFactory implements EnumFactory { - - public V3RoleStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("normal".equals(codeString)) - return V3RoleStatus.NORMAL; - if ("active".equals(codeString)) - return V3RoleStatus.ACTIVE; - if ("cancelled".equals(codeString)) - return V3RoleStatus.CANCELLED; - if ("pending".equals(codeString)) - return V3RoleStatus.PENDING; - if ("suspended".equals(codeString)) - return V3RoleStatus.SUSPENDED; - if ("terminated".equals(codeString)) - return V3RoleStatus.TERMINATED; - if ("nullified".equals(codeString)) - return V3RoleStatus.NULLIFIED; - throw new IllegalArgumentException("Unknown V3RoleStatus code '"+codeString+"'"); - } - - public String toCode(V3RoleStatus code) { - if (code == V3RoleStatus.NORMAL) - return "normal"; - if (code == V3RoleStatus.ACTIVE) - return "active"; - if (code == V3RoleStatus.CANCELLED) - return "cancelled"; - if (code == V3RoleStatus.PENDING) - return "pending"; - if (code == V3RoleStatus.SUSPENDED) - return "suspended"; - if (code == V3RoleStatus.TERMINATED) - return "terminated"; - if (code == V3RoleStatus.NULLIFIED) - return "nullified"; - return "?"; - } - - public String toSystem(V3RoleStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SequencingEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SequencingEnumFactory.java deleted file mode 100644 index 9335746319b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SequencingEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3SequencingEnumFactory implements EnumFactory { - - public V3Sequencing fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("A".equals(codeString)) - return V3Sequencing.A; - if ("D".equals(codeString)) - return V3Sequencing.D; - if ("N".equals(codeString)) - return V3Sequencing.N; - throw new IllegalArgumentException("Unknown V3Sequencing code '"+codeString+"'"); - } - - public String toCode(V3Sequencing code) { - if (code == V3Sequencing.A) - return "A"; - if (code == V3Sequencing.D) - return "D"; - if (code == V3Sequencing.N) - return "N"; - return "?"; - } - - public String toSystem(V3Sequencing code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperatorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperatorEnumFactory.java deleted file mode 100644 index d00cea48221..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperatorEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3SetOperatorEnumFactory implements EnumFactory { - - public V3SetOperator fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_ValueSetOperator".equals(codeString)) - return V3SetOperator._VALUESETOPERATOR; - if ("E".equals(codeString)) - return V3SetOperator.E; - if ("I".equals(codeString)) - return V3SetOperator.I; - if ("A".equals(codeString)) - return V3SetOperator.A; - if ("H".equals(codeString)) - return V3SetOperator.H; - if ("P".equals(codeString)) - return V3SetOperator.P; - throw new IllegalArgumentException("Unknown V3SetOperator code '"+codeString+"'"); - } - - public String toCode(V3SetOperator code) { - if (code == V3SetOperator._VALUESETOPERATOR) - return "_ValueSetOperator"; - if (code == V3SetOperator.E) - return "E"; - if (code == V3SetOperator.I) - return "I"; - if (code == V3SetOperator.A) - return "A"; - if (code == V3SetOperator.H) - return "H"; - if (code == V3SetOperator.P) - return "P"; - return "?"; - } - - public String toSystem(V3SetOperator code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionConditionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionConditionEnumFactory.java deleted file mode 100644 index 8a5adfebd25..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionConditionEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3SubstitutionConditionEnumFactory implements EnumFactory { - - public V3SubstitutionCondition fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("_Conditional".equals(codeString)) - return V3SubstitutionCondition._CONDITIONAL; - if ("CONFIRM".equals(codeString)) - return V3SubstitutionCondition.CONFIRM; - if ("NOTIFY".equals(codeString)) - return V3SubstitutionCondition.NOTIFY; - if ("NOSUB".equals(codeString)) - return V3SubstitutionCondition.NOSUB; - if ("UNCOND".equals(codeString)) - return V3SubstitutionCondition.UNCOND; - throw new IllegalArgumentException("Unknown V3SubstitutionCondition code '"+codeString+"'"); - } - - public String toCode(V3SubstitutionCondition code) { - if (code == V3SubstitutionCondition._CONDITIONAL) - return "_Conditional"; - if (code == V3SubstitutionCondition.CONFIRM) - return "CONFIRM"; - if (code == V3SubstitutionCondition.NOTIFY) - return "NOTIFY"; - if (code == V3SubstitutionCondition.NOSUB) - return "NOSUB"; - if (code == V3SubstitutionCondition.UNCOND) - return "UNCOND"; - return "?"; - } - - public String toSystem(V3SubstitutionCondition code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java deleted file mode 100644 index 8c021dda5c1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TableCellHorizontalAlignEnumFactory implements EnumFactory { - - public V3TableCellHorizontalAlign fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("center".equals(codeString)) - return V3TableCellHorizontalAlign.CENTER; - if ("char".equals(codeString)) - return V3TableCellHorizontalAlign.CHAR; - if ("justify".equals(codeString)) - return V3TableCellHorizontalAlign.JUSTIFY; - if ("left".equals(codeString)) - return V3TableCellHorizontalAlign.LEFT; - if ("right".equals(codeString)) - return V3TableCellHorizontalAlign.RIGHT; - throw new IllegalArgumentException("Unknown V3TableCellHorizontalAlign code '"+codeString+"'"); - } - - public String toCode(V3TableCellHorizontalAlign code) { - if (code == V3TableCellHorizontalAlign.CENTER) - return "center"; - if (code == V3TableCellHorizontalAlign.CHAR) - return "char"; - if (code == V3TableCellHorizontalAlign.JUSTIFY) - return "justify"; - if (code == V3TableCellHorizontalAlign.LEFT) - return "left"; - if (code == V3TableCellHorizontalAlign.RIGHT) - return "right"; - return "?"; - } - - public String toSystem(V3TableCellHorizontalAlign code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScopeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScopeEnumFactory.java deleted file mode 100644 index 77fe0f78dc5..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScopeEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TableCellScopeEnumFactory implements EnumFactory { - - public V3TableCellScope fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("col".equals(codeString)) - return V3TableCellScope.COL; - if ("colgroup".equals(codeString)) - return V3TableCellScope.COLGROUP; - if ("row".equals(codeString)) - return V3TableCellScope.ROW; - if ("rowgroup".equals(codeString)) - return V3TableCellScope.ROWGROUP; - throw new IllegalArgumentException("Unknown V3TableCellScope code '"+codeString+"'"); - } - - public String toCode(V3TableCellScope code) { - if (code == V3TableCellScope.COL) - return "col"; - if (code == V3TableCellScope.COLGROUP) - return "colgroup"; - if (code == V3TableCellScope.ROW) - return "row"; - if (code == V3TableCellScope.ROWGROUP) - return "rowgroup"; - return "?"; - } - - public String toSystem(V3TableCellScope code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlignEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlignEnumFactory.java deleted file mode 100644 index f0728226d30..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlignEnumFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TableCellVerticalAlignEnumFactory implements EnumFactory { - - public V3TableCellVerticalAlign fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("baseline".equals(codeString)) - return V3TableCellVerticalAlign.BASELINE; - if ("bottom".equals(codeString)) - return V3TableCellVerticalAlign.BOTTOM; - if ("middle".equals(codeString)) - return V3TableCellVerticalAlign.MIDDLE; - if ("top".equals(codeString)) - return V3TableCellVerticalAlign.TOP; - throw new IllegalArgumentException("Unknown V3TableCellVerticalAlign code '"+codeString+"'"); - } - - public String toCode(V3TableCellVerticalAlign code) { - if (code == V3TableCellVerticalAlign.BASELINE) - return "baseline"; - if (code == V3TableCellVerticalAlign.BOTTOM) - return "bottom"; - if (code == V3TableCellVerticalAlign.MIDDLE) - return "middle"; - if (code == V3TableCellVerticalAlign.TOP) - return "top"; - return "?"; - } - - public String toSystem(V3TableCellVerticalAlign code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrameEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrameEnumFactory.java deleted file mode 100644 index 839ad2cd0ab..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrameEnumFactory.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TableFrameEnumFactory implements EnumFactory { - - public V3TableFrame fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("above".equals(codeString)) - return V3TableFrame.ABOVE; - if ("below".equals(codeString)) - return V3TableFrame.BELOW; - if ("border".equals(codeString)) - return V3TableFrame.BORDER; - if ("box".equals(codeString)) - return V3TableFrame.BOX; - if ("hsides".equals(codeString)) - return V3TableFrame.HSIDES; - if ("lhs".equals(codeString)) - return V3TableFrame.LHS; - if ("rhs".equals(codeString)) - return V3TableFrame.RHS; - if ("void".equals(codeString)) - return V3TableFrame.VOID; - if ("vsides".equals(codeString)) - return V3TableFrame.VSIDES; - throw new IllegalArgumentException("Unknown V3TableFrame code '"+codeString+"'"); - } - - public String toCode(V3TableFrame code) { - if (code == V3TableFrame.ABOVE) - return "above"; - if (code == V3TableFrame.BELOW) - return "below"; - if (code == V3TableFrame.BORDER) - return "border"; - if (code == V3TableFrame.BOX) - return "box"; - if (code == V3TableFrame.HSIDES) - return "hsides"; - if (code == V3TableFrame.LHS) - return "lhs"; - if (code == V3TableFrame.RHS) - return "rhs"; - if (code == V3TableFrame.VOID) - return "void"; - if (code == V3TableFrame.VSIDES) - return "vsides"; - return "?"; - } - - public String toSystem(V3TableFrame code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRulesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRulesEnumFactory.java deleted file mode 100644 index cc719189cb6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRulesEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TableRulesEnumFactory implements EnumFactory { - - public V3TableRules fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("all".equals(codeString)) - return V3TableRules.ALL; - if ("cols".equals(codeString)) - return V3TableRules.COLS; - if ("groups".equals(codeString)) - return V3TableRules.GROUPS; - if ("none".equals(codeString)) - return V3TableRules.NONE; - if ("rows".equals(codeString)) - return V3TableRules.ROWS; - throw new IllegalArgumentException("Unknown V3TableRules code '"+codeString+"'"); - } - - public String toCode(V3TableRules code) { - if (code == V3TableRules.ALL) - return "all"; - if (code == V3TableRules.COLS) - return "cols"; - if (code == V3TableRules.GROUPS) - return "groups"; - if (code == V3TableRules.NONE) - return "none"; - if (code == V3TableRules.ROWS) - return "rows"; - return "?"; - } - - public String toSystem(V3TableRules code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwarenessEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwarenessEnumFactory.java deleted file mode 100644 index 62c14a2ba78..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwarenessEnumFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TargetAwarenessEnumFactory implements EnumFactory { - - public V3TargetAwareness fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("D".equals(codeString)) - return V3TargetAwareness.D; - if ("F".equals(codeString)) - return V3TargetAwareness.F; - if ("I".equals(codeString)) - return V3TargetAwareness.I; - if ("M".equals(codeString)) - return V3TargetAwareness.M; - if ("P".equals(codeString)) - return V3TargetAwareness.P; - if ("U".equals(codeString)) - return V3TargetAwareness.U; - throw new IllegalArgumentException("Unknown V3TargetAwareness code '"+codeString+"'"); - } - - public String toCode(V3TargetAwareness code) { - if (code == V3TargetAwareness.D) - return "D"; - if (code == V3TargetAwareness.F) - return "F"; - if (code == V3TargetAwareness.I) - return "I"; - if (code == V3TargetAwareness.M) - return "M"; - if (code == V3TargetAwareness.P) - return "P"; - if (code == V3TargetAwareness.U) - return "U"; - return "?"; - } - - public String toSystem(V3TargetAwareness code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java deleted file mode 100644 index 2097036aca9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TelecommunicationCapabilitiesEnumFactory implements EnumFactory { - - public V3TelecommunicationCapabilities fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("data".equals(codeString)) - return V3TelecommunicationCapabilities.DATA; - if ("fax".equals(codeString)) - return V3TelecommunicationCapabilities.FAX; - if ("sms".equals(codeString)) - return V3TelecommunicationCapabilities.SMS; - if ("tty".equals(codeString)) - return V3TelecommunicationCapabilities.TTY; - if ("voice".equals(codeString)) - return V3TelecommunicationCapabilities.VOICE; - throw new IllegalArgumentException("Unknown V3TelecommunicationCapabilities code '"+codeString+"'"); - } - - public String toCode(V3TelecommunicationCapabilities code) { - if (code == V3TelecommunicationCapabilities.DATA) - return "data"; - if (code == V3TelecommunicationCapabilities.FAX) - return "fax"; - if (code == V3TelecommunicationCapabilities.SMS) - return "sms"; - if (code == V3TelecommunicationCapabilities.TTY) - return "tty"; - if (code == V3TelecommunicationCapabilities.VOICE) - return "voice"; - return "?"; - } - - public String toSystem(V3TelecommunicationCapabilities code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java deleted file mode 100644 index 94cf8f457fe..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class V3TransmissionRelationshipTypeCodeEnumFactory implements EnumFactory { - - public V3TransmissionRelationshipTypeCode fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("SEQL".equals(codeString)) - return V3TransmissionRelationshipTypeCode.SEQL; - throw new IllegalArgumentException("Unknown V3TransmissionRelationshipTypeCode code '"+codeString+"'"); - } - - public String toCode(V3TransmissionRelationshipTypeCode code) { - if (code == V3TransmissionRelationshipTypeCode.SEQL) - return "SEQL"; - return "?"; - } - - public String toSystem(V3TransmissionRelationshipTypeCode code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java deleted file mode 100644 index c70dc498351..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class VaccinationProtocolDoseStatusEnumFactory implements EnumFactory { - - public VaccinationProtocolDoseStatus fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("count".equals(codeString)) - return VaccinationProtocolDoseStatus.COUNT; - if ("nocount".equals(codeString)) - return VaccinationProtocolDoseStatus.NOCOUNT; - throw new IllegalArgumentException("Unknown VaccinationProtocolDoseStatus code '"+codeString+"'"); - } - - public String toCode(VaccinationProtocolDoseStatus code) { - if (code == VaccinationProtocolDoseStatus.COUNT) - return "count"; - if (code == VaccinationProtocolDoseStatus.NOCOUNT) - return "nocount"; - return "?"; - } - - public String toSystem(VaccinationProtocolDoseStatus code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java deleted file mode 100644 index ee1c7721af6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class VaccinationProtocolDoseStatusReasonEnumFactory implements EnumFactory { - - public VaccinationProtocolDoseStatusReason fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("advstorage".equals(codeString)) - return VaccinationProtocolDoseStatusReason.ADVSTORAGE; - if ("coldchbrk".equals(codeString)) - return VaccinationProtocolDoseStatusReason.COLDCHBRK; - if ("explot".equals(codeString)) - return VaccinationProtocolDoseStatusReason.EXPLOT; - if ("outsidesched".equals(codeString)) - return VaccinationProtocolDoseStatusReason.OUTSIDESCHED; - if ("prodrecall".equals(codeString)) - return VaccinationProtocolDoseStatusReason.PRODRECALL; - throw new IllegalArgumentException("Unknown VaccinationProtocolDoseStatusReason code '"+codeString+"'"); - } - - public String toCode(VaccinationProtocolDoseStatusReason code) { - if (code == VaccinationProtocolDoseStatusReason.ADVSTORAGE) - return "advstorage"; - if (code == VaccinationProtocolDoseStatusReason.COLDCHBRK) - return "coldchbrk"; - if (code == VaccinationProtocolDoseStatusReason.EXPLOT) - return "explot"; - if (code == VaccinationProtocolDoseStatusReason.OUTSIDESCHED) - return "outsidesched"; - if (code == VaccinationProtocolDoseStatusReason.PRODRECALL) - return "prodrecall"; - return "?"; - } - - public String toSystem(VaccinationProtocolDoseStatusReason code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantStateEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantStateEnumFactory.java deleted file mode 100644 index a842edf1abf..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantStateEnumFactory.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class VariantStateEnumFactory implements EnumFactory { - - public VariantState fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("positive".equals(codeString)) - return VariantState.POSITIVE; - if ("negative".equals(codeString)) - return VariantState.NEGATIVE; - if ("absent".equals(codeString)) - return VariantState.ABSENT; - throw new IllegalArgumentException("Unknown VariantState code '"+codeString+"'"); - } - - public String toCode(VariantState code) { - if (code == VariantState.POSITIVE) - return "positive"; - if (code == VariantState.NEGATIVE) - return "negative"; - if (code == VariantState.ABSENT) - return "absent"; - return "?"; - } - - public String toSystem(VariantState code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProductEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProductEnumFactory.java deleted file mode 100644 index 7e019858e39..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProductEnumFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class VisionProductEnumFactory implements EnumFactory { - - public VisionProduct fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("lens".equals(codeString)) - return VisionProduct.LENS; - if ("contact".equals(codeString)) - return VisionProduct.CONTACT; - throw new IllegalArgumentException("Unknown VisionProduct code '"+codeString+"'"); - } - - public String toCode(VisionProduct code) { - if (code == VisionProduct.LENS) - return "lens"; - if (code == VisionProduct.CONTACT) - return "contact"; - return "?"; - } - - public String toSystem(VisionProduct code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipTypeEnumFactory.java deleted file mode 100644 index bcc010d0797..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipTypeEnumFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.valuesets; - -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; - -public class XdsRelationshipTypeEnumFactory implements EnumFactory { - - public XdsRelationshipType fromCode(String codeString) throws IllegalArgumentException { - if (codeString == null || "".equals(codeString)) - return null; - if ("APND".equals(codeString)) - return XdsRelationshipType.APND; - if ("RPLC".equals(codeString)) - return XdsRelationshipType.RPLC; - if ("XFRM".equals(codeString)) - return XdsRelationshipType.XFRM; - if ("XFRM_RPLC".equals(codeString)) - return XdsRelationshipType.XFRMRPLC; - if ("signs".equals(codeString)) - return XdsRelationshipType.SIGNS; - throw new IllegalArgumentException("Unknown XdsRelationshipType code '"+codeString+"'"); - } - - public String toCode(XdsRelationshipType code) { - if (code == XdsRelationshipType.APND) - return "APND"; - if (code == XdsRelationshipType.RPLC) - return "RPLC"; - if (code == XdsRelationshipType.XFRM) - return "XFRM"; - if (code == XdsRelationshipType.XFRMRPLC) - return "XFRM_RPLC"; - if (code == XdsRelationshipType.SIGNS) - return "signs"; - return "?"; - } - - public String toSystem(XdsRelationshipType code) { - return code.getSystem(); - } - -} - diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetChecker.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetChecker.java deleted file mode 100644 index 588a103e33a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetChecker.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.hl7.fhir.dstu21.terminologies; - -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander.ETooCostly; -import org.hl7.fhir.dstu21.utils.EOperationOutcome; - -public interface ValueSetChecker { - - boolean codeInValueSet(String system, String code) throws ETooCostly, EOperationOutcome, Exception; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu21/model/fhirversion.properties b/hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu21/model/fhirversion.properties deleted file mode 100644 index 1c2838eac45..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu21/model/fhirversion.properties +++ /dev/null @@ -1,151 +0,0 @@ -# This file contains version definitions - -resource.Account=org.hl7.fhir.dstu21.model.Account -resource.AllergyIntolerance=org.hl7.fhir.dstu21.model.AllergyIntolerance -resource.Appointment=org.hl7.fhir.dstu21.model.Appointment -resource.AppointmentResponse=org.hl7.fhir.dstu21.model.AppointmentResponse -resource.AuditEvent=org.hl7.fhir.dstu21.model.AuditEvent -resource.Basic=org.hl7.fhir.dstu21.model.Basic -resource.Binary=org.hl7.fhir.dstu21.model.Binary -resource.BodySite=org.hl7.fhir.dstu21.model.BodySite -resource.Bundle=org.hl7.fhir.dstu21.model.Bundle -resource.CarePlan=org.hl7.fhir.dstu21.model.CarePlan -resource.Claim=org.hl7.fhir.dstu21.model.Claim -resource.ClaimResponse=org.hl7.fhir.dstu21.model.ClaimResponse -resource.ClinicalImpression=org.hl7.fhir.dstu21.model.ClinicalImpression -resource.Communication=org.hl7.fhir.dstu21.model.Communication -resource.CommunicationRequest=org.hl7.fhir.dstu21.model.CommunicationRequest -resource.Composition=org.hl7.fhir.dstu21.model.Composition -resource.ConceptMap=org.hl7.fhir.dstu21.model.ConceptMap -resource.Condition=org.hl7.fhir.dstu21.model.Condition -resource.Conformance=org.hl7.fhir.dstu21.model.Conformance -resource.Contract=org.hl7.fhir.dstu21.model.Contract -resource.Coverage=org.hl7.fhir.dstu21.model.Coverage -resource.DataElement=org.hl7.fhir.dstu21.model.DataElement -resource.DecisionSupportRule=org.hl7.fhir.dstu21.model.DecisionSupportRule -resource.DecisionSupportServiceModule=org.hl7.fhir.dstu21.model.DecisionSupportServiceModule -resource.DetectedIssue=org.hl7.fhir.dstu21.model.DetectedIssue -resource.Device=org.hl7.fhir.dstu21.model.Device -resource.DeviceComponent=org.hl7.fhir.dstu21.model.DeviceComponent -resource.DeviceMetric=org.hl7.fhir.dstu21.model.DeviceMetric -resource.DeviceUseRequest=org.hl7.fhir.dstu21.model.DeviceUseRequest -resource.DeviceUseStatement=org.hl7.fhir.dstu21.model.DeviceUseStatement -resource.DiagnosticOrder=org.hl7.fhir.dstu21.model.DiagnosticOrder -resource.DiagnosticReport=org.hl7.fhir.dstu21.model.DiagnosticReport -resource.DocumentManifest=org.hl7.fhir.dstu21.model.DocumentManifest -resource.DocumentReference=org.hl7.fhir.dstu21.model.DocumentReference -resource.EligibilityRequest=org.hl7.fhir.dstu21.model.EligibilityRequest -resource.EligibilityResponse=org.hl7.fhir.dstu21.model.EligibilityResponse -resource.Encounter=org.hl7.fhir.dstu21.model.Encounter -resource.EnrollmentRequest=org.hl7.fhir.dstu21.model.EnrollmentRequest -resource.EnrollmentResponse=org.hl7.fhir.dstu21.model.EnrollmentResponse -resource.EpisodeOfCare=org.hl7.fhir.dstu21.model.EpisodeOfCare -resource.ExpansionProfile=org.hl7.fhir.dstu21.model.ExpansionProfile -resource.ExplanationOfBenefit=org.hl7.fhir.dstu21.model.ExplanationOfBenefit -resource.FamilyMemberHistory=org.hl7.fhir.dstu21.model.FamilyMemberHistory -resource.Flag=org.hl7.fhir.dstu21.model.Flag -resource.Goal=org.hl7.fhir.dstu21.model.Goal -resource.Group=org.hl7.fhir.dstu21.model.Group -resource.GuidanceResponse=org.hl7.fhir.dstu21.model.GuidanceResponse -resource.HealthcareService=org.hl7.fhir.dstu21.model.HealthcareService -resource.ImagingObjectSelection=org.hl7.fhir.dstu21.model.ImagingObjectSelection -resource.ImagingStudy=org.hl7.fhir.dstu21.model.ImagingStudy -resource.Immunization=org.hl7.fhir.dstu21.model.Immunization -resource.ImmunizationRecommendation=org.hl7.fhir.dstu21.model.ImmunizationRecommendation -resource.ImplementationGuide=org.hl7.fhir.dstu21.model.ImplementationGuide -resource.Library=org.hl7.fhir.dstu21.model.Library -resource.List=org.hl7.fhir.dstu21.model.ListResource -resource.Location=org.hl7.fhir.dstu21.model.Location -resource.Measure=org.hl7.fhir.dstu21.model.Measure -resource.Media=org.hl7.fhir.dstu21.model.Media -resource.Medication=org.hl7.fhir.dstu21.model.Medication -resource.MedicationAdministration=org.hl7.fhir.dstu21.model.MedicationAdministration -resource.MedicationDispense=org.hl7.fhir.dstu21.model.MedicationDispense -resource.MedicationOrder=org.hl7.fhir.dstu21.model.MedicationOrder -resource.MedicationStatement=org.hl7.fhir.dstu21.model.MedicationStatement -resource.MessageHeader=org.hl7.fhir.dstu21.model.MessageHeader -resource.ModuleDefinition=org.hl7.fhir.dstu21.model.ModuleDefinition -resource.ModuleMetadata=org.hl7.fhir.dstu21.model.ModuleMetadata -resource.NamingSystem=org.hl7.fhir.dstu21.model.NamingSystem -resource.NutritionOrder=org.hl7.fhir.dstu21.model.NutritionOrder -resource.Observation=org.hl7.fhir.dstu21.model.Observation -resource.OperationDefinition=org.hl7.fhir.dstu21.model.OperationDefinition -resource.OperationOutcome=org.hl7.fhir.dstu21.model.OperationOutcome -resource.Order=org.hl7.fhir.dstu21.model.Order -resource.OrderResponse=org.hl7.fhir.dstu21.model.OrderResponse -resource.OrderSet=org.hl7.fhir.dstu21.model.OrderSet -resource.Organization=org.hl7.fhir.dstu21.model.Organization -resource.Parameters=org.hl7.fhir.dstu21.model.Parameters -resource.Patient=org.hl7.fhir.dstu21.model.Patient -resource.PaymentNotice=org.hl7.fhir.dstu21.model.PaymentNotice -resource.PaymentReconciliation=org.hl7.fhir.dstu21.model.PaymentReconciliation -resource.Person=org.hl7.fhir.dstu21.model.Person -resource.Practitioner=org.hl7.fhir.dstu21.model.Practitioner -resource.Procedure=org.hl7.fhir.dstu21.model.Procedure -resource.ProcedureRequest=org.hl7.fhir.dstu21.model.ProcedureRequest -resource.ProcessRequest=org.hl7.fhir.dstu21.model.ProcessRequest -resource.ProcessResponse=org.hl7.fhir.dstu21.model.ProcessResponse -resource.Provenance=org.hl7.fhir.dstu21.model.Provenance -resource.Questionnaire=org.hl7.fhir.dstu21.model.Questionnaire -resource.QuestionnaireResponse=org.hl7.fhir.dstu21.model.QuestionnaireResponse -resource.ReferralRequest=org.hl7.fhir.dstu21.model.ReferralRequest -resource.RelatedPerson=org.hl7.fhir.dstu21.model.RelatedPerson -resource.RiskAssessment=org.hl7.fhir.dstu21.model.RiskAssessment -resource.Schedule=org.hl7.fhir.dstu21.model.Schedule -resource.SearchParameter=org.hl7.fhir.dstu21.model.SearchParameter -resource.Sequence=org.hl7.fhir.dstu21.model.Sequence -resource.Slot=org.hl7.fhir.dstu21.model.Slot -resource.Specimen=org.hl7.fhir.dstu21.model.Specimen -resource.StructureDefinition=org.hl7.fhir.dstu21.model.StructureDefinition -resource.Subscription=org.hl7.fhir.dstu21.model.Subscription -resource.Substance=org.hl7.fhir.dstu21.model.Substance -resource.SupplyDelivery=org.hl7.fhir.dstu21.model.SupplyDelivery -resource.SupplyRequest=org.hl7.fhir.dstu21.model.SupplyRequest -resource.TestScript=org.hl7.fhir.dstu21.model.TestScript -resource.ValueSet=org.hl7.fhir.dstu21.model.ValueSet -resource.VisionPrescription=org.hl7.fhir.dstu21.model.VisionPrescription - -datatype.Address=org.hl7.fhir.dstu21.model.Address -datatype.Age=org.hl7.fhir.dstu21.model.Age -datatype.Annotation=org.hl7.fhir.dstu21.model.Annotation -datatype.Attachment=org.hl7.fhir.dstu21.model.Attachment -datatype.CodeableConcept=org.hl7.fhir.dstu21.model.CodeableConcept -datatype.Coding=org.hl7.fhir.dstu21.model.Coding -datatype.ContactPoint=org.hl7.fhir.dstu21.model.ContactPoint -datatype.Count=org.hl7.fhir.dstu21.model.Count -datatype.Distance=org.hl7.fhir.dstu21.model.Distance -datatype.Duration=org.hl7.fhir.dstu21.model.Duration -datatype.ElementDefinition=org.hl7.fhir.dstu21.model.ElementDefinition -datatype.Extension=org.hl7.fhir.dstu21.model.Extension -datatype.HumanName=org.hl7.fhir.dstu21.model.HumanName -datatype.Identifier=org.hl7.fhir.dstu21.model.Identifier -datatype.Meta=org.hl7.fhir.dstu21.model.Meta -datatype.Money=org.hl7.fhir.dstu21.model.Money -datatype.Narrative=org.hl7.fhir.dstu21.model.Narrative -datatype.Period=org.hl7.fhir.dstu21.model.Period -datatype.Quantity=org.hl7.fhir.dstu21.model.Quantity -datatype.Range=org.hl7.fhir.dstu21.model.Range -datatype.Ratio=org.hl7.fhir.dstu21.model.Ratio -datatype.Reference=org.hl7.fhir.dstu21.model.Reference -datatype.SampledData=org.hl7.fhir.dstu21.model.SampledData -datatype.Signature=org.hl7.fhir.dstu21.model.Signature -datatype.SimpleQuantity=org.hl7.fhir.dstu21.model.SimpleQuantity -datatype.Timing=org.hl7.fhir.dstu21.model.Timing -datatype.base64binary=org.hl7.fhir.dstu21.model.Base64BinaryType -datatype.boolean=org.hl7.fhir.dstu21.model.BooleanType -datatype.code=org.hl7.fhir.dstu21.model.CodeType -datatype.code.2=org.hl7.fhir.dstu21.model.Enumeration -datatype.date=org.hl7.fhir.dstu21.model.DateType -datatype.dateTime=org.hl7.fhir.dstu21.model.DateTimeType -datatype.decimal=org.hl7.fhir.dstu21.model.DecimalType -datatype.id=org.hl7.fhir.dstu21.model.IdType -datatype.instant=org.hl7.fhir.dstu21.model.InstantType -datatype.integer=org.hl7.fhir.dstu21.model.IntegerType -datatype.markdown=org.hl7.fhir.dstu21.model.MarkdownType -datatype.oid=org.hl7.fhir.dstu21.model.OidType -datatype.positiveInt=org.hl7.fhir.dstu21.model.PositiveIntType -datatype.string=org.hl7.fhir.dstu21.model.StringType -datatype.time=org.hl7.fhir.dstu21.model.TimeType -datatype.unsignedInt=org.hl7.fhir.dstu21.model.UnsignedIntType -datatype.uri=org.hl7.fhir.dstu21.model.UriType -datatype.xhtml=org.hl7.fhir.utilities.xhtml.XhtmlNode diff --git a/hapi-fhir-structures-dstu3/.gitignore b/hapi-fhir-structures-dstu3/.gitignore new file mode 100644 index 00000000000..b83d22266ac --- /dev/null +++ b/hapi-fhir-structures-dstu3/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/hapi-fhir-structures-dstu2.1/differences.txt b/hapi-fhir-structures-dstu3/differences.txt similarity index 100% rename from hapi-fhir-structures-dstu2.1/differences.txt rename to hapi-fhir-structures-dstu3/differences.txt diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu3/pom.xml similarity index 96% rename from hapi-fhir-structures-dstu2.1/pom.xml rename to hapi-fhir-structures-dstu3/pom.xml index c82f8b924eb..8528b2d1a71 100644 --- a/hapi-fhir-structures-dstu2.1/pom.xml +++ b/hapi-fhir-structures-dstu3/pom.xml @@ -9,10 +9,10 @@ ../hapi-deployable-pom/pom.xml - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 jar - HAPI FHIR Structures - DSTU2.1 + HAPI FHIR Structures - DSTU3 @@ -22,7 +22,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT test diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/DefinitionException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/DefinitionException.java similarity index 84% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/DefinitionException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/DefinitionException.java index 7ffd7a2a00b..65d5dce5cee 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/DefinitionException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/DefinitionException.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class DefinitionException extends FHIRException { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRException.java similarity index 86% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRException.java index dfc275742f7..d2bdbe145fa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRException.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class FHIRException extends Exception { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRFormatError.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRFormatError.java similarity index 85% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRFormatError.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRFormatError.java index ca93334d166..8d05bc17332 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/FHIRFormatError.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/FHIRFormatError.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class FHIRFormatError extends FHIRException { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/PathEngineException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/PathEngineException.java similarity index 84% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/PathEngineException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/PathEngineException.java index 89572dc32c0..5a1d84086d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/PathEngineException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/PathEngineException.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class PathEngineException extends FHIRException { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/TerminologyServiceException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/TerminologyServiceException.java similarity index 86% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/TerminologyServiceException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/TerminologyServiceException.java index 31b5ef2fa3f..744084aabd0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/TerminologyServiceException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/TerminologyServiceException.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class TerminologyServiceException extends FHIRException { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/UcumException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/UcumException.java similarity index 83% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/UcumException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/UcumException.java index c28511fbbdc..b2b9e9ed04d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/exceptions/UcumException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/exceptions/UcumException.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.exceptions; +package org.hl7.fhir.dstu3.exceptions; public class UcumException extends FHIRException { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/FormatUtilities.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/FormatUtilities.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/FormatUtilities.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/FormatUtilities.java index 84de424e727..2d509a511d4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/FormatUtilities.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/FormatUtilities.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.formats; +package org.hl7.fhir.dstu3.formats; /* Copyright (c) 2011+, HL7, Inc diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/IParser.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/IParser.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/IParser.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/IParser.java index 042f3b57dcd..cab4de82082 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/IParser.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/IParser.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.formats; +package org.hl7.fhir.dstu3.formats; import java.io.IOException; @@ -37,9 +37,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import org.hl7.fhir.dstu21.exceptions.FHIRFormatError; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.Type; +import org.hl7.fhir.dstu3.exceptions.FHIRFormatError; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.Type; import org.xmlpull.v1.XmlPullParserException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/ParserType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserType.java similarity index 86% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/ParserType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserType.java index 050af0b0994..0f703b9fc11 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/formats/ParserType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserType.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.formats; +package org.hl7.fhir.dstu3.formats; /** * Used in factory methods for parsers, for requesting a parser of a particular type diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java similarity index 73% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java index 23af232fc56..2010cebfa87 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/ctx/FhirDstu3.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.ctx; +package org.hl7.fhir.dstu3.hapi.ctx; /* * #%L @@ -25,15 +25,14 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.hapi.rest.server.Dstu21BundleFactory; -import org.hl7.fhir.dstu21.hapi.rest.server.ServerConformanceProvider; -import org.hl7.fhir.dstu21.hapi.rest.server.ServerProfileProvider; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.instance.model.api.IAnyResource; +import org.hl7.fhir.dstu3.hapi.rest.server.Dstu3BundleFactory; +import org.hl7.fhir.dstu3.hapi.rest.server.ServerConformanceProvider; +import org.hl7.fhir.dstu3.hapi.rest.server.ServerProfileProvider; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.StructureDefinition; import org.hl7.fhir.instance.model.api.IBaseCoding; import org.hl7.fhir.instance.model.api.IBaseReference; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -45,15 +44,12 @@ import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.model.api.IFhirVersion; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; -import ca.uhn.fhir.model.base.composite.BaseContainedDt; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.IVersionSpecificBundleFactory; import ca.uhn.fhir.rest.server.RestfulServer; -public class FhirDstu21 implements IFhirVersion { +public class FhirDstu3 implements IFhirVersion { private String myId; @@ -90,12 +86,12 @@ public class FhirDstu21 implements IFhirVersion { @Override public InputStream getFhirVersionPropertiesFile() { - InputStream str = FhirDstu21.class.getResourceAsStream("/org/hl7/fhir/dstu21/model/fhirversion.properties"); + InputStream str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/model/fhirversion.properties"); if (str == null) { - str = FhirDstu21.class.getResourceAsStream("/org/hl7/fhir/dstu21/model/fhirversion.properties"); + str = FhirDstu3.class.getResourceAsStream("/org/hl7/fhir/dstu3/model/fhirversion.properties"); } if (str == null) { - throw new ConfigurationException("Can not find model property file on classpath: " + "/ca/uhn/fhir/model/dstu21/fhirversion.properties"); + throw new ConfigurationException("Can not find model property file on classpath: " + "/ca/uhn/fhir/model/dstu3/fhirversion.properties"); } return str; } @@ -107,7 +103,7 @@ public class FhirDstu21 implements IFhirVersion { @Override public String getPathToSchemaDefinitions() { - return "/org/hl7/fhir/instance/model/dstu21/schema"; + return "/org/hl7/fhir/instance/model/dstu3/schema"; } @Override @@ -117,12 +113,12 @@ public class FhirDstu21 implements IFhirVersion { @Override public FhirVersionEnum getVersion() { - return FhirVersionEnum.DSTU2_1; + return FhirVersionEnum.DSTU3; } @Override public IVersionSpecificBundleFactory newBundleFactory(FhirContext theContext) { - return new Dstu21BundleFactory(theContext); + return new Dstu3BundleFactory(theContext); } @Override diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java index cfeecdb8f5d..66fabe2c80e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/Dstu3BundleFactory.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.rest.server; +package org.hl7.fhir.dstu3.hapi.rest.server; /* * #%L @@ -30,14 +30,14 @@ import java.util.Set; import java.util.UUID; import org.apache.commons.lang3.Validate; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleLinkComponent; -import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; -import org.hl7.fhir.dstu21.model.Bundle.SearchEntryMode; -import org.hl7.fhir.dstu21.model.DomainResource; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Resource; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.DomainResource; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent; +import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb; +import org.hl7.fhir.dstu3.model.Bundle.SearchEntryMode; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; @@ -63,14 +63,14 @@ import ca.uhn.fhir.rest.server.RestfulServerUtils; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.util.ResourceReferenceInfo; -public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { +public class Dstu3BundleFactory implements IVersionSpecificBundleFactory { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(Dstu21BundleFactory.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(Dstu3BundleFactory.class); private Bundle myBundle; private FhirContext myContext; private String myBase; - public Dstu21BundleFactory(FhirContext theContext) { + public Dstu3BundleFactory(FhirContext theContext) { myContext = theContext; } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProvider.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProvider.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProvider.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProvider.java index 8cc31ea3f8c..965250e9d5b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProvider.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProvider.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.rest.server; +package org.hl7.fhir.dstu3.hapi.rest.server; /* * #%L @@ -38,25 +38,25 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.exceptions.FHIRException; -import org.hl7.fhir.dstu21.model.Conformance; -import org.hl7.fhir.dstu21.model.Conformance.ConditionalDeleteStatus; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceSearchParamComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceStatementKind; -import org.hl7.fhir.dstu21.model.Conformance.ResourceInteractionComponent; -import org.hl7.fhir.dstu21.model.Conformance.RestfulConformanceMode; -import org.hl7.fhir.dstu21.model.Conformance.SystemRestfulInteraction; -import org.hl7.fhir.dstu21.model.Conformance.TypeRestfulInteraction; -import org.hl7.fhir.dstu21.model.Conformance.UnknownContentCode; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.Enumerations.ConformanceResourceStatus; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.OperationDefinition; -import org.hl7.fhir.dstu21.model.OperationDefinition.OperationDefinitionParameterComponent; -import org.hl7.fhir.dstu21.model.OperationDefinition.OperationParameterUse; -import org.hl7.fhir.dstu21.model.ResourceType; +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Conformance; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.OperationDefinition; +import org.hl7.fhir.dstu3.model.ResourceType; +import org.hl7.fhir.dstu3.model.Conformance.ConditionalDeleteStatus; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceSearchParamComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceStatementKind; +import org.hl7.fhir.dstu3.model.Conformance.ResourceInteractionComponent; +import org.hl7.fhir.dstu3.model.Conformance.RestfulConformanceMode; +import org.hl7.fhir.dstu3.model.Conformance.SystemRestfulInteraction; +import org.hl7.fhir.dstu3.model.Conformance.TypeRestfulInteraction; +import org.hl7.fhir.dstu3.model.Conformance.UnknownContentCode; +import org.hl7.fhir.dstu3.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.dstu3.model.OperationDefinition.OperationDefinitionParameterComponent; +import org.hl7.fhir.dstu3.model.OperationDefinition.OperationParameterUse; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerProfileProvider.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerProfileProvider.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerProfileProvider.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerProfileProvider.java index 921c30d1500..3a2342cce8e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerProfileProvider.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerProfileProvider.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.rest.server; +package org.hl7.fhir.dstu3.hapi.rest.server; /* * #%L @@ -27,8 +27,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.StructureDefinition; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/BaseValidatorBridge.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/BaseValidatorBridge.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/BaseValidatorBridge.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/BaseValidatorBridge.java index 60ecf34a1b4..1726fd962ba 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/BaseValidatorBridge.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/BaseValidatorBridge.java @@ -1,8 +1,8 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import java.util.List; -import org.hl7.fhir.dstu21.validation.ValidationMessage; +import org.hl7.fhir.dstu3.validation.ValidationMessage; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.model.api.Bundle; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/DefaultProfileValidationSupport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/DefaultProfileValidationSupport.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/DefaultProfileValidationSupport.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/DefaultProfileValidationSupport.java index 5e56d242243..51c383a265e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/DefaultProfileValidationSupport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/DefaultProfileValidationSupport.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -10,15 +10,15 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.FhirContext; @@ -56,9 +56,9 @@ public class DefaultProfileValidationSupport implements IValidationSupport { if (codeSystems == null) { codeSystems = new HashMap(); - loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu21/valueset/valuesets.xml"); - loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu21/valueset/v2-tables.xml"); - loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu21/valueset/v3-codesystems.xml"); + loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml"); + loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu3/valueset/v2-tables.xml"); + loadCodeSystems(theContext, codeSystems, "/org/hl7/fhir/instance/model/dstu3/valueset/v3-codesystems.xml"); myCodeSystems = codeSystems; } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirInstanceValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirInstanceValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java index 9ce347d75a5..f98061fa704 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirInstanceValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -14,11 +14,11 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.Validate; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.validation.IResourceValidator.BestPracticeWarningLevel; -import org.hl7.fhir.dstu21.validation.InstanceValidator; -import org.hl7.fhir.dstu21.validation.ValidationMessage; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.validation.InstanceValidator; +import org.hl7.fhir.dstu3.validation.ValidationMessage; +import org.hl7.fhir.dstu3.validation.IResourceValidator.BestPracticeWarningLevel; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirQuestionnaireResponseValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirQuestionnaireResponseValidator.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirQuestionnaireResponseValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirQuestionnaireResponseValidator.java index 505a6225489..8afb9558534 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/FhirQuestionnaireResponseValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirQuestionnaireResponseValidator.java @@ -1,13 +1,13 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.validation.QuestionnaireResponseValidator; -import org.hl7.fhir.dstu21.validation.ValidationMessage; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.validation.QuestionnaireResponseValidator; +import org.hl7.fhir.dstu3.validation.ValidationMessage; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.RuntimeResourceDefinition; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/HapiWorkerContext.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/HapiWorkerContext.java similarity index 84% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/HapiWorkerContext.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/HapiWorkerContext.java index 2e2457afb3c..6eb979c4b30 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/HapiWorkerContext.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/HapiWorkerContext.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import java.util.ArrayList; import java.util.Collections; @@ -7,26 +7,26 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.formats.IParser; -import org.hl7.fhir.dstu21.formats.ParserType; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport.CodeValidationResult; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.ResourceType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpanderFactory; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpanderSimple; -import org.hl7.fhir.dstu21.utils.INarrativeGenerator; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.validation.IResourceValidator; +import org.hl7.fhir.dstu3.formats.IParser; +import org.hl7.fhir.dstu3.formats.ParserType; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport.CodeValidationResult; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.ResourceType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpanderFactory; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpanderSimple; +import org.hl7.fhir.dstu3.utils.INarrativeGenerator; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.validation.IResourceValidator; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/IValidationSupport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/IValidationSupport.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/IValidationSupport.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/IValidationSupport.java index f931b9f709f..80a094346f1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/IValidationSupport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/IValidationSupport.java @@ -1,10 +1,10 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/ValidationSupportChain.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/ValidationSupportChain.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/ValidationSupportChain.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/ValidationSupportChain.java index 794db3e419e..c9c65336481 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/validation/ValidationSupportChain.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/validation/ValidationSupportChain.java @@ -1,11 +1,11 @@ -package org.hl7.fhir.dstu21.hapi.validation; +package org.hl7.fhir.dstu3.hapi.validation; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java index 1374d5791cc..152e3d986de 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A financial tool for tracking value accrued for a particular purpose. In the healthcare field, used to track charges for a patient, cost centres, etc. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java index 6faa86d60f9..9c20a5d555c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Address.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * There is a variety of postal address formats defined around the world. This format defines a superset that is the basis for all addresses around the world. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java index a322426bae7..6b6f21b2e5b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Age.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -33,8 +33,9 @@ package org.hl7.fhir.dstu21.model; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java index 61493d403bd..3159da78763 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AllergyIntolerance.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Risk of harmful or undesirable, physiological response which is unique to an individual and associated with exposure to a substance. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java index dbb8099ca24..f91e9280d37 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Annotation.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A text note which also contains information about who made the statement and when. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java index 8268f42e15b..f47fb9d900a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Appointment.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A booking of a healthcare event among patient(s), practitioner(s), related person(s) and/or device(s) for a specific date/time. This may result in one or more Encounter(s). */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java index 2bc9db590ac..0c36bf9458e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AppointmentResponse.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A reply to an appointment request for a patient and/or practitioner(s), such as a confirmation or rejection. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java index 822eeb9f2b3..606c8c34f92 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Attachment.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,13 +34,15 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * For referring to data content defined in other formats. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java index 07101771bf6..4fac75fa9d6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/AuditEvent.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A record of an event made for purposes of maintaining a security log. Typical uses include detection of intrusion attempts and monitoring for inappropriate usage. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java index 943bbe77418..dc4924e0230 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BackboneElement.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -37,8 +37,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Base definition for all elements that are defined inside a resource - but not those in a data type. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base.java index 889127ac089..33b80652800 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.io.Serializable; import java.util.ArrayList; @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.utilities.xhtml.XhtmlNode; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base64BinaryType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base64BinaryType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java index 84d98027dcf..c21dbe398fb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Base64BinaryType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Base64BinaryType.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.apache.commons.codec.binary.Base64; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseBinary.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseBinary.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseBinary.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseBinary.java index 08d0eedab16..0e93a94ef69 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseBinary.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseBinary.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IBaseBinary; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseDateTimeType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseDateTimeType.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseDateTimeType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseDateTimeType.java index 74345103c65..625e70459b3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseDateTimeType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseDateTimeType.java @@ -1,8 +1,8 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; -import static org.hl7.fhir.dstu21.model.TemporalPrecisionEnum.DAY; -import static org.hl7.fhir.dstu21.model.TemporalPrecisionEnum.MONTH; -import static org.hl7.fhir.dstu21.model.TemporalPrecisionEnum.YEAR; +import static org.hl7.fhir.dstu3.model.TemporalPrecisionEnum.DAY; +import static org.hl7.fhir.dstu3.model.TemporalPrecisionEnum.MONTH; +import static org.hl7.fhir.dstu3.model.TemporalPrecisionEnum.YEAR; import java.text.ParseException; import java.util.ArrayList; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseExtension.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseExtension.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseExtension.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseExtension.java index b42f25e59b1..4530c139df0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseExtension.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseExtension.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IBaseDatatype; import org.hl7.fhir.instance.model.api.IBaseExtension; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseNarrative.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseNarrative.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseNarrative.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseNarrative.java index 6e82dda01f6..25d1b7f9cc9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseNarrative.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseNarrative.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.model.api.INarrative; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseReference.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseReference.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseReference.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseReference.java index 28bd7a1b2e0..90aea76bd17 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseReference.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseReference.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseReference; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseResource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseResource.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseResource.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseResource.java index e45a4265e9c..5c5fd08beaf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BaseResource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseResource.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java index 585469777aa..cfe1be531e3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Basic.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Basic is used for handling concepts not yet defined in FHIR, narrative-only resources that don't map to an existing resource, and custom resources not appropriate for inclusion in the FHIR specification. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java index 185ecadc63c..2021d4de134 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Binary.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A binary resource can contain any content, whether text, image, pdf, zip archive, etc. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java index 944c3670c09..ad422413515 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BodySite.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Record details about the anatomical location of a specimen or body part. This resource may be used when a coded concept does not provide the necessary detail needed for the use case. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BooleanType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BooleanType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BooleanType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BooleanType.java index 001f34877a8..d73cff1fe64 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BooleanType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BooleanType.java @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. /** * */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java index 78e76c8548e..44506819364 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Bundle.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -40,8 +40,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A container for a collection of resources. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java index b2e459e5aeb..d118deefb77 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CarePlan.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java index 4303b65f0a9..df6d3449f2e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Claim.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -35,14 +35,16 @@ import java.util.*; import java.math.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A provider issued list of services and products provided, or to be provided, to a patient which is provided to an insurer for payment recovery. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java index 71d726c9c60..841bcef0554 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClaimResponse.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -35,14 +35,16 @@ import java.util.*; import java.math.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides the adjudication details from the processing of a Claim resource. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java index 5975d37d647..ed5f8b4bff0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ClinicalImpression.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter, but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeSystem.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeSystem.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java index b3daeb75589..a1561978264 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeSystem.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeSystem.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A code system specifies a set of codes drawn from one or more code systems. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeType.java index 0a30f5ad358..29ad0a8a7cf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeType.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import static org.apache.commons.lang3.StringUtils.defaultString; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java index 29d0663a7e1..e444ea5e74e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CodeableConcept.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java index 870ba7386de..6ce625afba1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coding.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A reference to a code defined by a terminology system. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java index 9bb8a0dabe4..6b247727e0e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Communication.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java index d2270e76c49..f2485a70dc8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/CommunicationRequest.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Comparison.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Comparison.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Comparison.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Comparison.java index a092e8d4471..c3494d3ad8f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Comparison.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Comparison.java @@ -1,9 +1,9 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.util.List; import org.apache.commons.lang3.NotImplementedException; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.utilities.Utilities; /** diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java index 37b1e12be40..1f024bf1263 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Composition.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. While a Composition defines the structure, it does not actually contain the content: rather the full content of a document is contained in a Bundle, of which the Composition is the first resource contained. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java index 2faa3ee577e..c777f90cd12 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ConceptMap.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A statement of relationships from one set of concepts to one or more other concepts - either code systems or data elements, or classes in class models. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java index c9f8b66875a..d529b481566 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Condition.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Use to record detailed information about conditions, problems or diagnoses recognized by a clinician. There are many uses including: recording a diagnosis during an encounter; populating a problem list or a summary statement, such as a discharge summary. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Configuration.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Configuration.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Configuration.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Configuration.java index 863bc2d383c..355ae6a80a2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Configuration.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Configuration.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java index e7000bb2527..826016c5733 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Conformance.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A conformance statement is a set of capabilities of a FHIR Server that may be used as a statement of actual server functionality or a statement of required or desired server implementation. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java index 96973477aa0..ff413b275d1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Constants.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java index 8cc38be161b..fc74c2b14c1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ContactPoint.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Details for all kinds of technology mediated contact points for a person or organization, including telephone, email, etc. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java index 090217437d5..4364cbf764b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Contract.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -40,8 +40,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A formal agreement between parties regarding the conduct of business, exchange of information or other matters. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java index 0c45c809c2d..98bb6a9ea07 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Count.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -33,8 +33,9 @@ package org.hl7.fhir.dstu21.model; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java index 2e0b157f067..4de2c65cca0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Coverage.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Financial instrument which may be used to pay for or reimburse health care products and services. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java index 1f022622eaa..7cec4722596 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DataElement.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * The formal description of a single piece of information that can be gathered and reported. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateTimeType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateTimeType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateTimeType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateTimeType.java index f5ae4faac0d..7860ef9b4ec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateTimeType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateTimeType.java @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.util.Calendar; import java.util.Date; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateType.java index e84076d1fbd..ae6b7eb2aa8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DateType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DateType.java @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.util.Calendar; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecimalType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecimalType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecimalType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecimalType.java index b64d8911509..daab918558d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecimalType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecimalType.java @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. /** * */ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.math.BigDecimal; import java.math.MathContext; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java index c625ed3f3c1..0104e482c0f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportRule.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource defines a decision support rule of the form [on Event] if Condition then Action. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java index 3be5322e790..1cf1af48885 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DecisionSupportServiceModule.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * The DecisionSupportServiceModule resource describes decision support functionality that is available as a service. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java index 2a3c15c7a51..be60edaa299 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DetectedIssue.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient; e.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java index 860861b005a..50660ba7d9d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Device.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource identifies an instance of a manufactured item that is used in the provision of healthcare without being substantially changed through that activity. The device may be a medical or non-medical device. Medical devices includes durable (reusable) medical equipment, implantable devices, as well as disposable equipment used for diagnostic, treatment, and research for healthcare and public health. Non-medical devices may include items such as a machine, cellphone, computer, application, etc. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java index 75db504e9fb..717ba620888 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceComponent.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Describes the characteristics, operational status and capabilities of a medical-related component of a medical device. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java index 4ab59f1369a..7e31b8cf4c8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceMetric.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Describes a measurement, calculation or setting capability of a medical device. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java index 0cd31dc5a2f..fc6437389ec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseRequest.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Represents a request for a patient to employ a medical device. The device may be an implantable device, or an external assistive device, such as a walker. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java index 7a1ba443ef4..5f242fd3681 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DeviceUseStatement.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A record of a device being used by a patient where the record is the result of a report from the patient or another clinician. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java index 14694116550..465bdc7bf78 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticOrder.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A record of a request for a diagnostic investigation service to be performed. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java index 49ec49762ef..291478753f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DiagnosticReport.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * The findings and interpretation of diagnostic tests performed on patients, groups of patients, devices, and locations, and/or specimens derived from these. The report includes clinical context such as requesting and provider information, and some mix of atomic results, images, textual and coded interpretations, and formatted representation of diagnostic reports. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java index e605bf90adb..ab2a1c8ca5f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Distance.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -33,8 +33,9 @@ package org.hl7.fhir.dstu21.model; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java index 6b05494bf07..b8db7b643e1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentManifest.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A manifest that defines a set of documents. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java index 93289491fa5..0fb70bab49d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DocumentReference.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A reference to a document . */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java index e862cf48cab..53b1167d731 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/DomainResource.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A resource that includes narrative, extensions, and contained resources. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java index 3dff1882cbe..d9f1a0801a6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Duration.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -33,8 +33,9 @@ package org.hl7.fhir.dstu21.model; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java index bfa14ee2655..72e6d9cb7e3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Element.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Base definition for all elements in a resource. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java index 880fcf8f9b0..08bc1f04e15 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ElementDefinition.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,13 +34,15 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Captures constraints on each element within the resource, profile, or extension. */ @@ -2284,7 +2286,7 @@ public class ElementDefinition extends Type implements ICompositeType { */ @Child(name = "defaultValue", type = {}, order=16, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Specified value it missing from instance", formalDefinition="The value that should be used if there is no value stated in the instance (e.g. 'if not otherwise specified, the abstract is false')." ) - protected org.hl7.fhir.dstu21.model.Type defaultValue; + protected org.hl7.fhir.dstu3.model.Type defaultValue; /** * The Implicit meaning that is to be understood when this element is missing (e.g. 'when this element is missing, the period is ongoing'. @@ -2298,35 +2300,35 @@ public class ElementDefinition extends Type implements ICompositeType { */ @Child(name = "fixed", type = {}, order=18, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Value must be exactly this", formalDefinition="Specifies a value that SHALL be exactly the value for this element in the instance. For purposes of comparison, non-significant whitespace is ignored, and all values must be an exact match (case and accent sensitive). Missing elements/attributes must also be missing." ) - protected org.hl7.fhir.dstu21.model.Type fixed; + protected org.hl7.fhir.dstu3.model.Type fixed; /** * Specifies a value that the value in the instance SHALL follow - that is, any value in the pattern must be found in the instance. Other additional values may be found too. This is effectively constraint by example. The values of elements present in the pattern must match exactly (case-sensitive, accent-sensitive, etc.). */ @Child(name = "pattern", type = {}, order=19, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Value must have at least these property values", formalDefinition="Specifies a value that the value in the instance SHALL follow - that is, any value in the pattern must be found in the instance. Other additional values may be found too. This is effectively constraint by example. The values of elements present in the pattern must match exactly (case-sensitive, accent-sensitive, etc.)." ) - protected org.hl7.fhir.dstu21.model.Type pattern; + protected org.hl7.fhir.dstu3.model.Type pattern; /** * A sample value for this element demonstrating the type of information that would typically be captured. */ @Child(name = "example", type = {}, order=20, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Example value: [as defined for type]", formalDefinition="A sample value for this element demonstrating the type of information that would typically be captured." ) - protected org.hl7.fhir.dstu21.model.Type example; + protected org.hl7.fhir.dstu3.model.Type example; /** * The minimum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity. */ @Child(name = "minValue", type = {}, order=21, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Minimum Allowed Value (for some types)", formalDefinition="The minimum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity." ) - protected org.hl7.fhir.dstu21.model.Type minValue; + protected org.hl7.fhir.dstu3.model.Type minValue; /** * The maximum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity. */ @Child(name = "maxValue", type = {}, order=22, min=0, max=1, modifier=false, summary=true) @Description(shortDefinition="Maximum Allowed Value (for some types)", formalDefinition="The maximum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity." ) - protected org.hl7.fhir.dstu21.model.Type maxValue; + protected org.hl7.fhir.dstu3.model.Type maxValue; /** * Indicates the maximum length in characters that is permitted to be present in conformant instances and which is expected to be supported by conformant consumers that support the element. @@ -3122,7 +3124,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #defaultValue} (The value that should be used if there is no value stated in the instance (e.g. 'if not otherwise specified, the abstract is false').) */ - public org.hl7.fhir.dstu21.model.Type getDefaultValue() { + public org.hl7.fhir.dstu3.model.Type getDefaultValue() { return this.defaultValue; } @@ -3133,7 +3135,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #defaultValue} (The value that should be used if there is no value stated in the instance (e.g. 'if not otherwise specified, the abstract is false').) */ - public ElementDefinition setDefaultValue(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setDefaultValue(org.hl7.fhir.dstu3.model.Type value) { this.defaultValue = value; return this; } @@ -3190,7 +3192,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #fixed} (Specifies a value that SHALL be exactly the value for this element in the instance. For purposes of comparison, non-significant whitespace is ignored, and all values must be an exact match (case and accent sensitive). Missing elements/attributes must also be missing.) */ - public org.hl7.fhir.dstu21.model.Type getFixed() { + public org.hl7.fhir.dstu3.model.Type getFixed() { return this.fixed; } @@ -3201,7 +3203,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #fixed} (Specifies a value that SHALL be exactly the value for this element in the instance. For purposes of comparison, non-significant whitespace is ignored, and all values must be an exact match (case and accent sensitive). Missing elements/attributes must also be missing.) */ - public ElementDefinition setFixed(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setFixed(org.hl7.fhir.dstu3.model.Type value) { this.fixed = value; return this; } @@ -3209,7 +3211,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #pattern} (Specifies a value that the value in the instance SHALL follow - that is, any value in the pattern must be found in the instance. Other additional values may be found too. This is effectively constraint by example. The values of elements present in the pattern must match exactly (case-sensitive, accent-sensitive, etc.).) */ - public org.hl7.fhir.dstu21.model.Type getPattern() { + public org.hl7.fhir.dstu3.model.Type getPattern() { return this.pattern; } @@ -3220,7 +3222,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #pattern} (Specifies a value that the value in the instance SHALL follow - that is, any value in the pattern must be found in the instance. Other additional values may be found too. This is effectively constraint by example. The values of elements present in the pattern must match exactly (case-sensitive, accent-sensitive, etc.).) */ - public ElementDefinition setPattern(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setPattern(org.hl7.fhir.dstu3.model.Type value) { this.pattern = value; return this; } @@ -3228,7 +3230,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #example} (A sample value for this element demonstrating the type of information that would typically be captured.) */ - public org.hl7.fhir.dstu21.model.Type getExample() { + public org.hl7.fhir.dstu3.model.Type getExample() { return this.example; } @@ -3239,7 +3241,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #example} (A sample value for this element demonstrating the type of information that would typically be captured.) */ - public ElementDefinition setExample(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setExample(org.hl7.fhir.dstu3.model.Type value) { this.example = value; return this; } @@ -3247,7 +3249,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #minValue} (The minimum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity.) */ - public org.hl7.fhir.dstu21.model.Type getMinValue() { + public org.hl7.fhir.dstu3.model.Type getMinValue() { return this.minValue; } @@ -3258,7 +3260,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #minValue} (The minimum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity.) */ - public ElementDefinition setMinValue(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setMinValue(org.hl7.fhir.dstu3.model.Type value) { this.minValue = value; return this; } @@ -3266,7 +3268,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @return {@link #maxValue} (The maximum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity.) */ - public org.hl7.fhir.dstu21.model.Type getMaxValue() { + public org.hl7.fhir.dstu3.model.Type getMaxValue() { return this.maxValue; } @@ -3277,7 +3279,7 @@ public class ElementDefinition extends Type implements ICompositeType { /** * @param value {@link #maxValue} (The maximum allowed value for the element. The value is inclusive. This is allowed for the types date, dateTime, instant, time, decimal, integer, and Quantity.) */ - public ElementDefinition setMaxValue(org.hl7.fhir.dstu21.model.Type value) { + public ElementDefinition setMaxValue(org.hl7.fhir.dstu3.model.Type value) { this.maxValue = value; return this; } @@ -3690,19 +3692,19 @@ public class ElementDefinition extends Type implements ICompositeType { else if (name.equals("nameReference")) this.nameReference = castToString(value); // StringType else if (name.equals("defaultValue[x]")) - this.defaultValue = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.defaultValue = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("meaningWhenMissing")) this.meaningWhenMissing = castToMarkdown(value); // MarkdownType else if (name.equals("fixed[x]")) - this.fixed = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.fixed = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("pattern[x]")) - this.pattern = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.pattern = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("example[x]")) - this.example = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.example = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("minValue[x]")) - this.minValue = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.minValue = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("maxValue[x]")) - this.maxValue = (org.hl7.fhir.dstu21.model.Type) value; // org.hl7.fhir.dstu21.model.Type + this.maxValue = (org.hl7.fhir.dstu3.model.Type) value; // org.hl7.fhir.dstu3.model.Type else if (name.equals("maxLength")) this.maxLength = castToInteger(value); // IntegerType else if (name.equals("condition")) diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java index b6da49483a9..a852c8e2def 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityRequest.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides the insurance eligibility details from the insurer regarding a specified coverage and optionally some class of service. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java index 0b06ad68024..130efdbcd11 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EligibilityResponse.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides eligibility and plan details from the processing of an Eligibility resource. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java index 6cbe2b2612a..ea4293f2eff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Encounter.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * An interaction between a patient and healthcare provider(s) for the purpose of providing healthcare service(s) or assessing the health status of a patient. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java index a8733c1f211..32e85ab75cc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentRequest.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -33,14 +33,15 @@ package org.hl7.fhir.dstu21.model; import java.util.*; -import org.hl7.fhir.dstu21.model.Enumerations.*; import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides the insurance enrollment details to the insurer regarding a specified coverage. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java index ece505fb33c..f9509e1d6d9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnrollmentResponse.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides enrollment and plan details from the processing of an Enrollment resource. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnumFactory.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnumFactory.java index 9195733bfd5..30f105cc6b4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EnumFactory.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IBaseEnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumeration.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumeration.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumeration.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumeration.java index b91b6fda585..9c871ff97d6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumeration.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumeration.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import org.hl7.fhir.instance.model.api.IBaseEnumeration; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java index d3b24bfa688..9faf19eb4b0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java @@ -1,4 +1,6 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; /* Copyright (c) 2011+, HL7, Inc. @@ -33,7 +35,6 @@ package org.hl7.fhir.dstu21.model; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; public class Enumerations { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java index 0ea1506ef67..fb60b681243 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/EpisodeOfCare.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -39,8 +39,9 @@ import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java index 573d8bf1cb2..01816286356 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpansionProfile.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -34,14 +34,16 @@ package org.hl7.fhir.dstu21.model; import java.util.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Resource to define constraints on the Expansion of a FHIR ValueSet. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java index 5415a11b486..cd43aee2a20 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExplanationOfBenefit.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -35,14 +35,16 @@ import java.util.*; import java.math.*; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.dstu21.model.Enumerations.*; + import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.model.Enumerations.*; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided. */ diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpressionNode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpressionNode.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpressionNode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpressionNode.java index 94fe0166db6..1b51a61e69b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpressionNode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/ExpressionNode.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java index c00faee831f..6598ebb5cb2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/Extension.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.model; +package org.hl7.fhir.dstu3.model; /* Copyright (c) 2011+, HL7, Inc. @@ -38,8 +38,9 @@ import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; + +import org.hl7.fhir.dstu3.exceptions.FHIRException; import org.hl7.fhir.instance.model.api.*; -import org.hl7.fhir.dstu21.exceptions.FHIRException; /** * Optional Extensions Element - found in all resources. */ @@ -58,7 +59,7 @@ public class Extension extends BaseExtension implements IBaseExtension { + + public Additionalmaterials fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("xray".equals(codeString)) + return Additionalmaterials.XRAY; + if ("image".equals(codeString)) + return Additionalmaterials.IMAGE; + if ("email".equals(codeString)) + return Additionalmaterials.EMAIL; + if ("model".equals(codeString)) + return Additionalmaterials.MODEL; + if ("document".equals(codeString)) + return Additionalmaterials.DOCUMENT; + if ("other".equals(codeString)) + return Additionalmaterials.OTHER; + throw new IllegalArgumentException("Unknown Additionalmaterials code '"+codeString+"'"); + } + + public String toCode(Additionalmaterials code) { + if (code == Additionalmaterials.XRAY) + return "xray"; + if (code == Additionalmaterials.IMAGE) + return "image"; + if (code == Additionalmaterials.EMAIL) + return "email"; + if (code == Additionalmaterials.MODEL) + return "model"; + if (code == Additionalmaterials.DOCUMENT) + return "document"; + if (code == Additionalmaterials.OTHER) + return "other"; + return "?"; + } + + public String toSystem(Additionalmaterials code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Adjudication.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Adjudication.java index e1b22b26654..33d5c35a8bf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Adjudication.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Adjudication { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationEnumFactory.java new file mode 100644 index 00000000000..107742bffa4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AdjudicationEnumFactory implements EnumFactory { + + public Adjudication fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("total".equals(codeString)) + return Adjudication.TOTAL; + if ("copay".equals(codeString)) + return Adjudication.COPAY; + if ("eligible".equals(codeString)) + return Adjudication.ELIGIBLE; + if ("deductible".equals(codeString)) + return Adjudication.DEDUCTIBLE; + if ("eligpercent".equals(codeString)) + return Adjudication.ELIGPERCENT; + if ("tax".equals(codeString)) + return Adjudication.TAX; + if ("benefit".equals(codeString)) + return Adjudication.BENEFIT; + throw new IllegalArgumentException("Unknown Adjudication code '"+codeString+"'"); + } + + public String toCode(Adjudication code) { + if (code == Adjudication.TOTAL) + return "total"; + if (code == Adjudication.COPAY) + return "copay"; + if (code == Adjudication.ELIGIBLE) + return "eligible"; + if (code == Adjudication.DEDUCTIBLE) + return "deductible"; + if (code == Adjudication.ELIGPERCENT) + return "eligpercent"; + if (code == Adjudication.TAX) + return "tax"; + if (code == Adjudication.BENEFIT) + return "benefit"; + return "?"; + } + + public String toSystem(Adjudication code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationError.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationError.java index ffa198f5c05..ed81fc3c13e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationError.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AdjudicationError { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationErrorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationErrorEnumFactory.java new file mode 100644 index 00000000000..dacc627157c --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationErrorEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AdjudicationErrorEnumFactory implements EnumFactory { + + public AdjudicationError fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a001".equals(codeString)) + return AdjudicationError.A001; + if ("a002".equals(codeString)) + return AdjudicationError.A002; + throw new IllegalArgumentException("Unknown AdjudicationError code '"+codeString+"'"); + } + + public String toCode(AdjudicationError code) { + if (code == AdjudicationError.A001) + return "a001"; + if (code == AdjudicationError.A002) + return "a002"; + return "?"; + } + + public String toSystem(AdjudicationError code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReason.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReason.java index db5027fb8f0..9f6b27b0f95 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AdjudicationReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReasonEnumFactory.java new file mode 100644 index 00000000000..478ae52c91d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AdjudicationReasonEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AdjudicationReasonEnumFactory implements EnumFactory { + + public AdjudicationReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("ar001".equals(codeString)) + return AdjudicationReason.AR001; + if ("ar002".equals(codeString)) + return AdjudicationReason.AR002; + throw new IllegalArgumentException("Unknown AdjudicationReason code '"+codeString+"'"); + } + + public String toCode(AdjudicationReason code) { + if (code == AdjudicationReason.AR001) + return "ar001"; + if (code == AdjudicationReason.AR002) + return "ar002"; + return "?"; + } + + public String toSystem(AdjudicationReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreeds.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreeds.java index a7a224c934c..7d65f79420d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreeds.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AnimalBreeds { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreedsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreedsEnumFactory.java new file mode 100644 index 00000000000..86d9e2c61a0 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalBreedsEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AnimalBreedsEnumFactory implements EnumFactory { + + public AnimalBreeds fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("gsd".equals(codeString)) + return AnimalBreeds.GSD; + if ("irt".equals(codeString)) + return AnimalBreeds.IRT; + if ("tibmas".equals(codeString)) + return AnimalBreeds.TIBMAS; + if ("gret".equals(codeString)) + return AnimalBreeds.GRET; + throw new IllegalArgumentException("Unknown AnimalBreeds code '"+codeString+"'"); + } + + public String toCode(AnimalBreeds code) { + if (code == AnimalBreeds.GSD) + return "gsd"; + if (code == AnimalBreeds.IRT) + return "irt"; + if (code == AnimalBreeds.TIBMAS) + return "tibmas"; + if (code == AnimalBreeds.GRET) + return "gret"; + return "?"; + } + + public String toSystem(AnimalBreeds code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatus.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatus.java index c04a7f588e9..c9a7bfd8d6d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AnimalGenderstatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatusEnumFactory.java new file mode 100644 index 00000000000..e667f8e6763 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalGenderstatusEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AnimalGenderstatusEnumFactory implements EnumFactory { + + public AnimalGenderstatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("neutered".equals(codeString)) + return AnimalGenderstatus.NEUTERED; + if ("intact".equals(codeString)) + return AnimalGenderstatus.INTACT; + if ("unknown".equals(codeString)) + return AnimalGenderstatus.UNKNOWN; + throw new IllegalArgumentException("Unknown AnimalGenderstatus code '"+codeString+"'"); + } + + public String toCode(AnimalGenderstatus code) { + if (code == AnimalGenderstatus.NEUTERED) + return "neutered"; + if (code == AnimalGenderstatus.INTACT) + return "intact"; + if (code == AnimalGenderstatus.UNKNOWN) + return "unknown"; + return "?"; + } + + public String toSystem(AnimalGenderstatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpecies.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpecies.java index 561e6e1e589..cf42e38176c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpecies.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AnimalSpecies { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpeciesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpeciesEnumFactory.java new file mode 100644 index 00000000000..5151bfeab01 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnimalSpeciesEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AnimalSpeciesEnumFactory implements EnumFactory { + + public AnimalSpecies fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("canislf".equals(codeString)) + return AnimalSpecies.CANISLF; + if ("ovisa".equals(codeString)) + return AnimalSpecies.OVISA; + if ("serinuscd".equals(codeString)) + return AnimalSpecies.SERINUSCD; + throw new IllegalArgumentException("Unknown AnimalSpecies code '"+codeString+"'"); + } + + public String toCode(AnimalSpecies code) { + if (code == AnimalSpecies.CANISLF) + return "canislf"; + if (code == AnimalSpecies.OVISA) + return "ovisa"; + if (code == AnimalSpecies.SERINUSCD) + return "serinuscd"; + return "?"; + } + + public String toSystem(AnimalSpecies code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupations.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupations.java index 4e683d9cb25..16ee85c4f43 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupations.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AnzscoOccupations { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupationsEnumFactory.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupationsEnumFactory.java index d29ee684723..4490d99cb60 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AnzscoOccupationsEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class AnzscoOccupationsEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceType.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceType.java index 532233cc222..40b0a3048ee 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum AuditSourceType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceTypeEnumFactory.java new file mode 100644 index 00000000000..b371acc2d9d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/AuditSourceTypeEnumFactory.java @@ -0,0 +1,58 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class AuditSourceTypeEnumFactory implements EnumFactory { + + public AuditSourceType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("1".equals(codeString)) + return AuditSourceType._1; + if ("2".equals(codeString)) + return AuditSourceType._2; + if ("3".equals(codeString)) + return AuditSourceType._3; + if ("4".equals(codeString)) + return AuditSourceType._4; + if ("5".equals(codeString)) + return AuditSourceType._5; + if ("6".equals(codeString)) + return AuditSourceType._6; + if ("7".equals(codeString)) + return AuditSourceType._7; + if ("8".equals(codeString)) + return AuditSourceType._8; + if ("9".equals(codeString)) + return AuditSourceType._9; + throw new IllegalArgumentException("Unknown AuditSourceType code '"+codeString+"'"); + } + + public String toCode(AuditSourceType code) { + if (code == AuditSourceType._1) + return "1"; + if (code == AuditSourceType._2) + return "2"; + if (code == AuditSourceType._3) + return "3"; + if (code == AuditSourceType._4) + return "4"; + if (code == AuditSourceType._5) + return "5"; + if (code == AuditSourceType._6) + return "6"; + if (code == AuditSourceType._7) + return "7"; + if (code == AuditSourceType._8) + return "8"; + if (code == AuditSourceType._9) + return "9"; + return "?"; + } + + public String toSystem(AuditSourceType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceType.java index 09300c6ef5b..0230903f923 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BasicResourceType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceTypeEnumFactory.java similarity index 61% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceTypeEnumFactory.java index 51b5e7d3f62..2703bdc2f30 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BasicResourceTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class BasicResourceTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategory.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategory.java index 4805736a453..49dedecb69b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategoryEnumFactory.java new file mode 100644 index 00000000000..03e784812db --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitCategoryEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class BenefitCategoryEnumFactory implements EnumFactory { + + public BenefitCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("oral".equals(codeString)) + return BenefitCategory.ORAL; + if ("vision".equals(codeString)) + return BenefitCategory.VISION; + if ("medical".equals(codeString)) + return BenefitCategory.MEDICAL; + if ("pharmacy".equals(codeString)) + return BenefitCategory.PHARMACY; + throw new IllegalArgumentException("Unknown BenefitCategory code '"+codeString+"'"); + } + + public String toCode(BenefitCategory code) { + if (code == BenefitCategory.ORAL) + return "oral"; + if (code == BenefitCategory.VISION) + return "vision"; + if (code == BenefitCategory.MEDICAL) + return "medical"; + if (code == BenefitCategory.PHARMACY) + return "pharmacy"; + return "?"; + } + + public String toSystem(BenefitCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetwork.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetwork.java index 40ea4590a34..192418be7fb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetwork.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitNetwork { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetworkEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetworkEnumFactory.java new file mode 100644 index 00000000000..ea20c661f2f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitNetworkEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class BenefitNetworkEnumFactory implements EnumFactory { + + public BenefitNetwork fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("in".equals(codeString)) + return BenefitNetwork.IN; + if ("out".equals(codeString)) + return BenefitNetwork.OUT; + throw new IllegalArgumentException("Unknown BenefitNetwork code '"+codeString+"'"); + } + + public String toCode(BenefitNetwork code) { + if (code == BenefitNetwork.IN) + return "in"; + if (code == BenefitNetwork.OUT) + return "out"; + return "?"; + } + + public String toSystem(BenefitNetwork code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategory.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategory.java index 79859554b33..4ec31087772 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitSubcategory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategoryEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategoryEnumFactory.java index dcbf27a1a62..eaf3568f541 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitSubcategoryEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class BenefitSubcategoryEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTerm.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTerm.java index fcfa6f91b3d..5bf97553a43 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTerm.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitTerm { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTermEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTermEnumFactory.java new file mode 100644 index 00000000000..2c61c5a49e3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTermEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class BenefitTermEnumFactory implements EnumFactory { + + public BenefitTerm fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("annual".equals(codeString)) + return BenefitTerm.ANNUAL; + if ("lifetime".equals(codeString)) + return BenefitTerm.LIFETIME; + throw new IllegalArgumentException("Unknown BenefitTerm code '"+codeString+"'"); + } + + public String toCode(BenefitTerm code) { + if (code == BenefitTerm.ANNUAL) + return "annual"; + if (code == BenefitTerm.LIFETIME) + return "lifetime"; + return "?"; + } + + public String toSystem(BenefitTerm code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitType.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitType.java index 7c8394d93cc..95e0260d058 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTypeEnumFactory.java new file mode 100644 index 00000000000..bb4aac32a67 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitTypeEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class BenefitTypeEnumFactory implements EnumFactory { + + public BenefitType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("deductable".equals(codeString)) + return BenefitType.DEDUCTABLE; + if ("visit".equals(codeString)) + return BenefitType.VISIT; + if ("copay".equals(codeString)) + return BenefitType.COPAY; + if ("vision-exam".equals(codeString)) + return BenefitType.VISIONEXAM; + if ("vision-glasses".equals(codeString)) + return BenefitType.VISIONGLASSES; + if ("vision-contacts".equals(codeString)) + return BenefitType.VISIONCONTACTS; + if ("medical-primarycare".equals(codeString)) + return BenefitType.MEDICALPRIMARYCARE; + if ("pharmacy-dispense".equals(codeString)) + return BenefitType.PHARMACYDISPENSE; + throw new IllegalArgumentException("Unknown BenefitType code '"+codeString+"'"); + } + + public String toCode(BenefitType code) { + if (code == BenefitType.DEDUCTABLE) + return "deductable"; + if (code == BenefitType.VISIT) + return "visit"; + if (code == BenefitType.COPAY) + return "copay"; + if (code == BenefitType.VISIONEXAM) + return "vision-exam"; + if (code == BenefitType.VISIONGLASSES) + return "vision-glasses"; + if (code == BenefitType.VISIONCONTACTS) + return "vision-contacts"; + if (code == BenefitType.MEDICALPRIMARYCARE) + return "medical-primarycare"; + if (code == BenefitType.PHARMACYDISPENSE) + return "pharmacy-dispense"; + return "?"; + } + + public String toSystem(BenefitType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnit.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnit.java index 59374bf4008..c61066e33f1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnit.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum BenefitUnit { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnitEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnitEnumFactory.java new file mode 100644 index 00000000000..ea1704de7ce --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/BenefitUnitEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class BenefitUnitEnumFactory implements EnumFactory { + + public BenefitUnit fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("individual".equals(codeString)) + return BenefitUnit.INDIVIDUAL; + if ("family".equals(codeString)) + return BenefitUnit.FAMILY; + throw new IllegalArgumentException("Unknown BenefitUnit code '"+codeString+"'"); + } + + public String toCode(BenefitUnit code) { + if (code == BenefitUnit.INDIVIDUAL) + return "individual"; + if (code == BenefitUnit.FAMILY) + return "family"; + return "?"; + } + + public String toSystem(BenefitUnit code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategory.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategory.java index 8ebcc917daa..d6eae65b296 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum CarePlanActivityCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategoryEnumFactory.java new file mode 100644 index 00000000000..f4e2d0a58e5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/CarePlanActivityCategoryEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class CarePlanActivityCategoryEnumFactory implements EnumFactory { + + public CarePlanActivityCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return CarePlanActivityCategory.DIET; + if ("drug".equals(codeString)) + return CarePlanActivityCategory.DRUG; + if ("encounter".equals(codeString)) + return CarePlanActivityCategory.ENCOUNTER; + if ("observation".equals(codeString)) + return CarePlanActivityCategory.OBSERVATION; + if ("procedure".equals(codeString)) + return CarePlanActivityCategory.PROCEDURE; + if ("supply".equals(codeString)) + return CarePlanActivityCategory.SUPPLY; + if ("other".equals(codeString)) + return CarePlanActivityCategory.OTHER; + throw new IllegalArgumentException("Unknown CarePlanActivityCategory code '"+codeString+"'"); + } + + public String toCode(CarePlanActivityCategory code) { + if (code == CarePlanActivityCategory.DIET) + return "diet"; + if (code == CarePlanActivityCategory.DRUG) + return "drug"; + if (code == CarePlanActivityCategory.ENCOUNTER) + return "encounter"; + if (code == CarePlanActivityCategory.OBSERVATION) + return "observation"; + if (code == CarePlanActivityCategory.PROCEDURE) + return "procedure"; + if (code == CarePlanActivityCategory.SUPPLY) + return "supply"; + if (code == CarePlanActivityCategory.OTHER) + return "other"; + return "?"; + } + + public String toSystem(CarePlanActivityCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientation.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientation.java index b510ee7fe01..6fc70643af0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ChoiceListOrientation { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientationEnumFactory.java new file mode 100644 index 00000000000..3b4e25c0ca0 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ChoiceListOrientationEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ChoiceListOrientationEnumFactory implements EnumFactory { + + public ChoiceListOrientation fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("horizontal".equals(codeString)) + return ChoiceListOrientation.HORIZONTAL; + if ("vertical".equals(codeString)) + return ChoiceListOrientation.VERTICAL; + throw new IllegalArgumentException("Unknown ChoiceListOrientation code '"+codeString+"'"); + } + + public String toCode(ChoiceListOrientation code) { + if (code == ChoiceListOrientation.HORIZONTAL) + return "horizontal"; + if (code == ChoiceListOrientation.VERTICAL) + return "vertical"; + return "?"; + } + + public String toSystem(ChoiceListOrientation code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimException.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimException.java index 86af7e3f007..864e84e45f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimException.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ClaimException { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimExceptionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimExceptionEnumFactory.java new file mode 100644 index 00000000000..bf3ee539d40 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimExceptionEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ClaimExceptionEnumFactory implements EnumFactory { + + public ClaimException fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("student".equals(codeString)) + return ClaimException.STUDENT; + if ("disabled".equals(codeString)) + return ClaimException.DISABLED; + throw new IllegalArgumentException("Unknown ClaimException code '"+codeString+"'"); + } + + public String toCode(ClaimException code) { + if (code == ClaimException.STUDENT) + return "student"; + if (code == ClaimException.DISABLED) + return "disabled"; + return "?"; + } + + public String toSystem(ClaimException code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiers.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiers.java index 1ecd9fc304d..641032df116 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiers.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ClaimModifiers { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiersEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiersEnumFactory.java new file mode 100644 index 00000000000..778f8533905 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClaimModifiersEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ClaimModifiersEnumFactory implements EnumFactory { + + public ClaimModifiers fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("A".equals(codeString)) + return ClaimModifiers.A; + if ("B".equals(codeString)) + return ClaimModifiers.B; + if ("C".equals(codeString)) + return ClaimModifiers.C; + if ("E".equals(codeString)) + return ClaimModifiers.E; + if ("X".equals(codeString)) + return ClaimModifiers.X; + throw new IllegalArgumentException("Unknown ClaimModifiers code '"+codeString+"'"); + } + + public String toCode(ClaimModifiers code) { + if (code == ClaimModifiers.A) + return "A"; + if (code == ClaimModifiers.B) + return "B"; + if (code == ClaimModifiers.C) + return "C"; + if (code == ClaimModifiers.E) + return "E"; + if (code == ClaimModifiers.X) + return "X"; + return "?"; + } + + public String toSystem(ClaimModifiers code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContext.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContext.java index 80284701664..a144807e46c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContext.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ClassificationOrContext { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContextEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContextEnumFactory.java new file mode 100644 index 00000000000..7584d564bf2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ClassificationOrContextEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ClassificationOrContextEnumFactory implements EnumFactory { + + public ClassificationOrContext fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("classification".equals(codeString)) + return ClassificationOrContext.CLASSIFICATION; + if ("context".equals(codeString)) + return ClassificationOrContext.CONTEXT; + throw new IllegalArgumentException("Unknown ClassificationOrContext code '"+codeString+"'"); + } + + public String toCode(ClassificationOrContext code) { + if (code == ClassificationOrContext.CLASSIFICATION) + return "classification"; + if (code == ClassificationOrContext.CONTEXT) + return "context"; + return "?"; + } + + public String toSystem(ClassificationOrContext code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategory.java index d52e592a82d..6dced39a8d7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ConditionCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategoryEnumFactory.java new file mode 100644 index 00000000000..b298a3e0db3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionCategoryEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ConditionCategoryEnumFactory implements EnumFactory { + + public ConditionCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("complaint".equals(codeString)) + return ConditionCategory.COMPLAINT; + if ("symptom".equals(codeString)) + return ConditionCategory.SYMPTOM; + if ("finding".equals(codeString)) + return ConditionCategory.FINDING; + if ("diagnosis".equals(codeString)) + return ConditionCategory.DIAGNOSIS; + throw new IllegalArgumentException("Unknown ConditionCategory code '"+codeString+"'"); + } + + public String toCode(ConditionCategory code) { + if (code == ConditionCategory.COMPLAINT) + return "complaint"; + if (code == ConditionCategory.SYMPTOM) + return "symptom"; + if (code == ConditionCategory.FINDING) + return "finding"; + if (code == ConditionCategory.DIAGNOSIS) + return "diagnosis"; + return "?"; + } + + public String toSystem(ConditionCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinical.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinical.java index d94d3d7e397..8dcd2651dd4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinical.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ConditionClinical { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinicalEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinicalEnumFactory.java new file mode 100644 index 00000000000..ce9afca80f9 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionClinicalEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ConditionClinicalEnumFactory implements EnumFactory { + + public ConditionClinical fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("active".equals(codeString)) + return ConditionClinical.ACTIVE; + if ("relapse".equals(codeString)) + return ConditionClinical.RELAPSE; + if ("remission".equals(codeString)) + return ConditionClinical.REMISSION; + if ("resolved".equals(codeString)) + return ConditionClinical.RESOLVED; + throw new IllegalArgumentException("Unknown ConditionClinical code '"+codeString+"'"); + } + + public String toCode(ConditionClinical code) { + if (code == ConditionClinical.ACTIVE) + return "active"; + if (code == ConditionClinical.RELAPSE) + return "relapse"; + if (code == ConditionClinical.REMISSION) + return "remission"; + if (code == ConditionClinical.RESOLVED) + return "resolved"; + return "?"; + } + + public String toSystem(ConditionClinical code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionState.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionState.java index 82a5a77eff5..c571bf47931 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionState.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ConditionState { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionStateEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionStateEnumFactory.java new file mode 100644 index 00000000000..5570d38b0a9 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConditionStateEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ConditionStateEnumFactory implements EnumFactory { + + public ConditionState fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("active".equals(codeString)) + return ConditionState.ACTIVE; + if ("inactive".equals(codeString)) + return ConditionState.INACTIVE; + if ("resolved".equals(codeString)) + return ConditionState.RESOLVED; + throw new IllegalArgumentException("Unknown ConditionState code '"+codeString+"'"); + } + + public String toCode(ConditionState code) { + if (code == ConditionState.ACTIVE) + return "active"; + if (code == ConditionState.INACTIVE) + return "inactive"; + if (code == ConditionState.RESOLVED) + return "resolved"; + return "?"; + } + + public String toSystem(ConditionState code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectation.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectation.java index 13479a96bba..7af2e74896c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ConformanceExpectation { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectationEnumFactory.java new file mode 100644 index 00000000000..c4849debf07 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ConformanceExpectationEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ConformanceExpectationEnumFactory implements EnumFactory { + + public ConformanceExpectation fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("SHALL".equals(codeString)) + return ConformanceExpectation.SHALL; + if ("SHOULD".equals(codeString)) + return ConformanceExpectation.SHOULD; + if ("MAY".equals(codeString)) + return ConformanceExpectation.MAY; + if ("SHOULD-NOT".equals(codeString)) + return ConformanceExpectation.SHOULDNOT; + throw new IllegalArgumentException("Unknown ConformanceExpectation code '"+codeString+"'"); + } + + public String toCode(ConformanceExpectation code) { + if (code == ConformanceExpectation.SHALL) + return "SHALL"; + if (code == ConformanceExpectation.SHOULD) + return "SHOULD"; + if (code == ConformanceExpectation.MAY) + return "MAY"; + if (code == ConformanceExpectation.SHOULDNOT) + return "SHOULD-NOT"; + return "?"; + } + + public String toSystem(ConformanceExpectation code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityType.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityType.java index 9e775763e1c..f930b310d1b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContactentityType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityTypeEnumFactory.java new file mode 100644 index 00000000000..33d7ebbb63e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContactentityTypeEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContactentityTypeEnumFactory implements EnumFactory { + + public ContactentityType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("BILL".equals(codeString)) + return ContactentityType.BILL; + if ("ADMIN".equals(codeString)) + return ContactentityType.ADMIN; + if ("HR".equals(codeString)) + return ContactentityType.HR; + if ("PAYOR".equals(codeString)) + return ContactentityType.PAYOR; + if ("PATINF".equals(codeString)) + return ContactentityType.PATINF; + if ("PRESS".equals(codeString)) + return ContactentityType.PRESS; + throw new IllegalArgumentException("Unknown ContactentityType code '"+codeString+"'"); + } + + public String toCode(ContactentityType code) { + if (code == ContactentityType.BILL) + return "BILL"; + if (code == ContactentityType.ADMIN) + return "ADMIN"; + if (code == ContactentityType.HR) + return "HR"; + if (code == ContactentityType.PAYOR) + return "PAYOR"; + if (code == ContactentityType.PATINF) + return "PATINF"; + if (code == ContactentityType.PRESS) + return "PRESS"; + return "?"; + } + + public String toSystem(ContactentityType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractAction.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractAction.java index ac60e75efb0..97edd03e73c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractAction.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractAction { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActionEnumFactory.java new file mode 100644 index 00000000000..69b0de630fc --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActionEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractActionEnumFactory implements EnumFactory { + + public ContractAction fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("action-a".equals(codeString)) + return ContractAction.ACTIONA; + if ("action-b".equals(codeString)) + return ContractAction.ACTIONB; + throw new IllegalArgumentException("Unknown ContractAction code '"+codeString+"'"); + } + + public String toCode(ContractAction code) { + if (code == ContractAction.ACTIONA) + return "action-a"; + if (code == ContractAction.ACTIONB) + return "action-b"; + return "?"; + } + + public String toSystem(ContractAction code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorrole.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorrole.java index f0ac990cdc8..28b9abb8908 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorrole.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractActorrole { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorroleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorroleEnumFactory.java new file mode 100644 index 00000000000..189317653c0 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractActorroleEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractActorroleEnumFactory implements EnumFactory { + + public ContractActorrole fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("practitioner".equals(codeString)) + return ContractActorrole.PRACTITIONER; + if ("patient".equals(codeString)) + return ContractActorrole.PATIENT; + throw new IllegalArgumentException("Unknown ContractActorrole code '"+codeString+"'"); + } + + public String toCode(ContractActorrole code) { + if (code == ContractActorrole.PRACTITIONER) + return "practitioner"; + if (code == ContractActorrole.PATIENT) + return "patient"; + return "?"; + } + + public String toSystem(ContractActorrole code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerType.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerType.java index 876c13b6529..28d94fbf71e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractSignerType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerTypeEnumFactory.java similarity index 69% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerTypeEnumFactory.java index 35d87cbf225..96eaf7534cc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSignerTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ContractSignerTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtype.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtype.java index 4326ee0aeab..bd0ef8eac0e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtype.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractSubtype { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtypeEnumFactory.java new file mode 100644 index 00000000000..d00b60b61f6 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractSubtypeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractSubtypeEnumFactory implements EnumFactory { + + public ContractSubtype fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("disclosure-CA".equals(codeString)) + return ContractSubtype.DISCLOSURECA; + if ("disclosure-US".equals(codeString)) + return ContractSubtype.DISCLOSUREUS; + throw new IllegalArgumentException("Unknown ContractSubtype code '"+codeString+"'"); + } + + public String toCode(ContractSubtype code) { + if (code == ContractSubtype.DISCLOSURECA) + return "disclosure-CA"; + if (code == ContractSubtype.DISCLOSUREUS) + return "disclosure-US"; + return "?"; + } + + public String toSystem(ContractSubtype code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtype.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtype.java index 3f5087a91e9..920a087a74b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtype.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractTermSubtype { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtypeEnumFactory.java new file mode 100644 index 00000000000..a35964d843c --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermSubtypeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractTermSubtypeEnumFactory implements EnumFactory { + + public ContractTermSubtype fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("OralHealth-Basic".equals(codeString)) + return ContractTermSubtype.ORALHEALTHBASIC; + if ("OralHealth-Major".equals(codeString)) + return ContractTermSubtype.ORALHEALTHMAJOR; + if ("OralHealth-Orthodontic".equals(codeString)) + return ContractTermSubtype.ORALHEALTHORTHODONTIC; + throw new IllegalArgumentException("Unknown ContractTermSubtype code '"+codeString+"'"); + } + + public String toCode(ContractTermSubtype code) { + if (code == ContractTermSubtype.ORALHEALTHBASIC) + return "OralHealth-Basic"; + if (code == ContractTermSubtype.ORALHEALTHMAJOR) + return "OralHealth-Major"; + if (code == ContractTermSubtype.ORALHEALTHORTHODONTIC) + return "OralHealth-Orthodontic"; + return "?"; + } + + public String toSystem(ContractTermSubtype code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermType.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermType.java index f3bb3ec90cb..37bafec0bc6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractTermType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermTypeEnumFactory.java new file mode 100644 index 00000000000..7ec6111f83c --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTermTypeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractTermTypeEnumFactory implements EnumFactory { + + public ContractTermType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("OralHealth".equals(codeString)) + return ContractTermType.ORALHEALTH; + if ("Vision".equals(codeString)) + return ContractTermType.VISION; + throw new IllegalArgumentException("Unknown ContractTermType code '"+codeString+"'"); + } + + public String toCode(ContractTermType code) { + if (code == ContractTermType.ORALHEALTH) + return "OralHealth"; + if (code == ContractTermType.VISION) + return "Vision"; + return "?"; + } + + public String toSystem(ContractTermType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractType.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractType.java index ebf1643860b..052b196767a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ContractType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTypeEnumFactory.java new file mode 100644 index 00000000000..55560dbd14e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ContractTypeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ContractTypeEnumFactory implements EnumFactory { + + public ContractType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("privacy".equals(codeString)) + return ContractType.PRIVACY; + if ("disclosure".equals(codeString)) + return ContractType.DISCLOSURE; + throw new IllegalArgumentException("Unknown ContractType code '"+codeString+"'"); + } + + public String toCode(ContractType code) { + if (code == ContractType.PRIVACY) + return "privacy"; + if (code == ContractType.DISCLOSURE) + return "disclosure"; + return "?"; + } + + public String toSystem(ContractType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceAction.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceAction.java index cdba26fea90..822fd68d9b3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceAction.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum DeviceAction { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceActionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceActionEnumFactory.java new file mode 100644 index 00000000000..adfc719c01b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/DeviceActionEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class DeviceActionEnumFactory implements EnumFactory { + + public DeviceAction fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("implanted".equals(codeString)) + return DeviceAction.IMPLANTED; + if ("explanted".equals(codeString)) + return DeviceAction.EXPLANTED; + if ("manipulated".equals(codeString)) + return DeviceAction.MANIPULATED; + throw new IllegalArgumentException("Unknown DeviceAction code '"+codeString+"'"); + } + + public String toCode(DeviceAction code) { + if (code == DeviceAction.IMPLANTED) + return "implanted"; + if (code == DeviceAction.EXPLANTED) + return "explanted"; + if (code == DeviceAction.MANIPULATED) + return "manipulated"; + return "?"; + } + + public String toSystem(DeviceAction code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSource.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSource.java index 6da8776cee0..01779e37b09 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSource.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterAdmitSource { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSourceEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSourceEnumFactory.java index 36ba737b2af..81128e12717 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterAdmitSourceEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class EncounterAdmitSourceEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDiet.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDiet.java index 6e7dc088ce1..5f49ee78a41 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDiet.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterDiet { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDietEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDietEnumFactory.java new file mode 100644 index 00000000000..638548e01ce --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDietEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class EncounterDietEnumFactory implements EnumFactory { + + public EncounterDiet fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("vegetarian".equals(codeString)) + return EncounterDiet.VEGETARIAN; + if ("dairy-free".equals(codeString)) + return EncounterDiet.DAIRYFREE; + if ("nut-free".equals(codeString)) + return EncounterDiet.NUTFREE; + if ("gluten-free".equals(codeString)) + return EncounterDiet.GLUTENFREE; + if ("vegan".equals(codeString)) + return EncounterDiet.VEGAN; + if ("halal".equals(codeString)) + return EncounterDiet.HALAL; + if ("kosher".equals(codeString)) + return EncounterDiet.KOSHER; + throw new IllegalArgumentException("Unknown EncounterDiet code '"+codeString+"'"); + } + + public String toCode(EncounterDiet code) { + if (code == EncounterDiet.VEGETARIAN) + return "vegetarian"; + if (code == EncounterDiet.DAIRYFREE) + return "dairy-free"; + if (code == EncounterDiet.NUTFREE) + return "nut-free"; + if (code == EncounterDiet.GLUTENFREE) + return "gluten-free"; + if (code == EncounterDiet.VEGAN) + return "vegan"; + if (code == EncounterDiet.HALAL) + return "halal"; + if (code == EncounterDiet.KOSHER) + return "kosher"; + return "?"; + } + + public String toSystem(EncounterDiet code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDisposition.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDisposition.java index cebc56e0df6..52eb6d34d10 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDisposition.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterDischargeDisposition { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDispositionEnumFactory.java similarity index 52% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDispositionEnumFactory.java index 103d5e253ec..4caf190fce1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterDischargeDispositionEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class EncounterDischargeDispositionEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriority.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriority.java index a434b974a68..a4d05bfe132 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriorityEnumFactory.java new file mode 100644 index 00000000000..a2fd3218b82 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterPriorityEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class EncounterPriorityEnumFactory implements EnumFactory { + + public EncounterPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("imm".equals(codeString)) + return EncounterPriority.IMM; + if ("emg".equals(codeString)) + return EncounterPriority.EMG; + if ("urg".equals(codeString)) + return EncounterPriority.URG; + if ("s-urg".equals(codeString)) + return EncounterPriority.SURG; + if ("no-urg".equals(codeString)) + return EncounterPriority.NOURG; + throw new IllegalArgumentException("Unknown EncounterPriority code '"+codeString+"'"); + } + + public String toCode(EncounterPriority code) { + if (code == EncounterPriority.IMM) + return "imm"; + if (code == EncounterPriority.EMG) + return "emg"; + if (code == EncounterPriority.URG) + return "urg"; + if (code == EncounterPriority.SURG) + return "s-urg"; + if (code == EncounterPriority.NOURG) + return "no-urg"; + return "?"; + } + + public String toSystem(EncounterPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangements.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangements.java index fce99cff13c..282392202b4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangements.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterSpecialArrangements { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangementsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangementsEnumFactory.java new file mode 100644 index 00000000000..35a7465668a --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterSpecialArrangementsEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class EncounterSpecialArrangementsEnumFactory implements EnumFactory { + + public EncounterSpecialArrangements fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("wheel".equals(codeString)) + return EncounterSpecialArrangements.WHEEL; + if ("stret".equals(codeString)) + return EncounterSpecialArrangements.STRET; + if ("int".equals(codeString)) + return EncounterSpecialArrangements.INT; + if ("att".equals(codeString)) + return EncounterSpecialArrangements.ATT; + if ("dog".equals(codeString)) + return EncounterSpecialArrangements.DOG; + throw new IllegalArgumentException("Unknown EncounterSpecialArrangements code '"+codeString+"'"); + } + + public String toCode(EncounterSpecialArrangements code) { + if (code == EncounterSpecialArrangements.WHEEL) + return "wheel"; + if (code == EncounterSpecialArrangements.STRET) + return "stret"; + if (code == EncounterSpecialArrangements.INT) + return "int"; + if (code == EncounterSpecialArrangements.ATT) + return "att"; + if (code == EncounterSpecialArrangements.DOG) + return "dog"; + return "?"; + } + + public String toSystem(EncounterSpecialArrangements code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterType.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterType.java index 3e412376f5d..ebfc4cc14fe 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EncounterType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterTypeEnumFactory.java new file mode 100644 index 00000000000..06b629340e9 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EncounterTypeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class EncounterTypeEnumFactory implements EnumFactory { + + public EncounterType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("ADMS".equals(codeString)) + return EncounterType.ADMS; + if ("BD/BM-clin".equals(codeString)) + return EncounterType.BD_BMCLIN; + if ("CCS60".equals(codeString)) + return EncounterType.CCS60; + if ("OKI".equals(codeString)) + return EncounterType.OKI; + throw new IllegalArgumentException("Unknown EncounterType code '"+codeString+"'"); + } + + public String toCode(EncounterType code) { + if (code == EncounterType.ADMS) + return "ADMS"; + if (code == EncounterType.BD_BMCLIN) + return "BD/BM-clin"; + if (code == EncounterType.CCS60) + return "CCS60"; + if (code == EncounterType.OKI) + return "OKI"; + return "?"; + } + + public String toSystem(EncounterType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditive.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditive.java index c7c3c1a2ecf..f09e3ed95f8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditive.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum EntformulaAdditive { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditiveEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditiveEnumFactory.java new file mode 100644 index 00000000000..ff67dd1e827 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/EntformulaAdditiveEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class EntformulaAdditiveEnumFactory implements EnumFactory { + + public EntformulaAdditive fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("lipid".equals(codeString)) + return EntformulaAdditive.LIPID; + if ("protein".equals(codeString)) + return EntformulaAdditive.PROTEIN; + if ("carbohydrate".equals(codeString)) + return EntformulaAdditive.CARBOHYDRATE; + if ("fiber".equals(codeString)) + return EntformulaAdditive.FIBER; + if ("water".equals(codeString)) + return EntformulaAdditive.WATER; + throw new IllegalArgumentException("Unknown EntformulaAdditive code '"+codeString+"'"); + } + + public String toCode(EntformulaAdditive code) { + if (code == EntformulaAdditive.LIPID) + return "lipid"; + if (code == EntformulaAdditive.PROTEIN) + return "protein"; + if (code == EntformulaAdditive.CARBOHYDRATE) + return "carbohydrate"; + if (code == EntformulaAdditive.FIBER) + return "fiber"; + if (code == EntformulaAdditive.WATER) + return "water"; + return "?"; + } + + public String toSystem(EntformulaAdditive code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategory.java index f5c4c205b7f..54a62ac0707 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum FlagCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategoryEnumFactory.java new file mode 100644 index 00000000000..f65fdcca919 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagCategoryEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class FlagCategoryEnumFactory implements EnumFactory { + + public FlagCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("diet".equals(codeString)) + return FlagCategory.DIET; + if ("drug".equals(codeString)) + return FlagCategory.DRUG; + if ("lab".equals(codeString)) + return FlagCategory.LAB; + if ("admin".equals(codeString)) + return FlagCategory.ADMIN; + if ("contact".equals(codeString)) + return FlagCategory.CONTACT; + throw new IllegalArgumentException("Unknown FlagCategory code '"+codeString+"'"); + } + + public String toCode(FlagCategory code) { + if (code == FlagCategory.DIET) + return "diet"; + if (code == FlagCategory.DRUG) + return "drug"; + if (code == FlagCategory.LAB) + return "lab"; + if (code == FlagCategory.ADMIN) + return "admin"; + if (code == FlagCategory.CONTACT) + return "contact"; + return "?"; + } + + public String toSystem(FlagCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriority.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriority.java index 3e99ee1f3d8..d5e0bfa2c2d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum FlagPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriorityEnumFactory.java new file mode 100644 index 00000000000..e7f16d165fa --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FlagPriorityEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class FlagPriorityEnumFactory implements EnumFactory { + + public FlagPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("PN".equals(codeString)) + return FlagPriority.PN; + if ("PL".equals(codeString)) + return FlagPriority.PL; + if ("PM".equals(codeString)) + return FlagPriority.PM; + if ("PH".equals(codeString)) + return FlagPriority.PH; + throw new IllegalArgumentException("Unknown FlagPriority code '"+codeString+"'"); + } + + public String toCode(FlagPriority code) { + if (code == FlagPriority.PN) + return "PN"; + if (code == FlagPriority.PL) + return "PL"; + if (code == FlagPriority.PM) + return "PM"; + if (code == FlagPriority.PH) + return "PH"; + return "?"; + } + + public String toSystem(FlagPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditions.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditions.java index 5037afbbcd2..c35177b4005 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditions.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum FmConditions { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditionsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditionsEnumFactory.java new file mode 100644 index 00000000000..de7c03540ab --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FmConditionsEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class FmConditionsEnumFactory implements EnumFactory { + + public FmConditions fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("123987".equals(codeString)) + return FmConditions._123987; + throw new IllegalArgumentException("Unknown FmConditions code '"+codeString+"'"); + } + + public String toCode(FmConditions code) { + if (code == FmConditions._123987) + return "123987"; + return "?"; + } + + public String toSystem(FmConditions code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Forms.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Forms.java index d332eb084f2..c3e61e26510 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Forms.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Forms { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FormsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FormsEnumFactory.java new file mode 100644 index 00000000000..551f69cb43c --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FormsEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class FormsEnumFactory implements EnumFactory { + + public Forms fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("1".equals(codeString)) + return Forms._1; + if ("2".equals(codeString)) + return Forms._2; + throw new IllegalArgumentException("Unknown Forms code '"+codeString+"'"); + } + + public String toCode(Forms code) { + if (code == Forms._1) + return "1"; + if (code == Forms._2) + return "2"; + return "?"; + } + + public String toSystem(Forms code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Fundsreserve.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Fundsreserve.java index 2c6dc4f93a2..c3bbf316ee3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Fundsreserve.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Fundsreserve { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FundsreserveEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FundsreserveEnumFactory.java new file mode 100644 index 00000000000..c13c4d67aa8 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/FundsreserveEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class FundsreserveEnumFactory implements EnumFactory { + + public Fundsreserve fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("patient".equals(codeString)) + return Fundsreserve.PATIENT; + if ("provider".equals(codeString)) + return Fundsreserve.PROVIDER; + if ("none".equals(codeString)) + return Fundsreserve.NONE; + throw new IllegalArgumentException("Unknown Fundsreserve code '"+codeString+"'"); + } + + public String toCode(Fundsreserve code) { + if (code == Fundsreserve.PATIENT) + return "patient"; + if (code == Fundsreserve.PROVIDER) + return "provider"; + if (code == Fundsreserve.NONE) + return "none"; + return "?"; + } + + public String toSystem(Fundsreserve code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatus.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatus.java index 716c3125ad4..53edb0fe4d2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum GoalAcceptanceStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatusEnumFactory.java new file mode 100644 index 00000000000..32026214ad5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalAcceptanceStatusEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class GoalAcceptanceStatusEnumFactory implements EnumFactory { + + public GoalAcceptanceStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("agree".equals(codeString)) + return GoalAcceptanceStatus.AGREE; + if ("disagree".equals(codeString)) + return GoalAcceptanceStatus.DISAGREE; + if ("pending".equals(codeString)) + return GoalAcceptanceStatus.PENDING; + throw new IllegalArgumentException("Unknown GoalAcceptanceStatus code '"+codeString+"'"); + } + + public String toCode(GoalAcceptanceStatus code) { + if (code == GoalAcceptanceStatus.AGREE) + return "agree"; + if (code == GoalAcceptanceStatus.DISAGREE) + return "disagree"; + if (code == GoalAcceptanceStatus.PENDING) + return "pending"; + return "?"; + } + + public String toSystem(GoalAcceptanceStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategory.java index 39857da17cc..b06a13ea4ba 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum GoalCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategoryEnumFactory.java new file mode 100644 index 00000000000..f60dbbed23f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalCategoryEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class GoalCategoryEnumFactory implements EnumFactory { + + public GoalCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("dietary".equals(codeString)) + return GoalCategory.DIETARY; + if ("safety".equals(codeString)) + return GoalCategory.SAFETY; + if ("behavioral".equals(codeString)) + return GoalCategory.BEHAVIORAL; + if ("nursing".equals(codeString)) + return GoalCategory.NURSING; + if ("physiotherapy".equals(codeString)) + return GoalCategory.PHYSIOTHERAPY; + throw new IllegalArgumentException("Unknown GoalCategory code '"+codeString+"'"); + } + + public String toCode(GoalCategory code) { + if (code == GoalCategory.DIETARY) + return "dietary"; + if (code == GoalCategory.SAFETY) + return "safety"; + if (code == GoalCategory.BEHAVIORAL) + return "behavioral"; + if (code == GoalCategory.NURSING) + return "nursing"; + if (code == GoalCategory.PHYSIOTHERAPY) + return "physiotherapy"; + return "?"; + } + + public String toSystem(GoalCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriority.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriority.java index 61ad4115703..e04eedaf147 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum GoalPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriorityEnumFactory.java new file mode 100644 index 00000000000..77bcd1a8e4e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalPriorityEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class GoalPriorityEnumFactory implements EnumFactory { + + public GoalPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("high".equals(codeString)) + return GoalPriority.HIGH; + if ("medium".equals(codeString)) + return GoalPriority.MEDIUM; + if ("low".equals(codeString)) + return GoalPriority.LOW; + throw new IllegalArgumentException("Unknown GoalPriority code '"+codeString+"'"); + } + + public String toCode(GoalPriority code) { + if (code == GoalPriority.HIGH) + return "high"; + if (code == GoalPriority.MEDIUM) + return "medium"; + if (code == GoalPriority.LOW) + return "low"; + return "?"; + } + + public String toSystem(GoalPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipType.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipType.java index a56943f9c88..eea04ef66da 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum GoalRelationshipType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipTypeEnumFactory.java new file mode 100644 index 00000000000..d99725c6200 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalRelationshipTypeEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class GoalRelationshipTypeEnumFactory implements EnumFactory { + + public GoalRelationshipType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("predecessor".equals(codeString)) + return GoalRelationshipType.PREDECESSOR; + if ("successor".equals(codeString)) + return GoalRelationshipType.SUCCESSOR; + if ("replacement".equals(codeString)) + return GoalRelationshipType.REPLACEMENT; + if ("component".equals(codeString)) + return GoalRelationshipType.COMPONENT; + if ("other".equals(codeString)) + return GoalRelationshipType.OTHER; + throw new IllegalArgumentException("Unknown GoalRelationshipType code '"+codeString+"'"); + } + + public String toCode(GoalRelationshipType code) { + if (code == GoalRelationshipType.PREDECESSOR) + return "predecessor"; + if (code == GoalRelationshipType.SUCCESSOR) + return "successor"; + if (code == GoalRelationshipType.REPLACEMENT) + return "replacement"; + if (code == GoalRelationshipType.COMPONENT) + return "component"; + if (code == GoalRelationshipType.OTHER) + return "other"; + return "?"; + } + + public String toSystem(GoalRelationshipType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReason.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReason.java index ab1c785e784..ef6c89bb3dc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum GoalStatusReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReasonEnumFactory.java new file mode 100644 index 00000000000..0a8db718528 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/GoalStatusReasonEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class GoalStatusReasonEnumFactory implements EnumFactory { + + public GoalStatusReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("surgery".equals(codeString)) + return GoalStatusReason.SURGERY; + if ("life-event".equals(codeString)) + return GoalStatusReason.LIFEEVENT; + if ("replaced".equals(codeString)) + return GoalStatusReason.REPLACED; + if ("patient-request".equals(codeString)) + return GoalStatusReason.PATIENTREQUEST; + throw new IllegalArgumentException("Unknown GoalStatusReason code '"+codeString+"'"); + } + + public String toCode(GoalStatusReason code) { + if (code == GoalStatusReason.SURGERY) + return "surgery"; + if (code == GoalStatusReason.LIFEEVENT) + return "life-event"; + if (code == GoalStatusReason.REPLACED) + return "replaced"; + if (code == GoalStatusReason.PATIENTREQUEST) + return "patient-request"; + return "?"; + } + + public String toSystem(GoalStatusReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterion.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterion.java index ef5a589c789..d1d5b4a0651 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterion.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ImmunizationRecommendationDateCriterion { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java new file mode 100644 index 00000000000..865768ae7f3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationDateCriterionEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ImmunizationRecommendationDateCriterionEnumFactory implements EnumFactory { + + public ImmunizationRecommendationDateCriterion fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("due".equals(codeString)) + return ImmunizationRecommendationDateCriterion.DUE; + if ("recommended".equals(codeString)) + return ImmunizationRecommendationDateCriterion.RECOMMENDED; + if ("earliest".equals(codeString)) + return ImmunizationRecommendationDateCriterion.EARLIEST; + if ("overdue".equals(codeString)) + return ImmunizationRecommendationDateCriterion.OVERDUE; + if ("latest".equals(codeString)) + return ImmunizationRecommendationDateCriterion.LATEST; + throw new IllegalArgumentException("Unknown ImmunizationRecommendationDateCriterion code '"+codeString+"'"); + } + + public String toCode(ImmunizationRecommendationDateCriterion code) { + if (code == ImmunizationRecommendationDateCriterion.DUE) + return "due"; + if (code == ImmunizationRecommendationDateCriterion.RECOMMENDED) + return "recommended"; + if (code == ImmunizationRecommendationDateCriterion.EARLIEST) + return "earliest"; + if (code == ImmunizationRecommendationDateCriterion.OVERDUE) + return "overdue"; + if (code == ImmunizationRecommendationDateCriterion.LATEST) + return "latest"; + return "?"; + } + + public String toSystem(ImmunizationRecommendationDateCriterion code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatus.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatus.java index 9299e6e88f3..86d1d92c7c7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ImmunizationRecommendationStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java new file mode 100644 index 00000000000..05664c45e39 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ImmunizationRecommendationStatusEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ImmunizationRecommendationStatusEnumFactory implements EnumFactory { + + public ImmunizationRecommendationStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("due".equals(codeString)) + return ImmunizationRecommendationStatus.DUE; + if ("overdue".equals(codeString)) + return ImmunizationRecommendationStatus.OVERDUE; + throw new IllegalArgumentException("Unknown ImmunizationRecommendationStatus code '"+codeString+"'"); + } + + public String toCode(ImmunizationRecommendationStatus code) { + if (code == ImmunizationRecommendationStatus.DUE) + return "due"; + if (code == ImmunizationRecommendationStatus.OVERDUE) + return "overdue"; + return "?"; + } + + public String toSystem(ImmunizationRecommendationStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Intervention.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Intervention.java index bf94e953c26..9b9233abf15 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Intervention.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Intervention { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/InterventionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/InterventionEnumFactory.java new file mode 100644 index 00000000000..117b03080ad --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/InterventionEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class InterventionEnumFactory implements EnumFactory { + + public Intervention fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("unknown".equals(codeString)) + return Intervention.UNKNOWN; + if ("other".equals(codeString)) + return Intervention.OTHER; + throw new IllegalArgumentException("Unknown Intervention code '"+codeString+"'"); + } + + public String toCode(Intervention code) { + if (code == Intervention.UNKNOWN) + return "unknown"; + if (code == Intervention.OTHER) + return "other"; + return "?"; + } + + public String toSystem(Intervention code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020Answerlist.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020Answerlist.java index 88a39845768..77d4b257a24 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020Answerlist.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum LOINC480020Answerlist { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020AnswerlistEnumFactory.java new file mode 100644 index 00000000000..5ec19f9fd24 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480020AnswerlistEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class LOINC480020AnswerlistEnumFactory implements EnumFactory { + + public LOINC480020Answerlist fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("LA6683-2".equals(codeString)) + return LOINC480020Answerlist.LA66832; + if ("LA6684-0".equals(codeString)) + return LOINC480020Answerlist.LA66840; + if ("LA6685-7".equals(codeString)) + return LOINC480020Answerlist.LA66857; + if ("LA18194-3".equals(codeString)) + return LOINC480020Answerlist.LA181943; + if ("LA18195-0".equals(codeString)) + return LOINC480020Answerlist.LA181950; + if ("LA18196-8".equals(codeString)) + return LOINC480020Answerlist.LA181968; + if ("LA18197-6".equals(codeString)) + return LOINC480020Answerlist.LA181976; + throw new IllegalArgumentException("Unknown LOINC480020Answerlist code '"+codeString+"'"); + } + + public String toCode(LOINC480020Answerlist code) { + if (code == LOINC480020Answerlist.LA66832) + return "LA6683-2"; + if (code == LOINC480020Answerlist.LA66840) + return "LA6684-0"; + if (code == LOINC480020Answerlist.LA66857) + return "LA6685-7"; + if (code == LOINC480020Answerlist.LA181943) + return "LA18194-3"; + if (code == LOINC480020Answerlist.LA181950) + return "LA18195-0"; + if (code == LOINC480020Answerlist.LA181968) + return "LA18196-8"; + if (code == LOINC480020Answerlist.LA181976) + return "LA18197-6"; + return "?"; + } + + public String toSystem(LOINC480020Answerlist code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194Answerlist.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194Answerlist.java index 08b5a165b3b..8b437b80aa4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194Answerlist.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum LOINC480194Answerlist { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194AnswerlistEnumFactory.java new file mode 100644 index 00000000000..23f02f16577 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC480194AnswerlistEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class LOINC480194AnswerlistEnumFactory implements EnumFactory { + + public LOINC480194Answerlist fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("LA9658-1".equals(codeString)) + return LOINC480194Answerlist.LA96581; + if ("LA6692-3".equals(codeString)) + return LOINC480194Answerlist.LA66923; + if ("LA6686-5".equals(codeString)) + return LOINC480194Answerlist.LA66865; + if ("LA6687-3".equals(codeString)) + return LOINC480194Answerlist.LA66873; + if ("LA6688-1".equals(codeString)) + return LOINC480194Answerlist.LA66881; + if ("LA6689-9".equals(codeString)) + return LOINC480194Answerlist.LA66899; + if ("LA6690-7".equals(codeString)) + return LOINC480194Answerlist.LA66907; + throw new IllegalArgumentException("Unknown LOINC480194Answerlist code '"+codeString+"'"); + } + + public String toCode(LOINC480194Answerlist code) { + if (code == LOINC480194Answerlist.LA96581) + return "LA9658-1"; + if (code == LOINC480194Answerlist.LA66923) + return "LA6692-3"; + if (code == LOINC480194Answerlist.LA66865) + return "LA6686-5"; + if (code == LOINC480194Answerlist.LA66873) + return "LA6687-3"; + if (code == LOINC480194Answerlist.LA66881) + return "LA6688-1"; + if (code == LOINC480194Answerlist.LA66899) + return "LA6689-9"; + if (code == LOINC480194Answerlist.LA66907) + return "LA6690-7"; + return "?"; + } + + public String toSystem(LOINC480194Answerlist code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345Answerlist.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345Answerlist.java index ceb555b98be..7e25908a211 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345Answerlist.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum LOINC530345Answerlist { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345AnswerlistEnumFactory.java new file mode 100644 index 00000000000..fe73562a1c2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530345AnswerlistEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class LOINC530345AnswerlistEnumFactory implements EnumFactory { + + public LOINC530345Answerlist fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("LA6703-8".equals(codeString)) + return LOINC530345Answerlist.LA67038; + if ("LA6704-6".equals(codeString)) + return LOINC530345Answerlist.LA67046; + if ("LA6705-3".equals(codeString)) + return LOINC530345Answerlist.LA67053; + if ("LA6706-1".equals(codeString)) + return LOINC530345Answerlist.LA67061; + if ("LA6707-9".equals(codeString)) + return LOINC530345Answerlist.LA67079; + throw new IllegalArgumentException("Unknown LOINC530345Answerlist code '"+codeString+"'"); + } + + public String toCode(LOINC530345Answerlist code) { + if (code == LOINC530345Answerlist.LA67038) + return "LA6703-8"; + if (code == LOINC530345Answerlist.LA67046) + return "LA6704-6"; + if (code == LOINC530345Answerlist.LA67053) + return "LA6705-3"; + if (code == LOINC530345Answerlist.LA67061) + return "LA6706-1"; + if (code == LOINC530345Answerlist.LA67079) + return "LA6707-9"; + return "?"; + } + + public String toSystem(LOINC530345Answerlist code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378Answerlist.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378Answerlist.java index 15480010210..55e05e043c1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378Answerlist.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum LOINC530378Answerlist { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378AnswerlistEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378AnswerlistEnumFactory.java new file mode 100644 index 00000000000..1b13a64f5c4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LOINC530378AnswerlistEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class LOINC530378AnswerlistEnumFactory implements EnumFactory { + + public LOINC530378Answerlist fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("LA6668-3".equals(codeString)) + return LOINC530378Answerlist.LA66683; + if ("LA6669-1".equals(codeString)) + return LOINC530378Answerlist.LA66691; + if ("LA6682-4".equals(codeString)) + return LOINC530378Answerlist.LA66824; + if ("LA6675-8".equals(codeString)) + return LOINC530378Answerlist.LA66758; + if ("LA6674-1".equals(codeString)) + return LOINC530378Answerlist.LA66741; + throw new IllegalArgumentException("Unknown LOINC530378Answerlist code '"+codeString+"'"); + } + + public String toCode(LOINC530378Answerlist code) { + if (code == LOINC530378Answerlist.LA66683) + return "LA6668-3"; + if (code == LOINC530378Answerlist.LA66691) + return "LA6669-1"; + if (code == LOINC530378Answerlist.LA66824) + return "LA6682-4"; + if (code == LOINC530378Answerlist.LA66758) + return "LA6675-8"; + if (code == LOINC530378Answerlist.LA66741) + return "LA6674-1"; + return "?"; + } + + public String toSystem(LOINC530378Answerlist code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReason.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReason.java index 5a582724815..8a2b2c79ef2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ListEmptyReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReasonEnumFactory.java new file mode 100644 index 00000000000..166ccca7819 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListEmptyReasonEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ListEmptyReasonEnumFactory implements EnumFactory { + + public ListEmptyReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("nilknown".equals(codeString)) + return ListEmptyReason.NILKNOWN; + if ("notasked".equals(codeString)) + return ListEmptyReason.NOTASKED; + if ("withheld".equals(codeString)) + return ListEmptyReason.WITHHELD; + if ("unavailable".equals(codeString)) + return ListEmptyReason.UNAVAILABLE; + if ("notstarted".equals(codeString)) + return ListEmptyReason.NOTSTARTED; + if ("closed".equals(codeString)) + return ListEmptyReason.CLOSED; + throw new IllegalArgumentException("Unknown ListEmptyReason code '"+codeString+"'"); + } + + public String toCode(ListEmptyReason code) { + if (code == ListEmptyReason.NILKNOWN) + return "nilknown"; + if (code == ListEmptyReason.NOTASKED) + return "notasked"; + if (code == ListEmptyReason.WITHHELD) + return "withheld"; + if (code == ListEmptyReason.UNAVAILABLE) + return "unavailable"; + if (code == ListEmptyReason.NOTSTARTED) + return "notstarted"; + if (code == ListEmptyReason.CLOSED) + return "closed"; + return "?"; + } + + public String toSystem(ListEmptyReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodes.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodes.java index 6aabb1f710d..702b31d9715 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodes.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ListExampleCodes { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodesEnumFactory.java similarity index 50% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodesEnumFactory.java index 7d8d639775f..3aa06d92540 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListExampleCodesEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ListExampleCodesEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlag.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlag.java index 81410416881..570a88536c8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlag.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ListItemFlag { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlagEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlagEnumFactory.java new file mode 100644 index 00000000000..937270e3c80 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListItemFlagEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ListItemFlagEnumFactory implements EnumFactory { + + public ListItemFlag fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("01".equals(codeString)) + return ListItemFlag._01; + if ("02".equals(codeString)) + return ListItemFlag._02; + if ("03".equals(codeString)) + return ListItemFlag._03; + if ("04".equals(codeString)) + return ListItemFlag._04; + if ("05".equals(codeString)) + return ListItemFlag._05; + if ("06".equals(codeString)) + return ListItemFlag._06; + throw new IllegalArgumentException("Unknown ListItemFlag code '"+codeString+"'"); + } + + public String toCode(ListItemFlag code) { + if (code == ListItemFlag._01) + return "01"; + if (code == ListItemFlag._02) + return "02"; + if (code == ListItemFlag._03) + return "03"; + if (code == ListItemFlag._04) + return "04"; + if (code == ListItemFlag._05) + return "05"; + if (code == ListItemFlag._06) + return "06"; + return "?"; + } + + public String toSystem(ListItemFlag code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrder.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrder.java index cf5bd9a2881..97e0ae44514 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrder.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ListOrder { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrderEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrderEnumFactory.java new file mode 100644 index 00000000000..38a9012f3a7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ListOrderEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ListOrderEnumFactory implements EnumFactory { + + public ListOrder fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("user".equals(codeString)) + return ListOrder.USER; + if ("system".equals(codeString)) + return ListOrder.SYSTEM; + if ("event-date".equals(codeString)) + return ListOrder.EVENTDATE; + if ("entry-date".equals(codeString)) + return ListOrder.ENTRYDATE; + if ("priority".equals(codeString)) + return ListOrder.PRIORITY; + if ("alphabetic".equals(codeString)) + return ListOrder.ALPHABETIC; + if ("category".equals(codeString)) + return ListOrder.CATEGORY; + if ("patient".equals(codeString)) + return ListOrder.PATIENT; + throw new IllegalArgumentException("Unknown ListOrder code '"+codeString+"'"); + } + + public String toCode(ListOrder code) { + if (code == ListOrder.USER) + return "user"; + if (code == ListOrder.SYSTEM) + return "system"; + if (code == ListOrder.EVENTDATE) + return "event-date"; + if (code == ListOrder.ENTRYDATE) + return "entry-date"; + if (code == ListOrder.PRIORITY) + return "priority"; + if (code == ListOrder.ALPHABETIC) + return "alphabetic"; + if (code == ListOrder.CATEGORY) + return "category"; + if (code == ListOrder.PATIENT) + return "patient"; + return "?"; + } + + public String toSystem(ListOrder code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalType.java index 1ca5a75361c..bd18768102a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum LocationPhysicalType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalTypeEnumFactory.java similarity index 53% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalTypeEnumFactory.java index aaef87d590f..93af307096d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/LocationPhysicalTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class LocationPhysicalTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounter.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounter.java index a90834ea218..5a6f92b9687 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounter.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum MessageReasonEncounter { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounterEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounterEnumFactory.java new file mode 100644 index 00000000000..77effd94fd3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageReasonEncounterEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class MessageReasonEncounterEnumFactory implements EnumFactory { + + public MessageReasonEncounter fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("admit".equals(codeString)) + return MessageReasonEncounter.ADMIT; + if ("discharge".equals(codeString)) + return MessageReasonEncounter.DISCHARGE; + if ("absent".equals(codeString)) + return MessageReasonEncounter.ABSENT; + if ("return".equals(codeString)) + return MessageReasonEncounter.RETURN; + if ("moved".equals(codeString)) + return MessageReasonEncounter.MOVED; + if ("edit".equals(codeString)) + return MessageReasonEncounter.EDIT; + throw new IllegalArgumentException("Unknown MessageReasonEncounter code '"+codeString+"'"); + } + + public String toCode(MessageReasonEncounter code) { + if (code == MessageReasonEncounter.ADMIT) + return "admit"; + if (code == MessageReasonEncounter.DISCHARGE) + return "discharge"; + if (code == MessageReasonEncounter.ABSENT) + return "absent"; + if (code == MessageReasonEncounter.RETURN) + return "return"; + if (code == MessageReasonEncounter.MOVED) + return "moved"; + if (code == MessageReasonEncounter.EDIT) + return "edit"; + return "?"; + } + + public String toSystem(MessageReasonEncounter code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransport.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransport.java index 1a10e97020d..2c79ec73171 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransport.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum MessageTransport { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransportEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransportEnumFactory.java new file mode 100644 index 00000000000..4d6248ff371 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MessageTransportEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class MessageTransportEnumFactory implements EnumFactory { + + public MessageTransport fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("http".equals(codeString)) + return MessageTransport.HTTP; + if ("ftp".equals(codeString)) + return MessageTransport.FTP; + if ("mllp".equals(codeString)) + return MessageTransport.MLLP; + throw new IllegalArgumentException("Unknown MessageTransport code '"+codeString+"'"); + } + + public String toCode(MessageTransport code) { + if (code == MessageTransport.HTTP) + return "http"; + if (code == MessageTransport.FTP) + return "ftp"; + if (code == MessageTransport.MLLP) + return "mllp"; + return "?"; + } + + public String toSystem(MessageTransport code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReason.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReason.java index 34e06cc2257..56e5e78d1e0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum MissingToothReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReasonEnumFactory.java new file mode 100644 index 00000000000..6d6fb552816 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/MissingToothReasonEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class MissingToothReasonEnumFactory implements EnumFactory { + + public MissingToothReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("E".equals(codeString)) + return MissingToothReason.E; + if ("C".equals(codeString)) + return MissingToothReason.C; + if ("U".equals(codeString)) + return MissingToothReason.U; + if ("O".equals(codeString)) + return MissingToothReason.O; + throw new IllegalArgumentException("Unknown MissingToothReason code '"+codeString+"'"); + } + + public String toCode(MissingToothReason code) { + if (code == MissingToothReason.E) + return "E"; + if (code == MissingToothReason.C) + return "C"; + if (code == MissingToothReason.U) + return "U"; + if (code == MissingToothReason.O) + return "O"; + return "?"; + } + + public String toSystem(MissingToothReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycle.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycle.java index 38db5857ed4..e2709a6413d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycle.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ObjectLifecycle { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycleEnumFactory.java similarity index 55% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycleEnumFactory.java index 0f9ea027ab3..88257aff447 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectLifecycleEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ObjectLifecycleEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRole.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRole.java index a8ff4d0e18a..b02d254fd92 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRole.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ObjectRole { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRoleEnumFactory.java similarity index 62% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRoleEnumFactory.java index 35b408bf92e..1d3a910b0c0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectRoleEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ObjectRoleEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectType.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectType.java index 33dbe27d014..d415fe0e7c5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ObjectType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectTypeEnumFactory.java new file mode 100644 index 00000000000..62b5543f407 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObjectTypeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ObjectTypeEnumFactory implements EnumFactory { + + public ObjectType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("1".equals(codeString)) + return ObjectType._1; + if ("2".equals(codeString)) + return ObjectType._2; + if ("3".equals(codeString)) + return ObjectType._3; + if ("4".equals(codeString)) + return ObjectType._4; + throw new IllegalArgumentException("Unknown ObjectType code '"+codeString+"'"); + } + + public String toCode(ObjectType code) { + if (code == ObjectType._1) + return "1"; + if (code == ObjectType._2) + return "2"; + if (code == ObjectType._3) + return "3"; + if (code == ObjectType._4) + return "4"; + return "?"; + } + + public String toSystem(ObjectType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategory.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategory.java index 20bc9760325..f7a7c920e0c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ObservationCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategoryEnumFactory.java new file mode 100644 index 00000000000..52e1738820d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ObservationCategoryEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ObservationCategoryEnumFactory implements EnumFactory { + + public ObservationCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("social-history".equals(codeString)) + return ObservationCategory.SOCIALHISTORY; + if ("vital-signs".equals(codeString)) + return ObservationCategory.VITALSIGNS; + if ("imaging".equals(codeString)) + return ObservationCategory.IMAGING; + if ("laboratory".equals(codeString)) + return ObservationCategory.LABORATORY; + if ("procedure".equals(codeString)) + return ObservationCategory.PROCEDURE; + if ("survey".equals(codeString)) + return ObservationCategory.SURVEY; + if ("exam".equals(codeString)) + return ObservationCategory.EXAM; + if ("therapy".equals(codeString)) + return ObservationCategory.THERAPY; + throw new IllegalArgumentException("Unknown ObservationCategory code '"+codeString+"'"); + } + + public String toCode(ObservationCategory code) { + if (code == ObservationCategory.SOCIALHISTORY) + return "social-history"; + if (code == ObservationCategory.VITALSIGNS) + return "vital-signs"; + if (code == ObservationCategory.IMAGING) + return "imaging"; + if (code == ObservationCategory.LABORATORY) + return "laboratory"; + if (code == ObservationCategory.PROCEDURE) + return "procedure"; + if (code == ObservationCategory.SURVEY) + return "survey"; + if (code == ObservationCategory.EXAM) + return "exam"; + if (code == ObservationCategory.THERAPY) + return "therapy"; + return "?"; + } + + public String toSystem(ObservationCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcome.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcome.java index 2531129a4af..f0473091f29 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcome.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum OperationOutcome { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcomeEnumFactory.java similarity index 82% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcomeEnumFactory.java index 31ab12b28a7..47dd6f55084 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OperationOutcomeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class OperationOutcomeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterial.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterial.java index e7433e03e36..3269b2eec38 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterial.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum OralProsthodonticMaterial { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterialEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterialEnumFactory.java new file mode 100644 index 00000000000..dd0b9191a8b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OralProsthodonticMaterialEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class OralProsthodonticMaterialEnumFactory implements EnumFactory { + + public OralProsthodonticMaterial fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("1".equals(codeString)) + return OralProsthodonticMaterial._1; + if ("2".equals(codeString)) + return OralProsthodonticMaterial._2; + if ("3".equals(codeString)) + return OralProsthodonticMaterial._3; + if ("4".equals(codeString)) + return OralProsthodonticMaterial._4; + throw new IllegalArgumentException("Unknown OralProsthodonticMaterial code '"+codeString+"'"); + } + + public String toCode(OralProsthodonticMaterial code) { + if (code == OralProsthodonticMaterial._1) + return "1"; + if (code == OralProsthodonticMaterial._2) + return "2"; + if (code == OralProsthodonticMaterial._3) + return "3"; + if (code == OralProsthodonticMaterial._4) + return "4"; + return "?"; + } + + public String toSystem(OralProsthodonticMaterial code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationType.java index e16fd2e2a1e..3748dba230a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum OrganizationType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationTypeEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationTypeEnumFactory.java index 7a21281041f..1fed745ceb7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/OrganizationTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class OrganizationTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationship.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationship.java index 5b772d72aab..6d0c248eb85 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationship.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PatientContactRelationship { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationshipEnumFactory.java similarity index 56% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationshipEnumFactory.java index 0af889ed690..437677b719a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientContactRelationshipEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class PatientContactRelationshipEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatch.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatch.java index 13b5b648054..aaea6b8c8d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatch.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PatientMpiMatch { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatchEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatchEnumFactory.java new file mode 100644 index 00000000000..8343f1520b3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PatientMpiMatchEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PatientMpiMatchEnumFactory implements EnumFactory { + + public PatientMpiMatch fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("certain".equals(codeString)) + return PatientMpiMatch.CERTAIN; + if ("probable".equals(codeString)) + return PatientMpiMatch.PROBABLE; + if ("possible".equals(codeString)) + return PatientMpiMatch.POSSIBLE; + if ("certainly-not".equals(codeString)) + return PatientMpiMatch.CERTAINLYNOT; + throw new IllegalArgumentException("Unknown PatientMpiMatch code '"+codeString+"'"); + } + + public String toCode(PatientMpiMatch code) { + if (code == PatientMpiMatch.CERTAIN) + return "certain"; + if (code == PatientMpiMatch.PROBABLE) + return "probable"; + if (code == PatientMpiMatch.POSSIBLE) + return "possible"; + if (code == PatientMpiMatch.CERTAINLYNOT) + return "certainly-not"; + return "?"; + } + + public String toSystem(PatientMpiMatch code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Payeetype.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Payeetype.java index bea1aa433aa..5888e3e5c1b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Payeetype.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Payeetype { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PayeetypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PayeetypeEnumFactory.java new file mode 100644 index 00000000000..43e8f2e41b5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PayeetypeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PayeetypeEnumFactory implements EnumFactory { + + public Payeetype fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("subscriber".equals(codeString)) + return Payeetype.SUBSCRIBER; + if ("provider".equals(codeString)) + return Payeetype.PROVIDER; + if ("other".equals(codeString)) + return Payeetype.OTHER; + throw new IllegalArgumentException("Unknown Payeetype code '"+codeString+"'"); + } + + public String toCode(Payeetype code) { + if (code == Payeetype.SUBSCRIBER) + return "subscriber"; + if (code == Payeetype.PROVIDER) + return "provider"; + if (code == Payeetype.OTHER) + return "other"; + return "?"; + } + + public String toSystem(Payeetype code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReason.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReason.java index 32c705a6465..24f6a799381 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PaymentAdjustmentReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReasonEnumFactory.java new file mode 100644 index 00000000000..de285f2c35e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentAdjustmentReasonEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PaymentAdjustmentReasonEnumFactory implements EnumFactory { + + public PaymentAdjustmentReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a001".equals(codeString)) + return PaymentAdjustmentReason.A001; + if ("a002".equals(codeString)) + return PaymentAdjustmentReason.A002; + throw new IllegalArgumentException("Unknown PaymentAdjustmentReason code '"+codeString+"'"); + } + + public String toCode(PaymentAdjustmentReason code) { + if (code == PaymentAdjustmentReason.A001) + return "a001"; + if (code == PaymentAdjustmentReason.A002) + return "a002"; + return "?"; + } + + public String toSystem(PaymentAdjustmentReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatus.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatus.java index ac5d8f261b8..e7e81a99475 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PaymentStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatusEnumFactory.java new file mode 100644 index 00000000000..79e4f6adccc --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentStatusEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PaymentStatusEnumFactory implements EnumFactory { + + public PaymentStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("paid".equals(codeString)) + return PaymentStatus.PAID; + if ("cleared".equals(codeString)) + return PaymentStatus.CLEARED; + throw new IllegalArgumentException("Unknown PaymentStatus code '"+codeString+"'"); + } + + public String toCode(PaymentStatus code) { + if (code == PaymentStatus.PAID) + return "paid"; + if (code == PaymentStatus.CLEARED) + return "cleared"; + return "?"; + } + + public String toSystem(PaymentStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentType.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentType.java index 3e72858daa5..11033a9ea67 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PaymentType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentTypeEnumFactory.java new file mode 100644 index 00000000000..f966e3531bb --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PaymentTypeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PaymentTypeEnumFactory implements EnumFactory { + + public PaymentType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("payment".equals(codeString)) + return PaymentType.PAYMENT; + if ("adjustment".equals(codeString)) + return PaymentType.ADJUSTMENT; + if ("advance".equals(codeString)) + return PaymentType.ADVANCE; + throw new IllegalArgumentException("Unknown PaymentType code '"+codeString+"'"); + } + + public String toCode(PaymentType code) { + if (code == PaymentType.PAYMENT) + return "payment"; + if (code == PaymentType.ADJUSTMENT) + return "adjustment"; + if (code == PaymentType.ADVANCE) + return "advance"; + return "?"; + } + + public String toSystem(PaymentType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRole.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRole.java index ff7ba81d9f2..0237f87817d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRole.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PractitionerRole { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRoleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRoleEnumFactory.java new file mode 100644 index 00000000000..59f27788e9b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerRoleEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PractitionerRoleEnumFactory implements EnumFactory { + + public PractitionerRole fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("doctor".equals(codeString)) + return PractitionerRole.DOCTOR; + if ("nurse".equals(codeString)) + return PractitionerRole.NURSE; + if ("pharmacist".equals(codeString)) + return PractitionerRole.PHARMACIST; + if ("researcher".equals(codeString)) + return PractitionerRole.RESEARCHER; + if ("teacher".equals(codeString)) + return PractitionerRole.TEACHER; + if ("ict".equals(codeString)) + return PractitionerRole.ICT; + throw new IllegalArgumentException("Unknown PractitionerRole code '"+codeString+"'"); + } + + public String toCode(PractitionerRole code) { + if (code == PractitionerRole.DOCTOR) + return "doctor"; + if (code == PractitionerRole.NURSE) + return "nurse"; + if (code == PractitionerRole.PHARMACIST) + return "pharmacist"; + if (code == PractitionerRole.RESEARCHER) + return "researcher"; + if (code == PractitionerRole.TEACHER) + return "teacher"; + if (code == PractitionerRole.ICT) + return "ict"; + return "?"; + } + + public String toSystem(PractitionerRole code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialty.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialty.java index ce5cce8197b..12749d3a59c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialty.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum PractitionerSpecialty { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialtyEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialtyEnumFactory.java new file mode 100644 index 00000000000..73c366804aa --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/PractitionerSpecialtyEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class PractitionerSpecialtyEnumFactory implements EnumFactory { + + public PractitionerSpecialty fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("cardio".equals(codeString)) + return PractitionerSpecialty.CARDIO; + if ("dent".equals(codeString)) + return PractitionerSpecialty.DENT; + if ("dietary".equals(codeString)) + return PractitionerSpecialty.DIETARY; + if ("midw".equals(codeString)) + return PractitionerSpecialty.MIDW; + if ("sysarch".equals(codeString)) + return PractitionerSpecialty.SYSARCH; + throw new IllegalArgumentException("Unknown PractitionerSpecialty code '"+codeString+"'"); + } + + public String toCode(PractitionerSpecialty code) { + if (code == PractitionerSpecialty.CARDIO) + return "cardio"; + if (code == PractitionerSpecialty.DENT) + return "dent"; + if (code == PractitionerSpecialty.DIETARY) + return "dietary"; + if (code == PractitionerSpecialty.MIDW) + return "midw"; + if (code == PractitionerSpecialty.SYSARCH) + return "sysarch"; + return "?"; + } + + public String toSystem(PractitionerSpecialty code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodes.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodes.java index 9a883c2ef33..637be3700f0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodes.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProcedureProgressStatusCodes { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java new file mode 100644 index 00000000000..72dd3abcd4d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureProgressStatusCodesEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ProcedureProgressStatusCodesEnumFactory implements EnumFactory { + + public ProcedureProgressStatusCodes fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a".equals(codeString)) + return ProcedureProgressStatusCodes.A; + if ("b".equals(codeString)) + return ProcedureProgressStatusCodes.B; + if ("c".equals(codeString)) + return ProcedureProgressStatusCodes.C; + if ("d".equals(codeString)) + return ProcedureProgressStatusCodes.D; + if ("e".equals(codeString)) + return ProcedureProgressStatusCodes.E; + if ("f".equals(codeString)) + return ProcedureProgressStatusCodes.F; + throw new IllegalArgumentException("Unknown ProcedureProgressStatusCodes code '"+codeString+"'"); + } + + public String toCode(ProcedureProgressStatusCodes code) { + if (code == ProcedureProgressStatusCodes.A) + return "a"; + if (code == ProcedureProgressStatusCodes.B) + return "b"; + if (code == ProcedureProgressStatusCodes.C) + return "c"; + if (code == ProcedureProgressStatusCodes.D) + return "d"; + if (code == ProcedureProgressStatusCodes.E) + return "e"; + if (code == ProcedureProgressStatusCodes.F) + return "f"; + return "?"; + } + + public String toSystem(ProcedureProgressStatusCodes code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipType.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipType.java index 4538cf6c4b0..7e1b7b9c456 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProcedureRelationshipType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipTypeEnumFactory.java new file mode 100644 index 00000000000..55f33fb3c49 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcedureRelationshipTypeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ProcedureRelationshipTypeEnumFactory implements EnumFactory { + + public ProcedureRelationshipType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("caused-by".equals(codeString)) + return ProcedureRelationshipType.CAUSEDBY; + if ("because-of".equals(codeString)) + return ProcedureRelationshipType.BECAUSEOF; + throw new IllegalArgumentException("Unknown ProcedureRelationshipType code '"+codeString+"'"); + } + + public String toCode(ProcedureRelationshipType code) { + if (code == ProcedureRelationshipType.CAUSEDBY) + return "caused-by"; + if (code == ProcedureRelationshipType.BECAUSEOF) + return "because-of"; + return "?"; + } + + public String toSystem(ProcedureRelationshipType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcome.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcome.java index 91f31cb6412..6b31865655c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcome.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProcessOutcome { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcomeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcomeEnumFactory.java new file mode 100644 index 00000000000..aa63f282e10 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessOutcomeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ProcessOutcomeEnumFactory implements EnumFactory { + + public ProcessOutcome fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("complete".equals(codeString)) + return ProcessOutcome.COMPLETE; + if ("pended".equals(codeString)) + return ProcessOutcome.PENDED; + if ("error".equals(codeString)) + return ProcessOutcome.ERROR; + throw new IllegalArgumentException("Unknown ProcessOutcome code '"+codeString+"'"); + } + + public String toCode(ProcessOutcome code) { + if (code == ProcessOutcome.COMPLETE) + return "complete"; + if (code == ProcessOutcome.PENDED) + return "pended"; + if (code == ProcessOutcome.ERROR) + return "error"; + return "?"; + } + + public String toSystem(ProcessOutcome code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriority.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriority.java index d0a06f49ca8..366a890a585 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProcessPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriorityEnumFactory.java new file mode 100644 index 00000000000..9a389bcaba2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProcessPriorityEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ProcessPriorityEnumFactory implements EnumFactory { + + public ProcessPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("stat".equals(codeString)) + return ProcessPriority.STAT; + if ("normal".equals(codeString)) + return ProcessPriority.NORMAL; + if ("deferred".equals(codeString)) + return ProcessPriority.DEFERRED; + throw new IllegalArgumentException("Unknown ProcessPriority code '"+codeString+"'"); + } + + public String toCode(ProcessPriority code) { + if (code == ProcessPriority.STAT) + return "stat"; + if (code == ProcessPriority.NORMAL) + return "normal"; + if (code == ProcessPriority.DEFERRED) + return "deferred"; + return "?"; + } + + public String toSystem(ProcessPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRole.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRole.java index aa783002b41..6a6aa34b5c8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRole.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProvenanceAgentRole { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRoleEnumFactory.java similarity index 53% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRoleEnumFactory.java index 92603b7611d..a2469f3c83d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentRoleEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ProvenanceAgentRoleEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentType.java index 55e18ba8dac..34e0844bbd5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ProvenanceAgentType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentTypeEnumFactory.java new file mode 100644 index 00000000000..c7aa8992c92 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ProvenanceAgentTypeEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ProvenanceAgentTypeEnumFactory implements EnumFactory { + + public ProvenanceAgentType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("person".equals(codeString)) + return ProvenanceAgentType.PERSON; + if ("practitioner".equals(codeString)) + return ProvenanceAgentType.PRACTITIONER; + if ("organization".equals(codeString)) + return ProvenanceAgentType.ORGANIZATION; + if ("software".equals(codeString)) + return ProvenanceAgentType.SOFTWARE; + if ("patient".equals(codeString)) + return ProvenanceAgentType.PATIENT; + if ("device".equals(codeString)) + return ProvenanceAgentType.DEVICE; + if ("related-person".equals(codeString)) + return ProvenanceAgentType.RELATEDPERSON; + throw new IllegalArgumentException("Unknown ProvenanceAgentType code '"+codeString+"'"); + } + + public String toCode(ProvenanceAgentType code) { + if (code == ProvenanceAgentType.PERSON) + return "person"; + if (code == ProvenanceAgentType.PRACTITIONER) + return "practitioner"; + if (code == ProvenanceAgentType.ORGANIZATION) + return "organization"; + if (code == ProvenanceAgentType.SOFTWARE) + return "software"; + if (code == ProvenanceAgentType.PATIENT) + return "patient"; + if (code == ProvenanceAgentType.DEVICE) + return "device"; + if (code == ProvenanceAgentType.RELATEDPERSON) + return "related-person"; + return "?"; + } + + public String toSystem(ProvenanceAgentType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccurs.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccurs.java index deadf7b73dc..3ddf77398b0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccurs.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum QuestionMaxOccurs { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccursEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccursEnumFactory.java new file mode 100644 index 00000000000..1127daf5040 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionMaxOccursEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class QuestionMaxOccursEnumFactory implements EnumFactory { + + public QuestionMaxOccurs fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("*".equals(codeString)) + return QuestionMaxOccurs.ASTERISK; + throw new IllegalArgumentException("Unknown QuestionMaxOccurs code '"+codeString+"'"); + } + + public String toCode(QuestionMaxOccurs code) { + if (code == QuestionMaxOccurs.ASTERISK) + return "*"; + return "?"; + } + + public String toSystem(QuestionMaxOccurs code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategory.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategory.java index 605844a22c1..6b15c3fbf8a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum QuestionnaireDisplayCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java new file mode 100644 index 00000000000..b89c83eb8c3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireDisplayCategoryEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class QuestionnaireDisplayCategoryEnumFactory implements EnumFactory { + + public QuestionnaireDisplayCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("instructions".equals(codeString)) + return QuestionnaireDisplayCategory.INSTRUCTIONS; + if ("security".equals(codeString)) + return QuestionnaireDisplayCategory.SECURITY; + throw new IllegalArgumentException("Unknown QuestionnaireDisplayCategory code '"+codeString+"'"); + } + + public String toCode(QuestionnaireDisplayCategory code) { + if (code == QuestionnaireDisplayCategory.INSTRUCTIONS) + return "instructions"; + if (code == QuestionnaireDisplayCategory.SECURITY) + return "security"; + return "?"; + } + + public String toSystem(QuestionnaireDisplayCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControl.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControl.java index d4104e20e12..07c148045f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControl.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum QuestionnaireItemControl { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControlEnumFactory.java similarity index 68% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControlEnumFactory.java index 59f8f3c18d1..2f4227433e0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/QuestionnaireItemControlEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class QuestionnaireItemControlEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodes.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodes.java index 208bdcaaf3d..d0ef5d19f5c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodes.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ReasonMedicationGivenCodes { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java new file mode 100644 index 00000000000..c4cb5ce9102 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationGivenCodesEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ReasonMedicationGivenCodesEnumFactory implements EnumFactory { + + public ReasonMedicationGivenCodes fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a".equals(codeString)) + return ReasonMedicationGivenCodes.A; + if ("b".equals(codeString)) + return ReasonMedicationGivenCodes.B; + if ("c".equals(codeString)) + return ReasonMedicationGivenCodes.C; + throw new IllegalArgumentException("Unknown ReasonMedicationGivenCodes code '"+codeString+"'"); + } + + public String toCode(ReasonMedicationGivenCodes code) { + if (code == ReasonMedicationGivenCodes.A) + return "a"; + if (code == ReasonMedicationGivenCodes.B) + return "b"; + if (code == ReasonMedicationGivenCodes.C) + return "c"; + return "?"; + } + + public String toSystem(ReasonMedicationGivenCodes code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodes.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodes.java index 00e6f474148..9586c3112e6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodes.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ReasonMedicationNotGivenCodes { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java new file mode 100644 index 00000000000..f4a005b6492 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ReasonMedicationNotGivenCodesEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ReasonMedicationNotGivenCodesEnumFactory implements EnumFactory { + + public ReasonMedicationNotGivenCodes fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("a".equals(codeString)) + return ReasonMedicationNotGivenCodes.A; + if ("b".equals(codeString)) + return ReasonMedicationNotGivenCodes.B; + if ("c".equals(codeString)) + return ReasonMedicationNotGivenCodes.C; + if ("d".equals(codeString)) + return ReasonMedicationNotGivenCodes.D; + throw new IllegalArgumentException("Unknown ReasonMedicationNotGivenCodes code '"+codeString+"'"); + } + + public String toCode(ReasonMedicationNotGivenCodes code) { + if (code == ReasonMedicationNotGivenCodes.A) + return "a"; + if (code == ReasonMedicationNotGivenCodes.B) + return "b"; + if (code == ReasonMedicationNotGivenCodes.C) + return "c"; + if (code == ReasonMedicationNotGivenCodes.D) + return "d"; + return "?"; + } + + public String toSystem(ReasonMedicationNotGivenCodes code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Relationship.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Relationship.java index 93555a0dfbc..0d0f3590a27 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Relationship.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Relationship { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RelationshipEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RelationshipEnumFactory.java new file mode 100644 index 00000000000..f0b1097cb07 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RelationshipEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class RelationshipEnumFactory implements EnumFactory { + + public Relationship fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("1".equals(codeString)) + return Relationship._1; + if ("2".equals(codeString)) + return Relationship._2; + if ("3".equals(codeString)) + return Relationship._3; + if ("4".equals(codeString)) + return Relationship._4; + if ("5".equals(codeString)) + return Relationship._5; + throw new IllegalArgumentException("Unknown Relationship code '"+codeString+"'"); + } + + public String toCode(Relationship code) { + if (code == Relationship._1) + return "1"; + if (code == Relationship._2) + return "2"; + if (code == Relationship._3) + return "3"; + if (code == Relationship._4) + return "4"; + if (code == Relationship._5) + return "5"; + return "?"; + } + + public String toSystem(Relationship code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationMode.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationMode.java index c39e4dc88d1..084bd2a2459 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ResourceValidationMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationModeEnumFactory.java new file mode 100644 index 00000000000..f1561011c9b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ResourceValidationModeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ResourceValidationModeEnumFactory implements EnumFactory { + + public ResourceValidationMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("create".equals(codeString)) + return ResourceValidationMode.CREATE; + if ("update".equals(codeString)) + return ResourceValidationMode.UPDATE; + if ("delete".equals(codeString)) + return ResourceValidationMode.DELETE; + throw new IllegalArgumentException("Unknown ResourceValidationMode code '"+codeString+"'"); + } + + public String toCode(ResourceValidationMode code) { + if (code == ResourceValidationMode.CREATE) + return "create"; + if (code == ResourceValidationMode.UPDATE) + return "update"; + if (code == ResourceValidationMode.DELETE) + return "delete"; + return "?"; + } + + public String toSystem(ResourceValidationMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityService.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityService.java index 5dc8323d099..3bf802b1641 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityService.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum RestfulSecurityService { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityServiceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityServiceEnumFactory.java new file mode 100644 index 00000000000..4b0c1d13234 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RestfulSecurityServiceEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class RestfulSecurityServiceEnumFactory implements EnumFactory { + + public RestfulSecurityService fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("OAuth".equals(codeString)) + return RestfulSecurityService.OAUTH; + if ("SMART-on-FHIR".equals(codeString)) + return RestfulSecurityService.SMARTONFHIR; + if ("NTLM".equals(codeString)) + return RestfulSecurityService.NTLM; + if ("Basic".equals(codeString)) + return RestfulSecurityService.BASIC; + if ("Kerberos".equals(codeString)) + return RestfulSecurityService.KERBEROS; + if ("Certificates".equals(codeString)) + return RestfulSecurityService.CERTIFICATES; + throw new IllegalArgumentException("Unknown RestfulSecurityService code '"+codeString+"'"); + } + + public String toCode(RestfulSecurityService code) { + if (code == RestfulSecurityService.OAUTH) + return "OAuth"; + if (code == RestfulSecurityService.SMARTONFHIR) + return "SMART-on-FHIR"; + if (code == RestfulSecurityService.NTLM) + return "NTLM"; + if (code == RestfulSecurityService.BASIC) + return "Basic"; + if (code == RestfulSecurityService.KERBEROS) + return "Kerberos"; + if (code == RestfulSecurityService.CERTIFICATES) + return "Certificates"; + return "?"; + } + + public String toSystem(RestfulSecurityService code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbability.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbability.java index 349432adb53..e2120b7f2ac 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbability.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum RiskProbability { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbabilityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbabilityEnumFactory.java new file mode 100644 index 00000000000..3451e89d3bf --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RiskProbabilityEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class RiskProbabilityEnumFactory implements EnumFactory { + + public RiskProbability fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("negligible".equals(codeString)) + return RiskProbability.NEGLIGIBLE; + if ("low".equals(codeString)) + return RiskProbability.LOW; + if ("moderate".equals(codeString)) + return RiskProbability.MODERATE; + if ("high".equals(codeString)) + return RiskProbability.HIGH; + if ("certain".equals(codeString)) + return RiskProbability.CERTAIN; + throw new IllegalArgumentException("Unknown RiskProbability code '"+codeString+"'"); + } + + public String toCode(RiskProbability code) { + if (code == RiskProbability.NEGLIGIBLE) + return "negligible"; + if (code == RiskProbability.LOW) + return "low"; + if (code == RiskProbability.MODERATE) + return "moderate"; + if (code == RiskProbability.HIGH) + return "high"; + if (code == RiskProbability.CERTAIN) + return "certain"; + return "?"; + } + + public String toSystem(RiskProbability code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Ruleset.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Ruleset.java index e85b3ceed2a..d19eb9cc757 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Ruleset.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Ruleset { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RulesetEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RulesetEnumFactory.java new file mode 100644 index 00000000000..7abe02c2267 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/RulesetEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class RulesetEnumFactory implements EnumFactory { + + public Ruleset fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("x12-4010".equals(codeString)) + return Ruleset.X124010; + if ("x12-5010".equals(codeString)) + return Ruleset.X125010; + if ("x12-7010".equals(codeString)) + return Ruleset.X127010; + if ("cdanet-v2".equals(codeString)) + return Ruleset.CDANETV2; + if ("cdanet-v4".equals(codeString)) + return Ruleset.CDANETV4; + if ("cpha-3".equals(codeString)) + return Ruleset.CPHA3; + throw new IllegalArgumentException("Unknown Ruleset code '"+codeString+"'"); + } + + public String toCode(Ruleset code) { + if (code == Ruleset.X124010) + return "x12-4010"; + if (code == Ruleset.X125010) + return "x12-5010"; + if (code == Ruleset.X127010) + return "x12-7010"; + if (code == Ruleset.CDANETV2) + return "cdanet-v2"; + if (code == Ruleset.CDANETV4) + return "cdanet-v4"; + if (code == Ruleset.CPHA3) + return "cpha-3"; + return "?"; + } + + public String toSystem(Ruleset code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacy.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacy.java index 577b0e92c2a..3f25ebfa0aa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacy.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServicePharmacy { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacyEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacyEnumFactory.java new file mode 100644 index 00000000000..5471e874c29 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePharmacyEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ServicePharmacyEnumFactory implements EnumFactory { + + public ServicePharmacy fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("smokecess".equals(codeString)) + return ServicePharmacy.SMOKECESS; + if ("flushot".equals(codeString)) + return ServicePharmacy.FLUSHOT; + throw new IllegalArgumentException("Unknown ServicePharmacy code '"+codeString+"'"); + } + + public String toCode(ServicePharmacy code) { + if (code == ServicePharmacy.SMOKECESS) + return "smokecess"; + if (code == ServicePharmacy.FLUSHOT) + return "flushot"; + return "?"; + } + + public String toSystem(ServicePharmacy code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlace.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlace.java index f6b28e16192..a80d5aa983b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlace.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServicePlace { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlaceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlaceEnumFactory.java new file mode 100644 index 00000000000..314df2811c7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServicePlaceEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ServicePlaceEnumFactory implements EnumFactory { + + public ServicePlace fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("emergency".equals(codeString)) + return ServicePlace.EMERGENCY; + if ("clinic".equals(codeString)) + return ServicePlace.CLINIC; + throw new IllegalArgumentException("Unknown ServicePlace code '"+codeString+"'"); + } + + public String toCode(ServicePlace code) { + if (code == ServicePlace.EMERGENCY) + return "emergency"; + if (code == ServicePlace.CLINIC) + return "clinic"; + return "?"; + } + + public String toSystem(ServicePlace code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProduct.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProduct.java index 4f27f7a6872..96a776d65a1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProduct.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServiceProduct { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProductEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProductEnumFactory.java new file mode 100644 index 00000000000..89a43bd0744 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProductEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ServiceProductEnumFactory implements EnumFactory { + + public ServiceProduct fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("exam".equals(codeString)) + return ServiceProduct.EXAM; + if ("flushot".equals(codeString)) + return ServiceProduct.FLUSHOT; + throw new IllegalArgumentException("Unknown ServiceProduct code '"+codeString+"'"); + } + + public String toCode(ServiceProduct code) { + if (code == ServiceProduct.EXAM) + return "exam"; + if (code == ServiceProduct.FLUSHOT) + return "flushot"; + return "?"; + } + + public String toSystem(ServiceProduct code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditions.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditions.java index 83656d87317..873427f51be 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditions.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServiceProvisionConditions { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditionsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditionsEnumFactory.java new file mode 100644 index 00000000000..daa6eefc3a5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceProvisionConditionsEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ServiceProvisionConditionsEnumFactory implements EnumFactory { + + public ServiceProvisionConditions fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("free".equals(codeString)) + return ServiceProvisionConditions.FREE; + if ("disc".equals(codeString)) + return ServiceProvisionConditions.DISC; + if ("cost".equals(codeString)) + return ServiceProvisionConditions.COST; + throw new IllegalArgumentException("Unknown ServiceProvisionConditions code '"+codeString+"'"); + } + + public String toCode(ServiceProvisionConditions code) { + if (code == ServiceProvisionConditions.FREE) + return "free"; + if (code == ServiceProvisionConditions.DISC) + return "disc"; + if (code == ServiceProvisionConditions.COST) + return "cost"; + return "?"; + } + + public String toSystem(ServiceProvisionConditions code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethod.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethod.java index b13c679463b..a3929012d77 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethod.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServiceReferralMethod { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethodEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethodEnumFactory.java new file mode 100644 index 00000000000..7566f95d467 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceReferralMethodEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class ServiceReferralMethodEnumFactory implements EnumFactory { + + public ServiceReferralMethod fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("fax".equals(codeString)) + return ServiceReferralMethod.FAX; + if ("phone".equals(codeString)) + return ServiceReferralMethod.PHONE; + if ("elec".equals(codeString)) + return ServiceReferralMethod.ELEC; + if ("semail".equals(codeString)) + return ServiceReferralMethod.SEMAIL; + if ("mail".equals(codeString)) + return ServiceReferralMethod.MAIL; + throw new IllegalArgumentException("Unknown ServiceReferralMethod code '"+codeString+"'"); + } + + public String toCode(ServiceReferralMethod code) { + if (code == ServiceReferralMethod.FAX) + return "fax"; + if (code == ServiceReferralMethod.PHONE) + return "phone"; + if (code == ServiceReferralMethod.ELEC) + return "elec"; + if (code == ServiceReferralMethod.SEMAIL) + return "semail"; + if (code == ServiceReferralMethod.MAIL) + return "mail"; + return "?"; + } + + public String toSystem(ServiceReferralMethod code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUscls.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUscls.java index 9928cbbc4e3..feef66c6432 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUscls.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum ServiceUscls { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUsclsEnumFactory.java similarity index 61% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUsclsEnumFactory.java index d96dfa9fefb..6ca4918059f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ServiceUsclsEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ServiceUsclsEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureType.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureType.java index e904622bacf..3f3d8d1ae56 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SignatureType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureTypeEnumFactory.java similarity index 69% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureTypeEnumFactory.java index 93d90c70466..b547e5f486a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SignatureTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class SignatureTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTag.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTag.java index 027289c57ea..200e331e524 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTag.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SubscriptionTag { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTagEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTagEnumFactory.java new file mode 100644 index 00000000000..78db0de6dfe --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubscriptionTagEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SubscriptionTagEnumFactory implements EnumFactory { + + public SubscriptionTag fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("queued".equals(codeString)) + return SubscriptionTag.QUEUED; + if ("delivered".equals(codeString)) + return SubscriptionTag.DELIVERED; + throw new IllegalArgumentException("Unknown SubscriptionTag code '"+codeString+"'"); + } + + public String toCode(SubscriptionTag code) { + if (code == SubscriptionTag.QUEUED) + return "queued"; + if (code == SubscriptionTag.DELIVERED) + return "delivered"; + return "?"; + } + + public String toSystem(SubscriptionTag code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategory.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategory.java index 9ac834a3b6b..a4df8667007 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategory.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SubstanceCategory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategoryEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategoryEnumFactory.java new file mode 100644 index 00000000000..e4532002086 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SubstanceCategoryEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SubstanceCategoryEnumFactory implements EnumFactory { + + public SubstanceCategory fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("allergen".equals(codeString)) + return SubstanceCategory.ALLERGEN; + if ("biological".equals(codeString)) + return SubstanceCategory.BIOLOGICAL; + if ("body".equals(codeString)) + return SubstanceCategory.BODY; + if ("chemical".equals(codeString)) + return SubstanceCategory.CHEMICAL; + if ("food".equals(codeString)) + return SubstanceCategory.FOOD; + if ("drug".equals(codeString)) + return SubstanceCategory.DRUG; + if ("material".equals(codeString)) + return SubstanceCategory.MATERIAL; + throw new IllegalArgumentException("Unknown SubstanceCategory code '"+codeString+"'"); + } + + public String toCode(SubstanceCategory code) { + if (code == SubstanceCategory.ALLERGEN) + return "allergen"; + if (code == SubstanceCategory.BIOLOGICAL) + return "biological"; + if (code == SubstanceCategory.BODY) + return "body"; + if (code == SubstanceCategory.CHEMICAL) + return "chemical"; + if (code == SubstanceCategory.FOOD) + return "food"; + if (code == SubstanceCategory.DRUG) + return "drug"; + if (code == SubstanceCategory.MATERIAL) + return "material"; + return "?"; + } + + public String toSystem(SubstanceCategory code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryType.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryType.java index 7dacc9d4d19..cd03ef450ef 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SupplydeliveryType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryTypeEnumFactory.java new file mode 100644 index 00000000000..507db436b5d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplydeliveryTypeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SupplydeliveryTypeEnumFactory implements EnumFactory { + + public SupplydeliveryType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("medication".equals(codeString)) + return SupplydeliveryType.MEDICATION; + if ("device".equals(codeString)) + return SupplydeliveryType.DEVICE; + throw new IllegalArgumentException("Unknown SupplydeliveryType code '"+codeString+"'"); + } + + public String toCode(SupplydeliveryType code) { + if (code == SupplydeliveryType.MEDICATION) + return "medication"; + if (code == SupplydeliveryType.DEVICE) + return "device"; + return "?"; + } + + public String toSystem(SupplydeliveryType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKind.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKind.java index 7219d857f79..01cd52dec5b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKind.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SupplyrequestKind { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKindEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKindEnumFactory.java new file mode 100644 index 00000000000..284c3a10dd7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestKindEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SupplyrequestKindEnumFactory implements EnumFactory { + + public SupplyrequestKind fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("central".equals(codeString)) + return SupplyrequestKind.CENTRAL; + if ("nonstock".equals(codeString)) + return SupplyrequestKind.NONSTOCK; + throw new IllegalArgumentException("Unknown SupplyrequestKind code '"+codeString+"'"); + } + + public String toCode(SupplyrequestKind code) { + if (code == SupplyrequestKind.CENTRAL) + return "central"; + if (code == SupplyrequestKind.NONSTOCK) + return "nonstock"; + return "?"; + } + + public String toSystem(SupplyrequestKind code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReason.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReason.java index 3f1329ba688..d4e305d0230 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum SupplyrequestReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReasonEnumFactory.java new file mode 100644 index 00000000000..d7caf4afb5d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SupplyrequestReasonEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SupplyrequestReasonEnumFactory implements EnumFactory { + + public SupplyrequestReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("patient-care".equals(codeString)) + return SupplyrequestReason.PATIENTCARE; + if ("ward-stock".equals(codeString)) + return SupplyrequestReason.WARDSTOCK; + throw new IllegalArgumentException("Unknown SupplyrequestReason code '"+codeString+"'"); + } + + public String toCode(SupplyrequestReason code) { + if (code == SupplyrequestReason.PATIENTCARE) + return "patient-care"; + if (code == SupplyrequestReason.WARDSTOCK) + return "ward-stock"; + return "?"; + } + + public String toSystem(SupplyrequestReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Surface.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Surface.java index 43b40f78847..a38c15c5a62 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Surface.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Surface { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SurfaceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SurfaceEnumFactory.java new file mode 100644 index 00000000000..9cb9e9b0530 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/SurfaceEnumFactory.java @@ -0,0 +1,66 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class SurfaceEnumFactory implements EnumFactory { + + public Surface fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("M".equals(codeString)) + return Surface.M; + if ("O".equals(codeString)) + return Surface.O; + if ("I".equals(codeString)) + return Surface.I; + if ("D".equals(codeString)) + return Surface.D; + if ("B".equals(codeString)) + return Surface.B; + if ("V".equals(codeString)) + return Surface.V; + if ("L".equals(codeString)) + return Surface.L; + if ("MO".equals(codeString)) + return Surface.MO; + if ("DO".equals(codeString)) + return Surface.DO; + if ("DI".equals(codeString)) + return Surface.DI; + if ("MOD".equals(codeString)) + return Surface.MOD; + throw new IllegalArgumentException("Unknown Surface code '"+codeString+"'"); + } + + public String toCode(Surface code) { + if (code == Surface.M) + return "M"; + if (code == Surface.O) + return "O"; + if (code == Surface.I) + return "I"; + if (code == Surface.D) + return "D"; + if (code == Surface.B) + return "B"; + if (code == Surface.V) + return "V"; + if (code == Surface.L) + return "L"; + if (code == Surface.MO) + return "MO"; + if (code == Surface.DO) + return "DO"; + if (code == Surface.DI) + return "DI"; + if (code == Surface.MOD) + return "MOD"; + return "?"; + } + + public String toSystem(Surface code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Teeth.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Teeth.java index 1798e5eab1d..7345ad66f61 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Teeth.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Teeth { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TeethEnumFactory.java similarity index 66% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TeethEnumFactory.java index 72827b123a2..216c8452b03 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TeethEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class TeethEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodes.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodes.java index 65582d30225..918ff7e127b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodes.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum TestscriptOperationCodes { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodesEnumFactory.java similarity index 70% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodesEnumFactory.java index 5e007284640..3d29e3bd510 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/TestscriptOperationCodesEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class TestscriptOperationCodesEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Tooth.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Tooth.java index ab2d8c5a777..4a498257e9f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Tooth.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Tooth { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ToothEnumFactory.java similarity index 70% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ToothEnumFactory.java index 3057c66ae2f..6ad25c32fb7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/ToothEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class ToothEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Udi.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Udi.java index 79beb4b43cd..7df57720df1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/Udi.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum Udi { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/UdiEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/UdiEnumFactory.java new file mode 100644 index 00000000000..9d433a7a34e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/UdiEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class UdiEnumFactory implements EnumFactory { + + public Udi fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("gudid".equals(codeString)) + return Udi.GUDID; + throw new IllegalArgumentException("Unknown Udi code '"+codeString+"'"); + } + + public String toCode(Udi code) { + if (code == Udi.GUDID) + return "gudid"; + return "?"; + } + + public String toSystem(Udi code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementCondition.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementCondition.java index fe677348fd9..23a1c51c047 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementCondition.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AcknowledgementCondition { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementConditionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementConditionEnumFactory.java new file mode 100644 index 00000000000..8d0410d5bb4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementConditionEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3AcknowledgementConditionEnumFactory implements EnumFactory { + + public V3AcknowledgementCondition fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AL".equals(codeString)) + return V3AcknowledgementCondition.AL; + if ("ER".equals(codeString)) + return V3AcknowledgementCondition.ER; + if ("NE".equals(codeString)) + return V3AcknowledgementCondition.NE; + if ("SU".equals(codeString)) + return V3AcknowledgementCondition.SU; + throw new IllegalArgumentException("Unknown V3AcknowledgementCondition code '"+codeString+"'"); + } + + public String toCode(V3AcknowledgementCondition code) { + if (code == V3AcknowledgementCondition.AL) + return "AL"; + if (code == V3AcknowledgementCondition.ER) + return "ER"; + if (code == V3AcknowledgementCondition.NE) + return "NE"; + if (code == V3AcknowledgementCondition.SU) + return "SU"; + return "?"; + } + + public String toSystem(V3AcknowledgementCondition code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCode.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCode.java index 529f3e3eb6e..3d03d59c833 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AcknowledgementDetailCode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java similarity index 73% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java index d93e0d5c0eb..12637171875 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3AcknowledgementDetailCodeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailType.java index bcaeed4bdd6..27bd451ba43 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AcknowledgementDetailType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java new file mode 100644 index 00000000000..359d2b84fc2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementDetailTypeEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3AcknowledgementDetailTypeEnumFactory implements EnumFactory { + + public V3AcknowledgementDetailType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("E".equals(codeString)) + return V3AcknowledgementDetailType.E; + if ("I".equals(codeString)) + return V3AcknowledgementDetailType.I; + if ("W".equals(codeString)) + return V3AcknowledgementDetailType.W; + if ("ERR".equals(codeString)) + return V3AcknowledgementDetailType.ERR; + if ("INFO".equals(codeString)) + return V3AcknowledgementDetailType.INFO; + if ("WARN".equals(codeString)) + return V3AcknowledgementDetailType.WARN; + throw new IllegalArgumentException("Unknown V3AcknowledgementDetailType code '"+codeString+"'"); + } + + public String toCode(V3AcknowledgementDetailType code) { + if (code == V3AcknowledgementDetailType.E) + return "E"; + if (code == V3AcknowledgementDetailType.I) + return "I"; + if (code == V3AcknowledgementDetailType.W) + return "W"; + if (code == V3AcknowledgementDetailType.ERR) + return "ERR"; + if (code == V3AcknowledgementDetailType.INFO) + return "INFO"; + if (code == V3AcknowledgementDetailType.WARN) + return "WARN"; + return "?"; + } + + public String toSystem(V3AcknowledgementDetailType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementType.java index 14d72d92ccb..f2c81faecb5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AcknowledgementType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementTypeEnumFactory.java new file mode 100644 index 00000000000..336cfb16cf9 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AcknowledgementTypeEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3AcknowledgementTypeEnumFactory implements EnumFactory { + + public V3AcknowledgementType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AA".equals(codeString)) + return V3AcknowledgementType.AA; + if ("AE".equals(codeString)) + return V3AcknowledgementType.AE; + if ("AR".equals(codeString)) + return V3AcknowledgementType.AR; + if ("CA".equals(codeString)) + return V3AcknowledgementType.CA; + if ("CE".equals(codeString)) + return V3AcknowledgementType.CE; + if ("CR".equals(codeString)) + return V3AcknowledgementType.CR; + throw new IllegalArgumentException("Unknown V3AcknowledgementType code '"+codeString+"'"); + } + + public String toCode(V3AcknowledgementType code) { + if (code == V3AcknowledgementType.AA) + return "AA"; + if (code == V3AcknowledgementType.AE) + return "AE"; + if (code == V3AcknowledgementType.AR) + return "AR"; + if (code == V3AcknowledgementType.CA) + return "CA"; + if (code == V3AcknowledgementType.CE) + return "CE"; + if (code == V3AcknowledgementType.CR) + return "CR"; + return "?"; + } + + public String toSystem(V3AcknowledgementType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClass.java similarity index 99% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClass.java index 1c05c3b063d..669beeb145a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClass.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActClass { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClassEnumFactory.java similarity index 87% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClassEnumFactory.java index 3b93622cc83..75494a65a31 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActClassEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActClassEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCode.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCode.java index c2373e44250..b82b7eb7c60 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActCode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCodeEnumFactory.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCodeEnumFactory.java index a00bb3e32af..2154d6433bc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActCodeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActCodeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCode.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCode.java index 595b7b7bdda..3dd7f2da9f3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActExposureLevelCode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCodeEnumFactory.java new file mode 100644 index 00000000000..f0333455b55 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActExposureLevelCodeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActExposureLevelCodeEnumFactory implements EnumFactory { + + public V3ActExposureLevelCode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_ActExposureLevelCode".equals(codeString)) + return V3ActExposureLevelCode._ACTEXPOSURELEVELCODE; + if ("HIGH".equals(codeString)) + return V3ActExposureLevelCode.HIGH; + if ("LOW".equals(codeString)) + return V3ActExposureLevelCode.LOW; + if ("MEDIUM".equals(codeString)) + return V3ActExposureLevelCode.MEDIUM; + throw new IllegalArgumentException("Unknown V3ActExposureLevelCode code '"+codeString+"'"); + } + + public String toCode(V3ActExposureLevelCode code) { + if (code == V3ActExposureLevelCode._ACTEXPOSURELEVELCODE) + return "_ActExposureLevelCode"; + if (code == V3ActExposureLevelCode.HIGH) + return "HIGH"; + if (code == V3ActExposureLevelCode.LOW) + return "LOW"; + if (code == V3ActExposureLevelCode.MEDIUM) + return "MEDIUM"; + return "?"; + } + + public String toSystem(V3ActExposureLevelCode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifier.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifier.java index ad5e146068e..2863aaf3dd5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifier.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActInvoiceElementModifier { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java new file mode 100644 index 00000000000..4e6479866f4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActInvoiceElementModifierEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActInvoiceElementModifierEnumFactory implements EnumFactory { + + public V3ActInvoiceElementModifier fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("EFORM".equals(codeString)) + return V3ActInvoiceElementModifier.EFORM; + if ("FAX".equals(codeString)) + return V3ActInvoiceElementModifier.FAX; + if ("LINV".equals(codeString)) + return V3ActInvoiceElementModifier.LINV; + if ("PAPER".equals(codeString)) + return V3ActInvoiceElementModifier.PAPER; + throw new IllegalArgumentException("Unknown V3ActInvoiceElementModifier code '"+codeString+"'"); + } + + public String toCode(V3ActInvoiceElementModifier code) { + if (code == V3ActInvoiceElementModifier.EFORM) + return "EFORM"; + if (code == V3ActInvoiceElementModifier.FAX) + return "FAX"; + if (code == V3ActInvoiceElementModifier.LINV) + return "LINV"; + if (code == V3ActInvoiceElementModifier.PAPER) + return "PAPER"; + return "?"; + } + + public String toSystem(V3ActInvoiceElementModifier code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMood.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMood.java index 8dbdb940564..371ff7b4d96 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMood.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActMood { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMoodEnumFactory.java similarity index 68% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMoodEnumFactory.java index 5af1a756e50..4513e514159 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActMoodEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActMoodEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriority.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriority.java index 19c814bad6d..eba0b05ec75 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActPriority { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriorityEnumFactory.java similarity index 55% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriorityEnumFactory.java index f008224c8bf..9f648bec920 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActPriorityEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActPriorityEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReason.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReason.java index 9f9965ce781..13638c46e49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActReason { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReasonEnumFactory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReasonEnumFactory.java index 00be430fbca..d93959dc231 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActReasonEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActReasonEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpoint.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpoint.java index e59bab91dbf..91a2c3b9e11 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpoint.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActRelationshipCheckpoint { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java new file mode 100644 index 00000000000..a09c5633423 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipCheckpointEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActRelationshipCheckpointEnumFactory implements EnumFactory { + + public V3ActRelationshipCheckpoint fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("B".equals(codeString)) + return V3ActRelationshipCheckpoint.B; + if ("E".equals(codeString)) + return V3ActRelationshipCheckpoint.E; + if ("S".equals(codeString)) + return V3ActRelationshipCheckpoint.S; + if ("T".equals(codeString)) + return V3ActRelationshipCheckpoint.T; + if ("X".equals(codeString)) + return V3ActRelationshipCheckpoint.X; + throw new IllegalArgumentException("Unknown V3ActRelationshipCheckpoint code '"+codeString+"'"); + } + + public String toCode(V3ActRelationshipCheckpoint code) { + if (code == V3ActRelationshipCheckpoint.B) + return "B"; + if (code == V3ActRelationshipCheckpoint.E) + return "E"; + if (code == V3ActRelationshipCheckpoint.S) + return "S"; + if (code == V3ActRelationshipCheckpoint.T) + return "T"; + if (code == V3ActRelationshipCheckpoint.X) + return "X"; + return "?"; + } + + public String toSystem(V3ActRelationshipCheckpoint code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoin.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoin.java index 2992aeee8ea..c9b08c15d10 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoin.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActRelationshipJoin { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoinEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoinEnumFactory.java new file mode 100644 index 00000000000..189128afa0d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipJoinEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActRelationshipJoinEnumFactory implements EnumFactory { + + public V3ActRelationshipJoin fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("D".equals(codeString)) + return V3ActRelationshipJoin.D; + if ("K".equals(codeString)) + return V3ActRelationshipJoin.K; + if ("W".equals(codeString)) + return V3ActRelationshipJoin.W; + if ("X".equals(codeString)) + return V3ActRelationshipJoin.X; + throw new IllegalArgumentException("Unknown V3ActRelationshipJoin code '"+codeString+"'"); + } + + public String toCode(V3ActRelationshipJoin code) { + if (code == V3ActRelationshipJoin.D) + return "D"; + if (code == V3ActRelationshipJoin.K) + return "K"; + if (code == V3ActRelationshipJoin.W) + return "W"; + if (code == V3ActRelationshipJoin.X) + return "X"; + return "?"; + } + + public String toSystem(V3ActRelationshipJoin code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplit.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplit.java index c9e755f65fa..587ce2d0631 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplit.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActRelationshipSplit { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplitEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplitEnumFactory.java new file mode 100644 index 00000000000..5329fc310af --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSplitEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActRelationshipSplitEnumFactory implements EnumFactory { + + public V3ActRelationshipSplit fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("E1".equals(codeString)) + return V3ActRelationshipSplit.E1; + if ("EW".equals(codeString)) + return V3ActRelationshipSplit.EW; + if ("I1".equals(codeString)) + return V3ActRelationshipSplit.I1; + if ("IW".equals(codeString)) + return V3ActRelationshipSplit.IW; + throw new IllegalArgumentException("Unknown V3ActRelationshipSplit code '"+codeString+"'"); + } + + public String toCode(V3ActRelationshipSplit code) { + if (code == V3ActRelationshipSplit.E1) + return "E1"; + if (code == V3ActRelationshipSplit.EW) + return "EW"; + if (code == V3ActRelationshipSplit.I1) + return "I1"; + if (code == V3ActRelationshipSplit.IW) + return "IW"; + return "?"; + } + + public String toSystem(V3ActRelationshipSplit code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubset.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubset.java index a113df4a615..2b108cdc5d3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubset.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActRelationshipSubset { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubsetEnumFactory.java similarity index 61% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubsetEnumFactory.java index aed7839eae4..684b0c04bce 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipSubsetEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActRelationshipSubsetEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipType.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipType.java index 763a326d457..bef0b2d8281 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActRelationshipType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipTypeEnumFactory.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipTypeEnumFactory.java index 5e32a45a861..4737d62c416 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActRelationshipTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActRelationshipTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSite.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSite.java index c895de0987d..afa1d84a1d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSite.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActSite { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSiteEnumFactory.java similarity index 77% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSiteEnumFactory.java index e92b8688f2b..954574adf19 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActSiteEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActSiteEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatus.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatus.java index c5c2105935f..873455e105c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActStatus { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatusEnumFactory.java similarity index 50% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatusEnumFactory.java index 8263bf11f7b..a92a19bea55 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActStatusEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ActStatusEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLaw.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLaw.java index dd39530e202..7945a86ab9b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLaw.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActUSPrivacyLaw { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLawEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLawEnumFactory.java new file mode 100644 index 00000000000..95b88014f20 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUSPrivacyLawEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActUSPrivacyLawEnumFactory implements EnumFactory { + + public V3ActUSPrivacyLaw fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_ActUSPrivacyLaw".equals(codeString)) + return V3ActUSPrivacyLaw._ACTUSPRIVACYLAW; + if ("42CFRPart2".equals(codeString)) + return V3ActUSPrivacyLaw._42CFRPART2; + if ("CommonRule".equals(codeString)) + return V3ActUSPrivacyLaw.COMMONRULE; + if ("HIPAANOPP".equals(codeString)) + return V3ActUSPrivacyLaw.HIPAANOPP; + if ("HIPAAPsyNotes".equals(codeString)) + return V3ActUSPrivacyLaw.HIPAAPSYNOTES; + if ("HIPAASelfPay".equals(codeString)) + return V3ActUSPrivacyLaw.HIPAASELFPAY; + if ("Title38Section7332".equals(codeString)) + return V3ActUSPrivacyLaw.TITLE38SECTION7332; + throw new IllegalArgumentException("Unknown V3ActUSPrivacyLaw code '"+codeString+"'"); + } + + public String toCode(V3ActUSPrivacyLaw code) { + if (code == V3ActUSPrivacyLaw._ACTUSPRIVACYLAW) + return "_ActUSPrivacyLaw"; + if (code == V3ActUSPrivacyLaw._42CFRPART2) + return "42CFRPart2"; + if (code == V3ActUSPrivacyLaw.COMMONRULE) + return "CommonRule"; + if (code == V3ActUSPrivacyLaw.HIPAANOPP) + return "HIPAANOPP"; + if (code == V3ActUSPrivacyLaw.HIPAAPSYNOTES) + return "HIPAAPsyNotes"; + if (code == V3ActUSPrivacyLaw.HIPAASELFPAY) + return "HIPAASelfPay"; + if (code == V3ActUSPrivacyLaw.TITLE38SECTION7332) + return "Title38Section7332"; + return "?"; + } + + public String toSystem(V3ActUSPrivacyLaw code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertainty.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertainty.java index c9fea06e637..9aab9557da6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertainty.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ActUncertainty { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertaintyEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertaintyEnumFactory.java new file mode 100644 index 00000000000..f99f9a574f8 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ActUncertaintyEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ActUncertaintyEnumFactory implements EnumFactory { + + public V3ActUncertainty fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("N".equals(codeString)) + return V3ActUncertainty.N; + if ("U".equals(codeString)) + return V3ActUncertainty.U; + throw new IllegalArgumentException("Unknown V3ActUncertainty code '"+codeString+"'"); + } + + public String toCode(V3ActUncertainty code) { + if (code == V3ActUncertainty.N) + return "N"; + if (code == V3ActUncertainty.U) + return "U"; + return "?"; + } + + public String toSystem(V3ActUncertainty code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartType.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartType.java index 9a3f8b3a5f9..bbe22ad198d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AddressPartType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartTypeEnumFactory.java similarity index 70% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartTypeEnumFactory.java index be9a9e300e2..d4c56e3f874 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressPartTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3AddressPartTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUse.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUse.java index 2803f9c0c78..48df30ee795 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUse.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AddressUse { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUseEnumFactory.java similarity index 61% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUseEnumFactory.java index e7394044751..62435358f26 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AddressUseEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3AddressUseEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGender.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGender.java index 30484b4171a..8cb64bd7bc8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGender.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AdministrativeGender { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGenderEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGenderEnumFactory.java new file mode 100644 index 00000000000..f61d39ddcb4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AdministrativeGenderEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3AdministrativeGenderEnumFactory implements EnumFactory { + + public V3AdministrativeGender fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("F".equals(codeString)) + return V3AdministrativeGender.F; + if ("M".equals(codeString)) + return V3AdministrativeGender.M; + if ("UN".equals(codeString)) + return V3AdministrativeGender.UN; + throw new IllegalArgumentException("Unknown V3AdministrativeGender code '"+codeString+"'"); + } + + public String toCode(V3AdministrativeGender code) { + if (code == V3AdministrativeGender.F) + return "F"; + if (code == V3AdministrativeGender.M) + return "M"; + if (code == V3AdministrativeGender.UN) + return "UN"; + return "?"; + } + + public String toSystem(V3AdministrativeGender code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java index 92ce7681522..7b1664f312f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3AmericanIndianAlaskaNativeLanguages { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java index 293084d9bc7..3f7b21082b8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3AmericanIndianAlaskaNativeLanguagesEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Calendar.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Calendar.java index 1c86f85116c..4b9e1da036d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Calendar.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Calendar { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycle.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycle.java index 8ab4b46d889..ccefb47bec7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycle.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3CalendarCycle { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycleEnumFactory.java similarity index 60% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycleEnumFactory.java index c9451c9f7ef..bc879c0727d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarCycleEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3CalendarCycleEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarEnumFactory.java new file mode 100644 index 00000000000..0a2ef3a60d5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3CalendarEnumFactory implements EnumFactory { + + public V3Calendar fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("GREG".equals(codeString)) + return V3Calendar.GREG; + throw new IllegalArgumentException("Unknown V3Calendar code '"+codeString+"'"); + } + + public String toCode(V3Calendar code) { + if (code == V3Calendar.GREG) + return "GREG"; + return "?"; + } + + public String toSystem(V3Calendar code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarType.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarType.java index 8a211f4f286..3826c6b4fe1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3CalendarType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarTypeEnumFactory.java new file mode 100644 index 00000000000..bac6b2248f4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CalendarTypeEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3CalendarTypeEnumFactory implements EnumFactory { + + public V3CalendarType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("GREG".equals(codeString)) + return V3CalendarType.GREG; + throw new IllegalArgumentException("Unknown V3CalendarType code '"+codeString+"'"); + } + + public String toCode(V3CalendarType code) { + if (code == V3CalendarType.GREG) + return "GREG"; + return "?"; + } + + public String toSystem(V3CalendarType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Charset.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Charset.java index b6b063a6c7c..59e1b177cae 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Charset.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Charset { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CharsetEnumFactory.java similarity index 50% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CharsetEnumFactory.java index 4ff469a7922..6e208484a24 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CharsetEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3CharsetEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationale.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationale.java index 7bdfcc34727..0ea021a7822 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationale.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3CodingRationale { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationaleEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationaleEnumFactory.java new file mode 100644 index 00000000000..e939930aa6d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CodingRationaleEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3CodingRationaleEnumFactory implements EnumFactory { + + public V3CodingRationale fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("O".equals(codeString)) + return V3CodingRationale.O; + if ("OR".equals(codeString)) + return V3CodingRationale.OR; + if ("P".equals(codeString)) + return V3CodingRationale.P; + if ("PR".equals(codeString)) + return V3CodingRationale.PR; + if ("R".equals(codeString)) + return V3CodingRationale.R; + if ("HL7".equals(codeString)) + return V3CodingRationale.HL7; + if ("SH".equals(codeString)) + return V3CodingRationale.SH; + if ("SRC".equals(codeString)) + return V3CodingRationale.SRC; + throw new IllegalArgumentException("Unknown V3CodingRationale code '"+codeString+"'"); + } + + public String toCode(V3CodingRationale code) { + if (code == V3CodingRationale.O) + return "O"; + if (code == V3CodingRationale.OR) + return "OR"; + if (code == V3CodingRationale.P) + return "P"; + if (code == V3CodingRationale.PR) + return "PR"; + if (code == V3CodingRationale.R) + return "R"; + if (code == V3CodingRationale.HL7) + return "HL7"; + if (code == V3CodingRationale.SH) + return "SH"; + if (code == V3CodingRationale.SRC) + return "SRC"; + return "?"; + } + + public String toSystem(V3CodingRationale code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionType.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionType.java index 6b126bf477b..b5da57b7e09 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3CommunicationFunctionType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java new file mode 100644 index 00000000000..44249ffe060 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CommunicationFunctionTypeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3CommunicationFunctionTypeEnumFactory implements EnumFactory { + + public V3CommunicationFunctionType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("RCV".equals(codeString)) + return V3CommunicationFunctionType.RCV; + if ("RSP".equals(codeString)) + return V3CommunicationFunctionType.RSP; + if ("SND".equals(codeString)) + return V3CommunicationFunctionType.SND; + throw new IllegalArgumentException("Unknown V3CommunicationFunctionType code '"+codeString+"'"); + } + + public String toCode(V3CommunicationFunctionType code) { + if (code == V3CommunicationFunctionType.RCV) + return "RCV"; + if (code == V3CommunicationFunctionType.RSP) + return "RSP"; + if (code == V3CommunicationFunctionType.SND) + return "SND"; + return "?"; + } + + public String toSystem(V3CommunicationFunctionType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithm.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithm.java index 56da31948d9..ac7ae10d802 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithm.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3CompressionAlgorithm { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithmEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithmEnumFactory.java new file mode 100644 index 00000000000..8746e52daee --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3CompressionAlgorithmEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3CompressionAlgorithmEnumFactory implements EnumFactory { + + public V3CompressionAlgorithm fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("BZ".equals(codeString)) + return V3CompressionAlgorithm.BZ; + if ("DF".equals(codeString)) + return V3CompressionAlgorithm.DF; + if ("GZ".equals(codeString)) + return V3CompressionAlgorithm.GZ; + if ("Z".equals(codeString)) + return V3CompressionAlgorithm.Z; + if ("Z7".equals(codeString)) + return V3CompressionAlgorithm.Z7; + if ("ZL".equals(codeString)) + return V3CompressionAlgorithm.ZL; + throw new IllegalArgumentException("Unknown V3CompressionAlgorithm code '"+codeString+"'"); + } + + public String toCode(V3CompressionAlgorithm code) { + if (code == V3CompressionAlgorithm.BZ) + return "BZ"; + if (code == V3CompressionAlgorithm.DF) + return "DF"; + if (code == V3CompressionAlgorithm.GZ) + return "GZ"; + if (code == V3CompressionAlgorithm.Z) + return "Z"; + if (code == V3CompressionAlgorithm.Z7) + return "Z7"; + if (code == V3CompressionAlgorithm.ZL) + return "ZL"; + return "?"; + } + + public String toSystem(V3CompressionAlgorithm code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Confidentiality.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Confidentiality.java index dbf83a71fea..93330a5eae6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Confidentiality.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Confidentiality { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ConfidentialityEnumFactory.java similarity index 64% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ConfidentialityEnumFactory.java index bd51746b01f..d1584937b70 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ConfidentialityEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ConfidentialityEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCap.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCap.java index 9833a2a0ecf..7a1742a5f0a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCap.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ContainerCap { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCapEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCapEnumFactory.java new file mode 100644 index 00000000000..722a083dd30 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerCapEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ContainerCapEnumFactory implements EnumFactory { + + public V3ContainerCap fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_MedicationCap".equals(codeString)) + return V3ContainerCap._MEDICATIONCAP; + if ("CHILD".equals(codeString)) + return V3ContainerCap.CHILD; + if ("EASY".equals(codeString)) + return V3ContainerCap.EASY; + if ("FILM".equals(codeString)) + return V3ContainerCap.FILM; + if ("FOIL".equals(codeString)) + return V3ContainerCap.FOIL; + if ("PUSH".equals(codeString)) + return V3ContainerCap.PUSH; + if ("SCR".equals(codeString)) + return V3ContainerCap.SCR; + throw new IllegalArgumentException("Unknown V3ContainerCap code '"+codeString+"'"); + } + + public String toCode(V3ContainerCap code) { + if (code == V3ContainerCap._MEDICATIONCAP) + return "_MedicationCap"; + if (code == V3ContainerCap.CHILD) + return "CHILD"; + if (code == V3ContainerCap.EASY) + return "EASY"; + if (code == V3ContainerCap.FILM) + return "FILM"; + if (code == V3ContainerCap.FOIL) + return "FOIL"; + if (code == V3ContainerCap.PUSH) + return "PUSH"; + if (code == V3ContainerCap.SCR) + return "SCR"; + return "?"; + } + + public String toSystem(V3ContainerCap code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparator.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparator.java index aae9db7ddf0..90aecb431ca 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparator.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ContainerSeparator { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparatorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparatorEnumFactory.java new file mode 100644 index 00000000000..0a06b511c02 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContainerSeparatorEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ContainerSeparatorEnumFactory implements EnumFactory { + + public V3ContainerSeparator fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("GEL".equals(codeString)) + return V3ContainerSeparator.GEL; + if ("NONE".equals(codeString)) + return V3ContainerSeparator.NONE; + throw new IllegalArgumentException("Unknown V3ContainerSeparator code '"+codeString+"'"); + } + + public String toCode(V3ContainerSeparator code) { + if (code == V3ContainerSeparator.GEL) + return "GEL"; + if (code == V3ContainerSeparator.NONE) + return "NONE"; + return "?"; + } + + public String toSystem(V3ContainerSeparator code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingMode.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingMode.java index 5cdd7f9a76e..a7a46840505 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ContentProcessingMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingModeEnumFactory.java new file mode 100644 index 00000000000..13173ec8b25 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContentProcessingModeEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ContentProcessingModeEnumFactory implements EnumFactory { + + public V3ContentProcessingMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("SEQL".equals(codeString)) + return V3ContentProcessingMode.SEQL; + if ("UNOR".equals(codeString)) + return V3ContentProcessingMode.UNOR; + throw new IllegalArgumentException("Unknown V3ContentProcessingMode code '"+codeString+"'"); + } + + public String toCode(V3ContentProcessingMode code) { + if (code == V3ContentProcessingMode.SEQL) + return "SEQL"; + if (code == V3ContentProcessingMode.UNOR) + return "UNOR"; + return "?"; + } + + public String toSystem(V3ContentProcessingMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControl.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControl.java index 441cb2046a0..e4582fab79b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControl.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ContextControl { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControlEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControlEnumFactory.java index 1201c509c18..0e1d81dc642 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ContextControlEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ContextControlEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperation.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperation.java index a073a898a2e..c1986bbd619 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3DataOperation { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperationEnumFactory.java similarity index 64% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperationEnumFactory.java index 033d1359d47..03eb8fdcbae 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DataOperationEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3DataOperationEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevel.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevel.java index af43ad8ccd3..655a10cc61e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevel.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3DeviceAlertLevel { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevelEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevelEnumFactory.java new file mode 100644 index 00000000000..ffb4861d3ff --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DeviceAlertLevelEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3DeviceAlertLevelEnumFactory implements EnumFactory { + + public V3DeviceAlertLevel fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("C".equals(codeString)) + return V3DeviceAlertLevel.C; + if ("N".equals(codeString)) + return V3DeviceAlertLevel.N; + if ("S".equals(codeString)) + return V3DeviceAlertLevel.S; + if ("W".equals(codeString)) + return V3DeviceAlertLevel.W; + throw new IllegalArgumentException("Unknown V3DeviceAlertLevel code '"+codeString+"'"); + } + + public String toCode(V3DeviceAlertLevel code) { + if (code == V3DeviceAlertLevel.C) + return "C"; + if (code == V3DeviceAlertLevel.N) + return "N"; + if (code == V3DeviceAlertLevel.S) + return "S"; + if (code == V3DeviceAlertLevel.W) + return "W"; + return "?"; + } + + public String toSystem(V3DeviceAlertLevel code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletion.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletion.java index 1cbaf9aff21..31538b4a13b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletion.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3DocumentCompletion { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletionEnumFactory.java new file mode 100644 index 00000000000..06c4f6487f1 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentCompletionEnumFactory.java @@ -0,0 +1,58 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3DocumentCompletionEnumFactory implements EnumFactory { + + public V3DocumentCompletion fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AU".equals(codeString)) + return V3DocumentCompletion.AU; + if ("DI".equals(codeString)) + return V3DocumentCompletion.DI; + if ("DO".equals(codeString)) + return V3DocumentCompletion.DO; + if ("IN".equals(codeString)) + return V3DocumentCompletion.IN; + if ("IP".equals(codeString)) + return V3DocumentCompletion.IP; + if ("LA".equals(codeString)) + return V3DocumentCompletion.LA; + if ("NU".equals(codeString)) + return V3DocumentCompletion.NU; + if ("PA".equals(codeString)) + return V3DocumentCompletion.PA; + if ("UC".equals(codeString)) + return V3DocumentCompletion.UC; + throw new IllegalArgumentException("Unknown V3DocumentCompletion code '"+codeString+"'"); + } + + public String toCode(V3DocumentCompletion code) { + if (code == V3DocumentCompletion.AU) + return "AU"; + if (code == V3DocumentCompletion.DI) + return "DI"; + if (code == V3DocumentCompletion.DO) + return "DO"; + if (code == V3DocumentCompletion.IN) + return "IN"; + if (code == V3DocumentCompletion.IP) + return "IP"; + if (code == V3DocumentCompletion.LA) + return "LA"; + if (code == V3DocumentCompletion.NU) + return "NU"; + if (code == V3DocumentCompletion.PA) + return "PA"; + if (code == V3DocumentCompletion.UC) + return "UC"; + return "?"; + } + + public String toSystem(V3DocumentCompletion code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorage.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorage.java index 955adfb7622..e0b832b1c4e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorage.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3DocumentStorage { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorageEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorageEnumFactory.java new file mode 100644 index 00000000000..e4ccf3306c4 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3DocumentStorageEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3DocumentStorageEnumFactory implements EnumFactory { + + public V3DocumentStorage fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AC".equals(codeString)) + return V3DocumentStorage.AC; + if ("AA".equals(codeString)) + return V3DocumentStorage.AA; + if ("AR".equals(codeString)) + return V3DocumentStorage.AR; + if ("PU".equals(codeString)) + return V3DocumentStorage.PU; + throw new IllegalArgumentException("Unknown V3DocumentStorage code '"+codeString+"'"); + } + + public String toCode(V3DocumentStorage code) { + if (code == V3DocumentStorage.AC) + return "AC"; + if (code == V3DocumentStorage.AA) + return "AA"; + if (code == V3DocumentStorage.AR) + return "AR"; + if (code == V3DocumentStorage.PU) + return "PU"; + return "?"; + } + + public String toSystem(V3DocumentStorage code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevel.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevel.java index d84c6d29ab5..2170d7436d3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevel.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EducationLevel { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevelEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevelEnumFactory.java new file mode 100644 index 00000000000..2109efeefd8 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EducationLevelEnumFactory.java @@ -0,0 +1,58 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EducationLevelEnumFactory implements EnumFactory { + + public V3EducationLevel fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("ASSOC".equals(codeString)) + return V3EducationLevel.ASSOC; + if ("BD".equals(codeString)) + return V3EducationLevel.BD; + if ("ELEM".equals(codeString)) + return V3EducationLevel.ELEM; + if ("GD".equals(codeString)) + return V3EducationLevel.GD; + if ("HS".equals(codeString)) + return V3EducationLevel.HS; + if ("PB".equals(codeString)) + return V3EducationLevel.PB; + if ("POSTG".equals(codeString)) + return V3EducationLevel.POSTG; + if ("SCOL".equals(codeString)) + return V3EducationLevel.SCOL; + if ("SEC".equals(codeString)) + return V3EducationLevel.SEC; + throw new IllegalArgumentException("Unknown V3EducationLevel code '"+codeString+"'"); + } + + public String toCode(V3EducationLevel code) { + if (code == V3EducationLevel.ASSOC) + return "ASSOC"; + if (code == V3EducationLevel.BD) + return "BD"; + if (code == V3EducationLevel.ELEM) + return "ELEM"; + if (code == V3EducationLevel.GD) + return "GD"; + if (code == V3EducationLevel.HS) + return "HS"; + if (code == V3EducationLevel.PB) + return "PB"; + if (code == V3EducationLevel.POSTG) + return "POSTG"; + if (code == V3EducationLevel.SCOL) + return "SCOL"; + if (code == V3EducationLevel.SEC) + return "SEC"; + return "?"; + } + + public String toSystem(V3EducationLevel code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClass.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClass.java index 21c35672d31..d01ee353adf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClass.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EmployeeJobClass { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClassEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClassEnumFactory.java new file mode 100644 index 00000000000..a219ff2ce04 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EmployeeJobClassEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EmployeeJobClassEnumFactory implements EnumFactory { + + public V3EmployeeJobClass fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("FT".equals(codeString)) + return V3EmployeeJobClass.FT; + if ("PT".equals(codeString)) + return V3EmployeeJobClass.PT; + throw new IllegalArgumentException("Unknown V3EmployeeJobClass code '"+codeString+"'"); + } + + public String toCode(V3EmployeeJobClass code) { + if (code == V3EmployeeJobClass.FT) + return "FT"; + if (code == V3EmployeeJobClass.PT) + return "PT"; + return "?"; + } + + public String toSystem(V3EmployeeJobClass code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSource.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSource.java index a4a741d4a3d..3a7b7287524 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSource.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EncounterAdmissionSource { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java new file mode 100644 index 00000000000..f705b9b821e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterAdmissionSourceEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EncounterAdmissionSourceEnumFactory implements EnumFactory { + + public V3EncounterAdmissionSource fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("E".equals(codeString)) + return V3EncounterAdmissionSource.E; + if ("LD".equals(codeString)) + return V3EncounterAdmissionSource.LD; + if ("NB".equals(codeString)) + return V3EncounterAdmissionSource.NB; + throw new IllegalArgumentException("Unknown V3EncounterAdmissionSource code '"+codeString+"'"); + } + + public String toCode(V3EncounterAdmissionSource code) { + if (code == V3EncounterAdmissionSource.E) + return "E"; + if (code == V3EncounterAdmissionSource.LD) + return "LD"; + if (code == V3EncounterAdmissionSource.NB) + return "NB"; + return "?"; + } + + public String toSystem(V3EncounterAdmissionSource code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesy.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesy.java index bcf8b8e392b..b814420c172 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesy.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EncounterSpecialCourtesy { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java new file mode 100644 index 00000000000..e44bd21afc6 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EncounterSpecialCourtesyEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EncounterSpecialCourtesyEnumFactory implements EnumFactory { + + public V3EncounterSpecialCourtesy fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("EXT".equals(codeString)) + return V3EncounterSpecialCourtesy.EXT; + if ("NRM".equals(codeString)) + return V3EncounterSpecialCourtesy.NRM; + if ("PRF".equals(codeString)) + return V3EncounterSpecialCourtesy.PRF; + if ("STF".equals(codeString)) + return V3EncounterSpecialCourtesy.STF; + if ("VIP".equals(codeString)) + return V3EncounterSpecialCourtesy.VIP; + throw new IllegalArgumentException("Unknown V3EncounterSpecialCourtesy code '"+codeString+"'"); + } + + public String toCode(V3EncounterSpecialCourtesy code) { + if (code == V3EncounterSpecialCourtesy.EXT) + return "EXT"; + if (code == V3EncounterSpecialCourtesy.NRM) + return "NRM"; + if (code == V3EncounterSpecialCourtesy.PRF) + return "PRF"; + if (code == V3EncounterSpecialCourtesy.STF) + return "STF"; + if (code == V3EncounterSpecialCourtesy.VIP) + return "VIP"; + return "?"; + } + + public String toSystem(V3EncounterSpecialCourtesy code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClass.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClass.java index c06e04393bb..1576da0a5ed 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClass.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityClass { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClassEnumFactory.java similarity index 67% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClassEnumFactory.java index cf095bd9859..6eee2dcdcef 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityClassEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityClassEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCode.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCode.java index 8b22eee8ad2..67cde356928 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityCode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCodeEnumFactory.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCodeEnumFactory.java index 9c94361dd66..4288e821ad9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityCodeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityCodeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminer.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminer.java index 6697bd0922c..80f772fe470 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminer.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityDeterminer { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminerEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminerEnumFactory.java new file mode 100644 index 00000000000..f7d9bb4bb05 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityDeterminerEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EntityDeterminerEnumFactory implements EnumFactory { + + public V3EntityDeterminer fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("INSTANCE".equals(codeString)) + return V3EntityDeterminer.INSTANCE; + if ("GROUP".equals(codeString)) + return V3EntityDeterminer.GROUP; + if ("KIND".equals(codeString)) + return V3EntityDeterminer.KIND; + if ("GROUPKIND".equals(codeString)) + return V3EntityDeterminer.GROUPKIND; + if ("QUANTIFIED_KIND".equals(codeString)) + return V3EntityDeterminer.QUANTIFIEDKIND; + throw new IllegalArgumentException("Unknown V3EntityDeterminer code '"+codeString+"'"); + } + + public String toCode(V3EntityDeterminer code) { + if (code == V3EntityDeterminer.INSTANCE) + return "INSTANCE"; + if (code == V3EntityDeterminer.GROUP) + return "GROUP"; + if (code == V3EntityDeterminer.KIND) + return "KIND"; + if (code == V3EntityDeterminer.GROUPKIND) + return "GROUPKIND"; + if (code == V3EntityDeterminer.QUANTIFIEDKIND) + return "QUANTIFIED_KIND"; + return "?"; + } + + public String toSystem(V3EntityDeterminer code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandling.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandling.java index 36a3a3da203..36173fc4386 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandling.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityHandling { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandlingEnumFactory.java similarity index 60% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandlingEnumFactory.java index 208d66fdee2..6c549dff982 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityHandlingEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityHandlingEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifier.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifier.java index 233586a8ff4..75ac7fbf72d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifier.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNamePartQualifier { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierEnumFactory.java similarity index 74% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierEnumFactory.java index 65e18a9dc4b..3ef2a616ba1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityNamePartQualifierEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2.java index 6da5f48c0a5..e459ebe9d32 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNamePartQualifierR2 { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java similarity index 71% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java index 30881b1bfde..ab1c104beae 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityNamePartQualifierR2EnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartType.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartType.java index 067ba64c332..ffc5ddf0f67 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNamePartType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeEnumFactory.java new file mode 100644 index 00000000000..56848d8dd00 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EntityNamePartTypeEnumFactory implements EnumFactory { + + public V3EntityNamePartType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("DEL".equals(codeString)) + return V3EntityNamePartType.DEL; + if ("FAM".equals(codeString)) + return V3EntityNamePartType.FAM; + if ("GIV".equals(codeString)) + return V3EntityNamePartType.GIV; + if ("PFX".equals(codeString)) + return V3EntityNamePartType.PFX; + if ("SFX".equals(codeString)) + return V3EntityNamePartType.SFX; + throw new IllegalArgumentException("Unknown V3EntityNamePartType code '"+codeString+"'"); + } + + public String toCode(V3EntityNamePartType code) { + if (code == V3EntityNamePartType.DEL) + return "DEL"; + if (code == V3EntityNamePartType.FAM) + return "FAM"; + if (code == V3EntityNamePartType.GIV) + return "GIV"; + if (code == V3EntityNamePartType.PFX) + return "PFX"; + if (code == V3EntityNamePartType.SFX) + return "SFX"; + return "?"; + } + + public String toSystem(V3EntityNamePartType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2.java index eeaed997184..65bce27bff7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNamePartTypeR2 { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java new file mode 100644 index 00000000000..cbf1511b23f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNamePartTypeR2EnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EntityNamePartTypeR2EnumFactory implements EnumFactory { + + public V3EntityNamePartTypeR2 fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("DEL".equals(codeString)) + return V3EntityNamePartTypeR2.DEL; + if ("FAM".equals(codeString)) + return V3EntityNamePartTypeR2.FAM; + if ("GIV".equals(codeString)) + return V3EntityNamePartTypeR2.GIV; + if ("TITLE".equals(codeString)) + return V3EntityNamePartTypeR2.TITLE; + throw new IllegalArgumentException("Unknown V3EntityNamePartTypeR2 code '"+codeString+"'"); + } + + public String toCode(V3EntityNamePartTypeR2 code) { + if (code == V3EntityNamePartTypeR2.DEL) + return "DEL"; + if (code == V3EntityNamePartTypeR2.FAM) + return "FAM"; + if (code == V3EntityNamePartTypeR2.GIV) + return "GIV"; + if (code == V3EntityNamePartTypeR2.TITLE) + return "TITLE"; + return "?"; + } + + public String toSystem(V3EntityNamePartTypeR2 code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUse.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUse.java index bd019960217..6d1d066bdf3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUse.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNameUse { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseEnumFactory.java similarity index 57% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseEnumFactory.java index 2314a5e586d..945943ec602 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityNameUseEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2.java index 66ced712077..b92533a7dda 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityNameUseR2 { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2EnumFactory.java similarity index 61% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2EnumFactory.java index 9d785c41587..a9c10157c01 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityNameUseR2EnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EntityNameUseR2EnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRisk.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRisk.java index 594ebba5fc2..c886c54b889 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRisk.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityRisk { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRiskEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRiskEnumFactory.java new file mode 100644 index 00000000000..9db45777f7a --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityRiskEnumFactory.java @@ -0,0 +1,66 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EntityRiskEnumFactory implements EnumFactory { + + public V3EntityRisk fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AGG".equals(codeString)) + return V3EntityRisk.AGG; + if ("BIO".equals(codeString)) + return V3EntityRisk.BIO; + if ("COR".equals(codeString)) + return V3EntityRisk.COR; + if ("ESC".equals(codeString)) + return V3EntityRisk.ESC; + if ("IFL".equals(codeString)) + return V3EntityRisk.IFL; + if ("EXP".equals(codeString)) + return V3EntityRisk.EXP; + if ("INF".equals(codeString)) + return V3EntityRisk.INF; + if ("BHZ".equals(codeString)) + return V3EntityRisk.BHZ; + if ("INJ".equals(codeString)) + return V3EntityRisk.INJ; + if ("POI".equals(codeString)) + return V3EntityRisk.POI; + if ("RAD".equals(codeString)) + return V3EntityRisk.RAD; + throw new IllegalArgumentException("Unknown V3EntityRisk code '"+codeString+"'"); + } + + public String toCode(V3EntityRisk code) { + if (code == V3EntityRisk.AGG) + return "AGG"; + if (code == V3EntityRisk.BIO) + return "BIO"; + if (code == V3EntityRisk.COR) + return "COR"; + if (code == V3EntityRisk.ESC) + return "ESC"; + if (code == V3EntityRisk.IFL) + return "IFL"; + if (code == V3EntityRisk.EXP) + return "EXP"; + if (code == V3EntityRisk.INF) + return "INF"; + if (code == V3EntityRisk.BHZ) + return "BHZ"; + if (code == V3EntityRisk.INJ) + return "INJ"; + if (code == V3EntityRisk.POI) + return "POI"; + if (code == V3EntityRisk.RAD) + return "RAD"; + return "?"; + } + + public String toSystem(V3EntityRisk code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatus.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatus.java index f706a2b9727..c8efd644992 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EntityStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatusEnumFactory.java new file mode 100644 index 00000000000..df6d8c1002e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EntityStatusEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EntityStatusEnumFactory implements EnumFactory { + + public V3EntityStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("normal".equals(codeString)) + return V3EntityStatus.NORMAL; + if ("active".equals(codeString)) + return V3EntityStatus.ACTIVE; + if ("inactive".equals(codeString)) + return V3EntityStatus.INACTIVE; + if ("terminated".equals(codeString)) + return V3EntityStatus.TERMINATED; + if ("nullified".equals(codeString)) + return V3EntityStatus.NULLIFIED; + throw new IllegalArgumentException("Unknown V3EntityStatus code '"+codeString+"'"); + } + + public String toCode(V3EntityStatus code) { + if (code == V3EntityStatus.NORMAL) + return "normal"; + if (code == V3EntityStatus.ACTIVE) + return "active"; + if (code == V3EntityStatus.INACTIVE) + return "inactive"; + if (code == V3EntityStatus.TERMINATED) + return "terminated"; + if (code == V3EntityStatus.NULLIFIED) + return "nullified"; + return "?"; + } + + public String toSystem(V3EntityStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevel.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevel.java index c11e6d587e9..2045f74914d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevel.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3EquipmentAlertLevel { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevelEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevelEnumFactory.java new file mode 100644 index 00000000000..e01db2a53bc --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EquipmentAlertLevelEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3EquipmentAlertLevelEnumFactory implements EnumFactory { + + public V3EquipmentAlertLevel fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("C".equals(codeString)) + return V3EquipmentAlertLevel.C; + if ("N".equals(codeString)) + return V3EquipmentAlertLevel.N; + if ("S".equals(codeString)) + return V3EquipmentAlertLevel.S; + if ("W".equals(codeString)) + return V3EquipmentAlertLevel.W; + throw new IllegalArgumentException("Unknown V3EquipmentAlertLevel code '"+codeString+"'"); + } + + public String toCode(V3EquipmentAlertLevel code) { + if (code == V3EquipmentAlertLevel.C) + return "C"; + if (code == V3EquipmentAlertLevel.N) + return "N"; + if (code == V3EquipmentAlertLevel.S) + return "S"; + if (code == V3EquipmentAlertLevel.W) + return "W"; + return "?"; + } + + public String toSystem(V3EquipmentAlertLevel code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Ethnicity.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Ethnicity.java index bd7b6ba5968..abe9eed1b73 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Ethnicity.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Ethnicity { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EthnicityEnumFactory.java similarity index 75% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EthnicityEnumFactory.java index 1e17a5962c2..99d6380738a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3EthnicityEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3EthnicityEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureMode.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureMode.java index a3656164078..11a70d134c5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ExposureMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureModeEnumFactory.java new file mode 100644 index 00000000000..fa4f8d7105f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ExposureModeEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ExposureModeEnumFactory implements EnumFactory { + + public V3ExposureMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_ExposureMode".equals(codeString)) + return V3ExposureMode._EXPOSUREMODE; + if ("AIRBORNE".equals(codeString)) + return V3ExposureMode.AIRBORNE; + if ("CONTACT".equals(codeString)) + return V3ExposureMode.CONTACT; + if ("FOODBORNE".equals(codeString)) + return V3ExposureMode.FOODBORNE; + if ("WATERBORNE".equals(codeString)) + return V3ExposureMode.WATERBORNE; + throw new IllegalArgumentException("Unknown V3ExposureMode code '"+codeString+"'"); + } + + public String toCode(V3ExposureMode code) { + if (code == V3ExposureMode._EXPOSUREMODE) + return "_ExposureMode"; + if (code == V3ExposureMode.AIRBORNE) + return "AIRBORNE"; + if (code == V3ExposureMode.CONTACT) + return "CONTACT"; + if (code == V3ExposureMode.FOODBORNE) + return "FOODBORNE"; + if (code == V3ExposureMode.WATERBORNE) + return "WATERBORNE"; + return "?"; + } + + public String toSystem(V3ExposureMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviation.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviation.java index c6e95a6c900..c1e496f252a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3GTSAbbreviation { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviationEnumFactory.java similarity index 73% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviationEnumFactory.java index ae99060a8a6..f3bc92d03b9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GTSAbbreviationEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3GTSAbbreviationEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatus.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatus.java index 7137cf93fdb..6e6c77b134b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3GenderStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatusEnumFactory.java new file mode 100644 index 00000000000..38774d8634f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3GenderStatusEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3GenderStatusEnumFactory implements EnumFactory { + + public V3GenderStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("I".equals(codeString)) + return V3GenderStatus.I; + if ("N".equals(codeString)) + return V3GenderStatus.N; + throw new IllegalArgumentException("Unknown V3GenderStatus code '"+codeString+"'"); + } + + public String toCode(V3GenderStatus code) { + if (code == V3GenderStatus.I) + return "I"; + if (code == V3GenderStatus.N) + return "N"; + return "?"; + } + + public String toSystem(V3GenderStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateMode.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateMode.java index ee08eadbd6f..0b692dc4565 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3HL7UpdateMode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateModeEnumFactory.java similarity index 57% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateModeEnumFactory.java index 4ca24d2e7ff..1a15d2155b0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HL7UpdateModeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3HL7UpdateModeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7Realm.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7Realm.java index 6fc20655bd2..9f159d82fd0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7Realm.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Hl7Realm { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7RealmEnumFactory.java similarity index 74% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7RealmEnumFactory.java index 9265950b03b..5b282c606ff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7RealmEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3Hl7RealmEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3Conformance.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3Conformance.java index 449fdde3611..10a95ab0347 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3Conformance.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Hl7V3Conformance { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3ConformanceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3ConformanceEnumFactory.java new file mode 100644 index 00000000000..9c1a7e3c3d3 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Hl7V3ConformanceEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3Hl7V3ConformanceEnumFactory implements EnumFactory { + + public V3Hl7V3Conformance fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("I".equals(codeString)) + return V3Hl7V3Conformance.I; + if ("NP".equals(codeString)) + return V3Hl7V3Conformance.NP; + if ("R".equals(codeString)) + return V3Hl7V3Conformance.R; + if ("RC".equals(codeString)) + return V3Hl7V3Conformance.RC; + if ("RI".equals(codeString)) + return V3Hl7V3Conformance.RI; + if ("U".equals(codeString)) + return V3Hl7V3Conformance.U; + throw new IllegalArgumentException("Unknown V3Hl7V3Conformance code '"+codeString+"'"); + } + + public String toCode(V3Hl7V3Conformance code) { + if (code == V3Hl7V3Conformance.I) + return "I"; + if (code == V3Hl7V3Conformance.NP) + return "NP"; + if (code == V3Hl7V3Conformance.R) + return "R"; + if (code == V3Hl7V3Conformance.RC) + return "RC"; + if (code == V3Hl7V3Conformance.RI) + return "RI"; + if (code == V3Hl7V3Conformance.U) + return "U"; + return "?"; + } + + public String toSystem(V3Hl7V3Conformance code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkType.java index 50707047151..9034a31ad38 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3HtmlLinkType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkTypeEnumFactory.java similarity index 58% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkTypeEnumFactory.java index 5766c1d29f7..464d8308ab2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3HtmlLinkTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3HtmlLinkTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliability.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliability.java index 46d551bc58d..e94d3603409 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliability.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3IdentifierReliability { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliabilityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliabilityEnumFactory.java new file mode 100644 index 00000000000..9f6e3ecc8c7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierReliabilityEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3IdentifierReliabilityEnumFactory implements EnumFactory { + + public V3IdentifierReliability fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("ISS".equals(codeString)) + return V3IdentifierReliability.ISS; + if ("UNV".equals(codeString)) + return V3IdentifierReliability.UNV; + if ("VRF".equals(codeString)) + return V3IdentifierReliability.VRF; + throw new IllegalArgumentException("Unknown V3IdentifierReliability code '"+codeString+"'"); + } + + public String toCode(V3IdentifierReliability code) { + if (code == V3IdentifierReliability.ISS) + return "ISS"; + if (code == V3IdentifierReliability.UNV) + return "UNV"; + if (code == V3IdentifierReliability.VRF) + return "VRF"; + return "?"; + } + + public String toSystem(V3IdentifierReliability code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScope.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScope.java index 59661c2ccf1..a6fd53837f9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScope.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3IdentifierScope { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScopeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScopeEnumFactory.java new file mode 100644 index 00000000000..70090e75d8d --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IdentifierScopeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3IdentifierScopeEnumFactory implements EnumFactory { + + public V3IdentifierScope fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("BUSN".equals(codeString)) + return V3IdentifierScope.BUSN; + if ("OBJ".equals(codeString)) + return V3IdentifierScope.OBJ; + if ("VER".equals(codeString)) + return V3IdentifierScope.VER; + if ("VW".equals(codeString)) + return V3IdentifierScope.VW; + throw new IllegalArgumentException("Unknown V3IdentifierScope code '"+codeString+"'"); + } + + public String toCode(V3IdentifierScope code) { + if (code == V3IdentifierScope.BUSN) + return "BUSN"; + if (code == V3IdentifierScope.OBJ) + return "OBJ"; + if (code == V3IdentifierScope.VER) + return "VER"; + if (code == V3IdentifierScope.VW) + return "VW"; + return "?"; + } + + public String toSystem(V3IdentifierScope code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithm.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithm.java index 71a48e22d2e..780af3267e9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithm.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3IntegrityCheckAlgorithm { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java new file mode 100644 index 00000000000..006e3ccda38 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3IntegrityCheckAlgorithmEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3IntegrityCheckAlgorithmEnumFactory implements EnumFactory { + + public V3IntegrityCheckAlgorithm fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("SHA-1".equals(codeString)) + return V3IntegrityCheckAlgorithm.SHA1; + if ("SHA-256".equals(codeString)) + return V3IntegrityCheckAlgorithm.SHA256; + throw new IllegalArgumentException("Unknown V3IntegrityCheckAlgorithm code '"+codeString+"'"); + } + + public String toCode(V3IntegrityCheckAlgorithm code) { + if (code == V3IntegrityCheckAlgorithm.SHA1) + return "SHA-1"; + if (code == V3IntegrityCheckAlgorithm.SHA256) + return "SHA-256"; + return "?"; + } + + public String toSystem(V3IntegrityCheckAlgorithm code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityMode.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityMode.java index 30f4ade4ef2..b2bf3656f28 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3LanguageAbilityMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityModeEnumFactory.java new file mode 100644 index 00000000000..bda59438890 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityModeEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3LanguageAbilityModeEnumFactory implements EnumFactory { + + public V3LanguageAbilityMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("ESGN".equals(codeString)) + return V3LanguageAbilityMode.ESGN; + if ("ESP".equals(codeString)) + return V3LanguageAbilityMode.ESP; + if ("EWR".equals(codeString)) + return V3LanguageAbilityMode.EWR; + if ("RSGN".equals(codeString)) + return V3LanguageAbilityMode.RSGN; + if ("RSP".equals(codeString)) + return V3LanguageAbilityMode.RSP; + if ("RWR".equals(codeString)) + return V3LanguageAbilityMode.RWR; + throw new IllegalArgumentException("Unknown V3LanguageAbilityMode code '"+codeString+"'"); + } + + public String toCode(V3LanguageAbilityMode code) { + if (code == V3LanguageAbilityMode.ESGN) + return "ESGN"; + if (code == V3LanguageAbilityMode.ESP) + return "ESP"; + if (code == V3LanguageAbilityMode.EWR) + return "EWR"; + if (code == V3LanguageAbilityMode.RSGN) + return "RSGN"; + if (code == V3LanguageAbilityMode.RSP) + return "RSP"; + if (code == V3LanguageAbilityMode.RWR) + return "RWR"; + return "?"; + } + + public String toSystem(V3LanguageAbilityMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiency.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiency.java index 63605bd0a88..4ef583360c7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiency.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3LanguageAbilityProficiency { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java new file mode 100644 index 00000000000..abf73a6bd18 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LanguageAbilityProficiencyEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3LanguageAbilityProficiencyEnumFactory implements EnumFactory { + + public V3LanguageAbilityProficiency fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("E".equals(codeString)) + return V3LanguageAbilityProficiency.E; + if ("F".equals(codeString)) + return V3LanguageAbilityProficiency.F; + if ("G".equals(codeString)) + return V3LanguageAbilityProficiency.G; + if ("P".equals(codeString)) + return V3LanguageAbilityProficiency.P; + throw new IllegalArgumentException("Unknown V3LanguageAbilityProficiency code '"+codeString+"'"); + } + + public String toCode(V3LanguageAbilityProficiency code) { + if (code == V3LanguageAbilityProficiency.E) + return "E"; + if (code == V3LanguageAbilityProficiency.F) + return "F"; + if (code == V3LanguageAbilityProficiency.G) + return "G"; + if (code == V3LanguageAbilityProficiency.P) + return "P"; + return "?"; + } + + public String toSystem(V3LanguageAbilityProficiency code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangement.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangement.java index c66e378364c..76c095c4885 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangement.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3LivingArrangement { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangementEnumFactory.java similarity index 53% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangementEnumFactory.java index 687738c8648..12b81a80542 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LivingArrangementEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3LivingArrangementEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnore.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnore.java index ae74d54e794..14563b876ff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnore.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3LocalMarkupIgnore { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java new file mode 100644 index 00000000000..d3e03fc70cc --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalMarkupIgnoreEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3LocalMarkupIgnoreEnumFactory implements EnumFactory { + + public V3LocalMarkupIgnore fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("all".equals(codeString)) + return V3LocalMarkupIgnore.ALL; + if ("markup".equals(codeString)) + return V3LocalMarkupIgnore.MARKUP; + throw new IllegalArgumentException("Unknown V3LocalMarkupIgnore code '"+codeString+"'"); + } + + public String toCode(V3LocalMarkupIgnore code) { + if (code == V3LocalMarkupIgnore.ALL) + return "all"; + if (code == V3LocalMarkupIgnore.MARKUP) + return "markup"; + return "?"; + } + + public String toSystem(V3LocalMarkupIgnore code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlState.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlState.java index 209c1006252..709afe6de1f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlState.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3LocalRemoteControlState { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlStateEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlStateEnumFactory.java new file mode 100644 index 00000000000..def65413207 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3LocalRemoteControlStateEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3LocalRemoteControlStateEnumFactory implements EnumFactory { + + public V3LocalRemoteControlState fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("L".equals(codeString)) + return V3LocalRemoteControlState.L; + if ("R".equals(codeString)) + return V3LocalRemoteControlState.R; + throw new IllegalArgumentException("Unknown V3LocalRemoteControlState code '"+codeString+"'"); + } + + public String toCode(V3LocalRemoteControlState code) { + if (code == V3LocalRemoteControlState.L) + return "L"; + if (code == V3LocalRemoteControlState.R) + return "R"; + return "?"; + } + + public String toSystem(V3LocalRemoteControlState code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatus.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatus.java index f7728b304d2..10cee9b534f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ManagedParticipationStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatusEnumFactory.java new file mode 100644 index 00000000000..c33363feb36 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ManagedParticipationStatusEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ManagedParticipationStatusEnumFactory implements EnumFactory { + + public V3ManagedParticipationStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("normal".equals(codeString)) + return V3ManagedParticipationStatus.NORMAL; + if ("active".equals(codeString)) + return V3ManagedParticipationStatus.ACTIVE; + if ("cancelled".equals(codeString)) + return V3ManagedParticipationStatus.CANCELLED; + if ("completed".equals(codeString)) + return V3ManagedParticipationStatus.COMPLETED; + if ("pending".equals(codeString)) + return V3ManagedParticipationStatus.PENDING; + if ("nullified".equals(codeString)) + return V3ManagedParticipationStatus.NULLIFIED; + throw new IllegalArgumentException("Unknown V3ManagedParticipationStatus code '"+codeString+"'"); + } + + public String toCode(V3ManagedParticipationStatus code) { + if (code == V3ManagedParticipationStatus.NORMAL) + return "normal"; + if (code == V3ManagedParticipationStatus.ACTIVE) + return "active"; + if (code == V3ManagedParticipationStatus.CANCELLED) + return "cancelled"; + if (code == V3ManagedParticipationStatus.COMPLETED) + return "completed"; + if (code == V3ManagedParticipationStatus.PENDING) + return "pending"; + if (code == V3ManagedParticipationStatus.NULLIFIED) + return "nullified"; + return "?"; + } + + public String toSystem(V3ManagedParticipationStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationship.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationship.java index 79e67a85c41..61a0f641760 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationship.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3MapRelationship { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationshipEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationshipEnumFactory.java new file mode 100644 index 00000000000..5dedf2aa1b8 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MapRelationshipEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3MapRelationshipEnumFactory implements EnumFactory { + + public V3MapRelationship fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("BT".equals(codeString)) + return V3MapRelationship.BT; + if ("E".equals(codeString)) + return V3MapRelationship.E; + if ("NT".equals(codeString)) + return V3MapRelationship.NT; + throw new IllegalArgumentException("Unknown V3MapRelationship code '"+codeString+"'"); + } + + public String toCode(V3MapRelationship code) { + if (code == V3MapRelationship.BT) + return "BT"; + if (code == V3MapRelationship.E) + return "E"; + if (code == V3MapRelationship.NT) + return "NT"; + return "?"; + } + + public String toSystem(V3MapRelationship code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatus.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatus.java index 7261c9f26aa..c1804b908fa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3MaritalStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatusEnumFactory.java new file mode 100644 index 00000000000..49716942942 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MaritalStatusEnumFactory.java @@ -0,0 +1,62 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3MaritalStatusEnumFactory implements EnumFactory { + + public V3MaritalStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("A".equals(codeString)) + return V3MaritalStatus.A; + if ("D".equals(codeString)) + return V3MaritalStatus.D; + if ("I".equals(codeString)) + return V3MaritalStatus.I; + if ("L".equals(codeString)) + return V3MaritalStatus.L; + if ("M".equals(codeString)) + return V3MaritalStatus.M; + if ("P".equals(codeString)) + return V3MaritalStatus.P; + if ("S".equals(codeString)) + return V3MaritalStatus.S; + if ("T".equals(codeString)) + return V3MaritalStatus.T; + if ("U".equals(codeString)) + return V3MaritalStatus.U; + if ("W".equals(codeString)) + return V3MaritalStatus.W; + throw new IllegalArgumentException("Unknown V3MaritalStatus code '"+codeString+"'"); + } + + public String toCode(V3MaritalStatus code) { + if (code == V3MaritalStatus.A) + return "A"; + if (code == V3MaritalStatus.D) + return "D"; + if (code == V3MaritalStatus.I) + return "I"; + if (code == V3MaritalStatus.L) + return "L"; + if (code == V3MaritalStatus.M) + return "M"; + if (code == V3MaritalStatus.P) + return "P"; + if (code == V3MaritalStatus.S) + return "S"; + if (code == V3MaritalStatus.T) + return "T"; + if (code == V3MaritalStatus.U) + return "U"; + if (code == V3MaritalStatus.W) + return "W"; + return "?"; + } + + public String toSystem(V3MaritalStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriority.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriority.java index b78b9d2c543..c8dde71d369 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3MessageWaitingPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriorityEnumFactory.java new file mode 100644 index 00000000000..cf3d1b341ee --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3MessageWaitingPriorityEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3MessageWaitingPriorityEnumFactory implements EnumFactory { + + public V3MessageWaitingPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("H".equals(codeString)) + return V3MessageWaitingPriority.H; + if ("L".equals(codeString)) + return V3MessageWaitingPriority.L; + if ("M".equals(codeString)) + return V3MessageWaitingPriority.M; + throw new IllegalArgumentException("Unknown V3MessageWaitingPriority code '"+codeString+"'"); + } + + public String toCode(V3MessageWaitingPriority code) { + if (code == V3MessageWaitingPriority.H) + return "H"; + if (code == V3MessageWaitingPriority.L) + return "L"; + if (code == V3MessageWaitingPriority.M) + return "M"; + return "?"; + } + + public String toSystem(V3MessageWaitingPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicator.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicator.java index 46eaad8993f..1f321df8fc5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicator.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ModifyIndicator { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicatorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicatorEnumFactory.java new file mode 100644 index 00000000000..1e405d52c17 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ModifyIndicatorEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ModifyIndicatorEnumFactory implements EnumFactory { + + public V3ModifyIndicator fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("M".equals(codeString)) + return V3ModifyIndicator.M; + if ("N".equals(codeString)) + return V3ModifyIndicator.N; + throw new IllegalArgumentException("Unknown V3ModifyIndicator code '"+codeString+"'"); + } + + public String toCode(V3ModifyIndicator code) { + if (code == V3ModifyIndicator.M) + return "M"; + if (code == V3ModifyIndicator.N) + return "N"; + return "?"; + } + + public String toSystem(V3ModifyIndicator code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavor.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavor.java index cb4403b5524..788f3ba6654 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavor.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3NullFlavor { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavorEnumFactory.java similarity index 57% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavorEnumFactory.java index 34a60120840..a2f0fa4adfc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3NullFlavorEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3NullFlavorEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretation.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretation.java index eaaadb2f656..2bb71d8be09 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ObservationInterpretation { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretationEnumFactory.java similarity index 82% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretationEnumFactory.java index 5b3ddb9d0f2..308b488d204 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationInterpretationEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ObservationInterpretationEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethod.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethod.java index 416ab66df29..e13d66de17d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethod.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ObservationMethod { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethodEnumFactory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethodEnumFactory.java index 337c5cd3660..4cf83ec4e0f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationMethodEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ObservationMethodEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValue.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValue.java index 8c9fb4477f7..08400cf8479 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValue.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ObservationValue { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValueEnumFactory.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValueEnumFactory.java index 7c1da96c170..f54a3f9ffaf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ObservationValueEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ObservationValueEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugForm.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugForm.java index 173a5b837eb..71c2c80092d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugForm.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3OrderableDrugForm { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugFormEnumFactory.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugFormEnumFactory.java index 4d6a4ddf3fb..d2ae417005f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3OrderableDrugFormEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3OrderableDrugFormEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunction.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunction.java index a21465aeaad..ea92cd6cf36 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunction.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ParticipationFunction { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunctionEnumFactory.java similarity index 81% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunctionEnumFactory.java index d2a84fe4e08..9baf566ea91 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationFunctionEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ParticipationFunctionEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationMode.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationMode.java index 1767e056712..5f9ba5e50b0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ParticipationMode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationModeEnumFactory.java similarity index 60% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationModeEnumFactory.java index 8c8dd89b549..38ff20d2e75 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationModeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ParticipationModeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignature.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignature.java index 978ef352c53..293afad9d65 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignature.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ParticipationSignature { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignatureEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignatureEnumFactory.java new file mode 100644 index 00000000000..0595dae4689 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationSignatureEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ParticipationSignatureEnumFactory implements EnumFactory { + + public V3ParticipationSignature fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("I".equals(codeString)) + return V3ParticipationSignature.I; + if ("S".equals(codeString)) + return V3ParticipationSignature.S; + if ("X".equals(codeString)) + return V3ParticipationSignature.X; + throw new IllegalArgumentException("Unknown V3ParticipationSignature code '"+codeString+"'"); + } + + public String toCode(V3ParticipationSignature code) { + if (code == V3ParticipationSignature.I) + return "I"; + if (code == V3ParticipationSignature.S) + return "S"; + if (code == V3ParticipationSignature.X) + return "X"; + return "?"; + } + + public String toSystem(V3ParticipationSignature code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationType.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationType.java index d4ee2cb3d72..6000466c53c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ParticipationType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationTypeEnumFactory.java similarity index 81% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationTypeEnumFactory.java index 5105b65ab3b..033b5343979 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ParticipationTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ParticipationTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportance.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportance.java index 75b9140270c..99a45458047 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportance.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3PatientImportance { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportanceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportanceEnumFactory.java new file mode 100644 index 00000000000..886551356b9 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PatientImportanceEnumFactory.java @@ -0,0 +1,58 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3PatientImportanceEnumFactory implements EnumFactory { + + public V3PatientImportance fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("BM".equals(codeString)) + return V3PatientImportance.BM; + if ("DFM".equals(codeString)) + return V3PatientImportance.DFM; + if ("DR".equals(codeString)) + return V3PatientImportance.DR; + if ("FD".equals(codeString)) + return V3PatientImportance.FD; + if ("FOR".equals(codeString)) + return V3PatientImportance.FOR; + if ("GOVT".equals(codeString)) + return V3PatientImportance.GOVT; + if ("SFM".equals(codeString)) + return V3PatientImportance.SFM; + if ("STF".equals(codeString)) + return V3PatientImportance.STF; + if ("VIP".equals(codeString)) + return V3PatientImportance.VIP; + throw new IllegalArgumentException("Unknown V3PatientImportance code '"+codeString+"'"); + } + + public String toCode(V3PatientImportance code) { + if (code == V3PatientImportance.BM) + return "BM"; + if (code == V3PatientImportance.DFM) + return "DFM"; + if (code == V3PatientImportance.DR) + return "DR"; + if (code == V3PatientImportance.FD) + return "FD"; + if (code == V3PatientImportance.FOR) + return "FOR"; + if (code == V3PatientImportance.GOVT) + return "GOVT"; + if (code == V3PatientImportance.SFM) + return "SFM"; + if (code == V3PatientImportance.STF) + return "STF"; + if (code == V3PatientImportance.VIP) + return "VIP"; + return "?"; + } + + public String toSystem(V3PatientImportance code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTerms.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTerms.java index f48dcf8271e..becfced2b27 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTerms.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3PaymentTerms { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTermsEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTermsEnumFactory.java new file mode 100644 index 00000000000..17abed1a981 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PaymentTermsEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3PaymentTermsEnumFactory implements EnumFactory { + + public V3PaymentTerms fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("COD".equals(codeString)) + return V3PaymentTerms.COD; + if ("N30".equals(codeString)) + return V3PaymentTerms.N30; + if ("N60".equals(codeString)) + return V3PaymentTerms.N60; + if ("N90".equals(codeString)) + return V3PaymentTerms.N90; + throw new IllegalArgumentException("Unknown V3PaymentTerms code '"+codeString+"'"); + } + + public String toCode(V3PaymentTerms code) { + if (code == V3PaymentTerms.COD) + return "COD"; + if (code == V3PaymentTerms.N30) + return "N30"; + if (code == V3PaymentTerms.N60) + return "N60"; + if (code == V3PaymentTerms.N90) + return "N90"; + return "?"; + } + + public String toSystem(V3PaymentTerms code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityType.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityType.java index b9ad5b46b92..a7298cf97bf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3PersonDisabilityType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityTypeEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityTypeEnumFactory.java index 51151f10a12..9e7644d76b4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3PersonDisabilityTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3PersonDisabilityTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionType.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionType.java index f06409a2172..3ab4f9453a4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ProbabilityDistributionType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java index 5387fe4de8a..61fbb6adb86 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ProbabilityDistributionTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingID.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingID.java index c272b97ed09..0c962e5ed44 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingID.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ProcessingID { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingIDEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingIDEnumFactory.java new file mode 100644 index 00000000000..47432a7634e --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingIDEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ProcessingIDEnumFactory implements EnumFactory { + + public V3ProcessingID fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("D".equals(codeString)) + return V3ProcessingID.D; + if ("P".equals(codeString)) + return V3ProcessingID.P; + if ("T".equals(codeString)) + return V3ProcessingID.T; + throw new IllegalArgumentException("Unknown V3ProcessingID code '"+codeString+"'"); + } + + public String toCode(V3ProcessingID code) { + if (code == V3ProcessingID.D) + return "D"; + if (code == V3ProcessingID.P) + return "P"; + if (code == V3ProcessingID.T) + return "T"; + return "?"; + } + + public String toSystem(V3ProcessingID code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingMode.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingMode.java index 53cff02de04..8c098359159 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ProcessingMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingModeEnumFactory.java new file mode 100644 index 00000000000..4ef020f9e74 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ProcessingModeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ProcessingModeEnumFactory implements EnumFactory { + + public V3ProcessingMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("A".equals(codeString)) + return V3ProcessingMode.A; + if ("I".equals(codeString)) + return V3ProcessingMode.I; + if ("R".equals(codeString)) + return V3ProcessingMode.R; + if ("T".equals(codeString)) + return V3ProcessingMode.T; + throw new IllegalArgumentException("Unknown V3ProcessingMode code '"+codeString+"'"); + } + + public String toCode(V3ProcessingMode code) { + if (code == V3ProcessingMode.A) + return "A"; + if (code == V3ProcessingMode.I) + return "I"; + if (code == V3ProcessingMode.R) + return "R"; + if (code == V3ProcessingMode.T) + return "T"; + return "?"; + } + + public String toSystem(V3ProcessingMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValue.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValue.java index 1da135855fb..fb2b676c7c5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValue.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3QueryParameterValue { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValueEnumFactory.java similarity index 62% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValueEnumFactory.java index 17879755516..09a7caf63b9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryParameterValueEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3QueryParameterValueEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriority.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriority.java index 19f5d45fdf6..4b90e306aac 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriority.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3QueryPriority { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriorityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriorityEnumFactory.java new file mode 100644 index 00000000000..7634b4adf23 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryPriorityEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3QueryPriorityEnumFactory implements EnumFactory { + + public V3QueryPriority fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("D".equals(codeString)) + return V3QueryPriority.D; + if ("I".equals(codeString)) + return V3QueryPriority.I; + throw new IllegalArgumentException("Unknown V3QueryPriority code '"+codeString+"'"); + } + + public String toCode(V3QueryPriority code) { + if (code == V3QueryPriority.D) + return "D"; + if (code == V3QueryPriority.I) + return "I"; + return "?"; + } + + public String toSystem(V3QueryPriority code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimit.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimit.java index 079f0b0d548..5ec40b359c3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimit.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3QueryRequestLimit { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimitEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimitEnumFactory.java new file mode 100644 index 00000000000..379674dedd2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryRequestLimitEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3QueryRequestLimitEnumFactory implements EnumFactory { + + public V3QueryRequestLimit fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_QueryRequestLimit".equals(codeString)) + return V3QueryRequestLimit._QUERYREQUESTLIMIT; + if ("RD".equals(codeString)) + return V3QueryRequestLimit.RD; + throw new IllegalArgumentException("Unknown V3QueryRequestLimit code '"+codeString+"'"); + } + + public String toCode(V3QueryRequestLimit code) { + if (code == V3QueryRequestLimit._QUERYREQUESTLIMIT) + return "_QueryRequestLimit"; + if (code == V3QueryRequestLimit.RD) + return "RD"; + return "?"; + } + + public String toSystem(V3QueryRequestLimit code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponse.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponse.java index baf1d3e222c..1bd0de2329e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponse.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3QueryResponse { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponseEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponseEnumFactory.java new file mode 100644 index 00000000000..140908372da --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryResponseEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3QueryResponseEnumFactory implements EnumFactory { + + public V3QueryResponse fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AE".equals(codeString)) + return V3QueryResponse.AE; + if ("NF".equals(codeString)) + return V3QueryResponse.NF; + if ("OK".equals(codeString)) + return V3QueryResponse.OK; + if ("QE".equals(codeString)) + return V3QueryResponse.QE; + throw new IllegalArgumentException("Unknown V3QueryResponse code '"+codeString+"'"); + } + + public String toCode(V3QueryResponse code) { + if (code == V3QueryResponse.AE) + return "AE"; + if (code == V3QueryResponse.NF) + return "NF"; + if (code == V3QueryResponse.OK) + return "OK"; + if (code == V3QueryResponse.QE) + return "QE"; + return "?"; + } + + public String toSystem(V3QueryResponse code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCode.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCode.java index 4b32a5af0c6..93130b6049c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3QueryStatusCode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCodeEnumFactory.java new file mode 100644 index 00000000000..00a727654e5 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3QueryStatusCodeEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3QueryStatusCodeEnumFactory implements EnumFactory { + + public V3QueryStatusCode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("aborted".equals(codeString)) + return V3QueryStatusCode.ABORTED; + if ("deliveredResponse".equals(codeString)) + return V3QueryStatusCode.DELIVEREDRESPONSE; + if ("executing".equals(codeString)) + return V3QueryStatusCode.EXECUTING; + if ("new".equals(codeString)) + return V3QueryStatusCode.NEW; + if ("waitContinuedQueryResponse".equals(codeString)) + return V3QueryStatusCode.WAITCONTINUEDQUERYRESPONSE; + throw new IllegalArgumentException("Unknown V3QueryStatusCode code '"+codeString+"'"); + } + + public String toCode(V3QueryStatusCode code) { + if (code == V3QueryStatusCode.ABORTED) + return "aborted"; + if (code == V3QueryStatusCode.DELIVEREDRESPONSE) + return "deliveredResponse"; + if (code == V3QueryStatusCode.EXECUTING) + return "executing"; + if (code == V3QueryStatusCode.NEW) + return "new"; + if (code == V3QueryStatusCode.WAITCONTINUEDQUERYRESPONSE) + return "waitContinuedQueryResponse"; + return "?"; + } + + public String toSystem(V3QueryStatusCode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Race.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Race.java index f64101e0f0f..2b14e62691d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Race.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Race { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RaceEnumFactory.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RaceEnumFactory.java index bf4be79aac7..59b95c7dfd9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RaceEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3RaceEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperator.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperator.java index c57bbf6c16e..aa74e7ac3f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperator.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RelationalOperator { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperatorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperatorEnumFactory.java new file mode 100644 index 00000000000..052f9bbe8f2 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationalOperatorEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3RelationalOperatorEnumFactory implements EnumFactory { + + public V3RelationalOperator fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("CT".equals(codeString)) + return V3RelationalOperator.CT; + if ("EQ".equals(codeString)) + return V3RelationalOperator.EQ; + if ("GE".equals(codeString)) + return V3RelationalOperator.GE; + if ("GN".equals(codeString)) + return V3RelationalOperator.GN; + if ("GT".equals(codeString)) + return V3RelationalOperator.GT; + if ("LE".equals(codeString)) + return V3RelationalOperator.LE; + if ("LT".equals(codeString)) + return V3RelationalOperator.LT; + if ("NE".equals(codeString)) + return V3RelationalOperator.NE; + throw new IllegalArgumentException("Unknown V3RelationalOperator code '"+codeString+"'"); + } + + public String toCode(V3RelationalOperator code) { + if (code == V3RelationalOperator.CT) + return "CT"; + if (code == V3RelationalOperator.EQ) + return "EQ"; + if (code == V3RelationalOperator.GE) + return "GE"; + if (code == V3RelationalOperator.GN) + return "GN"; + if (code == V3RelationalOperator.GT) + return "GT"; + if (code == V3RelationalOperator.LE) + return "LE"; + if (code == V3RelationalOperator.LT) + return "LT"; + if (code == V3RelationalOperator.NE) + return "NE"; + return "?"; + } + + public String toSystem(V3RelationalOperator code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunction.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunction.java index 17c93e9fe74..3305a7f7701 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunction.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RelationshipConjunction { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunctionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunctionEnumFactory.java new file mode 100644 index 00000000000..7f3e85a6c20 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RelationshipConjunctionEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3RelationshipConjunctionEnumFactory implements EnumFactory { + + public V3RelationshipConjunction fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("AND".equals(codeString)) + return V3RelationshipConjunction.AND; + if ("OR".equals(codeString)) + return V3RelationshipConjunction.OR; + if ("XOR".equals(codeString)) + return V3RelationshipConjunction.XOR; + throw new IllegalArgumentException("Unknown V3RelationshipConjunction code '"+codeString+"'"); + } + + public String toCode(V3RelationshipConjunction code) { + if (code == V3RelationshipConjunction.AND) + return "AND"; + if (code == V3RelationshipConjunction.OR) + return "OR"; + if (code == V3RelationshipConjunction.XOR) + return "XOR"; + return "?"; + } + + public String toSystem(V3RelationshipConjunction code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliation.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliation.java index e406a632c54..1cae61cb89c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliation.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ReligiousAffiliation { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliationEnumFactory.java similarity index 85% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliationEnumFactory.java index 55b7b92974e..b03120772d0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ReligiousAffiliationEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3ReligiousAffiliationEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevel.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevel.java index 66ec2ae02b2..110e16e99c0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevel.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ResponseLevel { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevelEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevelEnumFactory.java new file mode 100644 index 00000000000..8eec19f7f49 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseLevelEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ResponseLevelEnumFactory implements EnumFactory { + + public V3ResponseLevel fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("C".equals(codeString)) + return V3ResponseLevel.C; + if ("D".equals(codeString)) + return V3ResponseLevel.D; + if ("E".equals(codeString)) + return V3ResponseLevel.E; + if ("F".equals(codeString)) + return V3ResponseLevel.F; + if ("N".equals(codeString)) + return V3ResponseLevel.N; + if ("R".equals(codeString)) + return V3ResponseLevel.R; + if ("X".equals(codeString)) + return V3ResponseLevel.X; + throw new IllegalArgumentException("Unknown V3ResponseLevel code '"+codeString+"'"); + } + + public String toCode(V3ResponseLevel code) { + if (code == V3ResponseLevel.C) + return "C"; + if (code == V3ResponseLevel.D) + return "D"; + if (code == V3ResponseLevel.E) + return "E"; + if (code == V3ResponseLevel.F) + return "F"; + if (code == V3ResponseLevel.N) + return "N"; + if (code == V3ResponseLevel.R) + return "R"; + if (code == V3ResponseLevel.X) + return "X"; + return "?"; + } + + public String toSystem(V3ResponseLevel code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModality.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModality.java index b18dfb69fe2..3f520f137e3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModality.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ResponseModality { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModalityEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModalityEnumFactory.java new file mode 100644 index 00000000000..b05c48c1d2f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModalityEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ResponseModalityEnumFactory implements EnumFactory { + + public V3ResponseModality fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("B".equals(codeString)) + return V3ResponseModality.B; + if ("R".equals(codeString)) + return V3ResponseModality.R; + if ("T".equals(codeString)) + return V3ResponseModality.T; + throw new IllegalArgumentException("Unknown V3ResponseModality code '"+codeString+"'"); + } + + public String toCode(V3ResponseModality code) { + if (code == V3ResponseModality.B) + return "B"; + if (code == V3ResponseModality.R) + return "R"; + if (code == V3ResponseModality.T) + return "T"; + return "?"; + } + + public String toSystem(V3ResponseModality code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseMode.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseMode.java index 14443c83f46..8143b990378 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseMode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3ResponseMode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModeEnumFactory.java new file mode 100644 index 00000000000..bce19c97a80 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3ResponseModeEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3ResponseModeEnumFactory implements EnumFactory { + + public V3ResponseMode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("D".equals(codeString)) + return V3ResponseMode.D; + if ("I".equals(codeString)) + return V3ResponseMode.I; + if ("Q".equals(codeString)) + return V3ResponseMode.Q; + throw new IllegalArgumentException("Unknown V3ResponseMode code '"+codeString+"'"); + } + + public String toCode(V3ResponseMode code) { + if (code == V3ResponseMode.D) + return "D"; + if (code == V3ResponseMode.I) + return "I"; + if (code == V3ResponseMode.Q) + return "Q"; + return "?"; + } + + public String toSystem(V3ResponseMode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClass.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClass.java index 4f908abff03..9df77c95792 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClass.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RoleClass { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClassEnumFactory.java similarity index 86% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClassEnumFactory.java index 444b5f4a8e4..94224d7ae49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleClassEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3RoleClassEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCode.java similarity index 98% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCode.java index 6042f740649..a6c3f5d1e52 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RoleCode { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCodeEnumFactory.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCodeEnumFactory.java index 905dda09a29..b3ef96c1572 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleCodeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3RoleCodeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatus.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatus.java index 29dd7d55a94..303a6016246 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RoleLinkStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatusEnumFactory.java new file mode 100644 index 00000000000..a0b57bea788 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkStatusEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3RoleLinkStatusEnumFactory implements EnumFactory { + + public V3RoleLinkStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("NORMAL".equals(codeString)) + return V3RoleLinkStatus.NORMAL; + if ("ACTIVE".equals(codeString)) + return V3RoleLinkStatus.ACTIVE; + if ("CANCELLED".equals(codeString)) + return V3RoleLinkStatus.CANCELLED; + if ("COMPLETED".equals(codeString)) + return V3RoleLinkStatus.COMPLETED; + if ("PENDING".equals(codeString)) + return V3RoleLinkStatus.PENDING; + if ("NULLIFIED".equals(codeString)) + return V3RoleLinkStatus.NULLIFIED; + throw new IllegalArgumentException("Unknown V3RoleLinkStatus code '"+codeString+"'"); + } + + public String toCode(V3RoleLinkStatus code) { + if (code == V3RoleLinkStatus.NORMAL) + return "NORMAL"; + if (code == V3RoleLinkStatus.ACTIVE) + return "ACTIVE"; + if (code == V3RoleLinkStatus.CANCELLED) + return "CANCELLED"; + if (code == V3RoleLinkStatus.COMPLETED) + return "COMPLETED"; + if (code == V3RoleLinkStatus.PENDING) + return "PENDING"; + if (code == V3RoleLinkStatus.NULLIFIED) + return "NULLIFIED"; + return "?"; + } + + public String toSystem(V3RoleLinkStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkType.java index 2bbcd000d5e..266adf24d55 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RoleLinkType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkTypeEnumFactory.java new file mode 100644 index 00000000000..044d0c5d30c --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleLinkTypeEnumFactory.java @@ -0,0 +1,54 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3RoleLinkTypeEnumFactory implements EnumFactory { + + public V3RoleLinkType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("REL".equals(codeString)) + return V3RoleLinkType.REL; + if ("BACKUP".equals(codeString)) + return V3RoleLinkType.BACKUP; + if ("CONT".equals(codeString)) + return V3RoleLinkType.CONT; + if ("DIRAUTH".equals(codeString)) + return V3RoleLinkType.DIRAUTH; + if ("IDENT".equals(codeString)) + return V3RoleLinkType.IDENT; + if ("INDAUTH".equals(codeString)) + return V3RoleLinkType.INDAUTH; + if ("PART".equals(codeString)) + return V3RoleLinkType.PART; + if ("REPL".equals(codeString)) + return V3RoleLinkType.REPL; + throw new IllegalArgumentException("Unknown V3RoleLinkType code '"+codeString+"'"); + } + + public String toCode(V3RoleLinkType code) { + if (code == V3RoleLinkType.REL) + return "REL"; + if (code == V3RoleLinkType.BACKUP) + return "BACKUP"; + if (code == V3RoleLinkType.CONT) + return "CONT"; + if (code == V3RoleLinkType.DIRAUTH) + return "DIRAUTH"; + if (code == V3RoleLinkType.IDENT) + return "IDENT"; + if (code == V3RoleLinkType.INDAUTH) + return "INDAUTH"; + if (code == V3RoleLinkType.PART) + return "PART"; + if (code == V3RoleLinkType.REPL) + return "REPL"; + return "?"; + } + + public String toSystem(V3RoleLinkType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatus.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatus.java index ae9b8fc9677..bf537ee39d3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RoleStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatusEnumFactory.java new file mode 100644 index 00000000000..330241cafa7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RoleStatusEnumFactory.java @@ -0,0 +1,50 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3RoleStatusEnumFactory implements EnumFactory { + + public V3RoleStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("normal".equals(codeString)) + return V3RoleStatus.NORMAL; + if ("active".equals(codeString)) + return V3RoleStatus.ACTIVE; + if ("cancelled".equals(codeString)) + return V3RoleStatus.CANCELLED; + if ("pending".equals(codeString)) + return V3RoleStatus.PENDING; + if ("suspended".equals(codeString)) + return V3RoleStatus.SUSPENDED; + if ("terminated".equals(codeString)) + return V3RoleStatus.TERMINATED; + if ("nullified".equals(codeString)) + return V3RoleStatus.NULLIFIED; + throw new IllegalArgumentException("Unknown V3RoleStatus code '"+codeString+"'"); + } + + public String toCode(V3RoleStatus code) { + if (code == V3RoleStatus.NORMAL) + return "normal"; + if (code == V3RoleStatus.ACTIVE) + return "active"; + if (code == V3RoleStatus.CANCELLED) + return "cancelled"; + if (code == V3RoleStatus.PENDING) + return "pending"; + if (code == V3RoleStatus.SUSPENDED) + return "suspended"; + if (code == V3RoleStatus.TERMINATED) + return "terminated"; + if (code == V3RoleStatus.NULLIFIED) + return "nullified"; + return "?"; + } + + public String toSystem(V3RoleStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministration.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministration.java index 1c96b04d49e..780681fbf71 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministration.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3RouteOfAdministration { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministrationEnumFactory.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministrationEnumFactory.java index 817cf331057..39afca91739 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3RouteOfAdministrationEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3RouteOfAdministrationEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Sequencing.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Sequencing.java index 27be7c26bae..c75e78c236f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3Sequencing.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3Sequencing { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SequencingEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SequencingEnumFactory.java new file mode 100644 index 00000000000..e1cad1b4c71 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SequencingEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3SequencingEnumFactory implements EnumFactory { + + public V3Sequencing fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("A".equals(codeString)) + return V3Sequencing.A; + if ("D".equals(codeString)) + return V3Sequencing.D; + if ("N".equals(codeString)) + return V3Sequencing.N; + throw new IllegalArgumentException("Unknown V3Sequencing code '"+codeString+"'"); + } + + public String toCode(V3Sequencing code) { + if (code == V3Sequencing.A) + return "A"; + if (code == V3Sequencing.D) + return "D"; + if (code == V3Sequencing.N) + return "N"; + return "?"; + } + + public String toSystem(V3Sequencing code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperator.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperator.java index 9db8d156c2f..456ea88562b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperator.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3SetOperator { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperatorEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperatorEnumFactory.java new file mode 100644 index 00000000000..33b2151d0e1 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SetOperatorEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3SetOperatorEnumFactory implements EnumFactory { + + public V3SetOperator fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_ValueSetOperator".equals(codeString)) + return V3SetOperator._VALUESETOPERATOR; + if ("E".equals(codeString)) + return V3SetOperator.E; + if ("I".equals(codeString)) + return V3SetOperator.I; + if ("A".equals(codeString)) + return V3SetOperator.A; + if ("H".equals(codeString)) + return V3SetOperator.H; + if ("P".equals(codeString)) + return V3SetOperator.P; + throw new IllegalArgumentException("Unknown V3SetOperator code '"+codeString+"'"); + } + + public String toCode(V3SetOperator code) { + if (code == V3SetOperator._VALUESETOPERATOR) + return "_ValueSetOperator"; + if (code == V3SetOperator.E) + return "E"; + if (code == V3SetOperator.I) + return "I"; + if (code == V3SetOperator.A) + return "A"; + if (code == V3SetOperator.H) + return "H"; + if (code == V3SetOperator.P) + return "P"; + return "?"; + } + + public String toSystem(V3SetOperator code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenType.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenType.java index 6958f9e821e..d3f577306a9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3SpecimenType { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenTypeEnumFactory.java similarity index 87% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenTypeEnumFactory.java index acfd0de89af..5111b88cc73 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SpecimenTypeEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3SpecimenTypeEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitution.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitution.java index 934ddc12256..1e4f6d5dbf2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitution.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3SubstanceAdminSubstitution { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java similarity index 54% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java index 3810343d8ba..6ec78db373b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3SubstanceAdminSubstitutionEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionCondition.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionCondition.java index ecdf25dfa80..085fa6f65fb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionCondition.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3SubstitutionCondition { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionConditionEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionConditionEnumFactory.java new file mode 100644 index 00000000000..9d0965d3030 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3SubstitutionConditionEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3SubstitutionConditionEnumFactory implements EnumFactory { + + public V3SubstitutionCondition fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("_Conditional".equals(codeString)) + return V3SubstitutionCondition._CONDITIONAL; + if ("CONFIRM".equals(codeString)) + return V3SubstitutionCondition.CONFIRM; + if ("NOTIFY".equals(codeString)) + return V3SubstitutionCondition.NOTIFY; + if ("NOSUB".equals(codeString)) + return V3SubstitutionCondition.NOSUB; + if ("UNCOND".equals(codeString)) + return V3SubstitutionCondition.UNCOND; + throw new IllegalArgumentException("Unknown V3SubstitutionCondition code '"+codeString+"'"); + } + + public String toCode(V3SubstitutionCondition code) { + if (code == V3SubstitutionCondition._CONDITIONAL) + return "_Conditional"; + if (code == V3SubstitutionCondition.CONFIRM) + return "CONFIRM"; + if (code == V3SubstitutionCondition.NOTIFY) + return "NOTIFY"; + if (code == V3SubstitutionCondition.NOSUB) + return "NOSUB"; + if (code == V3SubstitutionCondition.UNCOND) + return "UNCOND"; + return "?"; + } + + public String toSystem(V3SubstitutionCondition code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlign.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlign.java index 08ff4a052e6..4336df20077 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlign.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TableCellHorizontalAlign { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java new file mode 100644 index 00000000000..a05305b86be --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellHorizontalAlignEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TableCellHorizontalAlignEnumFactory implements EnumFactory { + + public V3TableCellHorizontalAlign fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("center".equals(codeString)) + return V3TableCellHorizontalAlign.CENTER; + if ("char".equals(codeString)) + return V3TableCellHorizontalAlign.CHAR; + if ("justify".equals(codeString)) + return V3TableCellHorizontalAlign.JUSTIFY; + if ("left".equals(codeString)) + return V3TableCellHorizontalAlign.LEFT; + if ("right".equals(codeString)) + return V3TableCellHorizontalAlign.RIGHT; + throw new IllegalArgumentException("Unknown V3TableCellHorizontalAlign code '"+codeString+"'"); + } + + public String toCode(V3TableCellHorizontalAlign code) { + if (code == V3TableCellHorizontalAlign.CENTER) + return "center"; + if (code == V3TableCellHorizontalAlign.CHAR) + return "char"; + if (code == V3TableCellHorizontalAlign.JUSTIFY) + return "justify"; + if (code == V3TableCellHorizontalAlign.LEFT) + return "left"; + if (code == V3TableCellHorizontalAlign.RIGHT) + return "right"; + return "?"; + } + + public String toSystem(V3TableCellHorizontalAlign code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScope.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScope.java index 181599640b5..a4f9d346bb5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScope.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TableCellScope { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScopeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScopeEnumFactory.java new file mode 100644 index 00000000000..27eaf1fb33b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellScopeEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TableCellScopeEnumFactory implements EnumFactory { + + public V3TableCellScope fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("col".equals(codeString)) + return V3TableCellScope.COL; + if ("colgroup".equals(codeString)) + return V3TableCellScope.COLGROUP; + if ("row".equals(codeString)) + return V3TableCellScope.ROW; + if ("rowgroup".equals(codeString)) + return V3TableCellScope.ROWGROUP; + throw new IllegalArgumentException("Unknown V3TableCellScope code '"+codeString+"'"); + } + + public String toCode(V3TableCellScope code) { + if (code == V3TableCellScope.COL) + return "col"; + if (code == V3TableCellScope.COLGROUP) + return "colgroup"; + if (code == V3TableCellScope.ROW) + return "row"; + if (code == V3TableCellScope.ROWGROUP) + return "rowgroup"; + return "?"; + } + + public String toSystem(V3TableCellScope code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlign.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlign.java index c4f688cae30..8a4a191cedf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlign.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TableCellVerticalAlign { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlignEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlignEnumFactory.java new file mode 100644 index 00000000000..e6acaec4b15 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableCellVerticalAlignEnumFactory.java @@ -0,0 +1,38 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TableCellVerticalAlignEnumFactory implements EnumFactory { + + public V3TableCellVerticalAlign fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("baseline".equals(codeString)) + return V3TableCellVerticalAlign.BASELINE; + if ("bottom".equals(codeString)) + return V3TableCellVerticalAlign.BOTTOM; + if ("middle".equals(codeString)) + return V3TableCellVerticalAlign.MIDDLE; + if ("top".equals(codeString)) + return V3TableCellVerticalAlign.TOP; + throw new IllegalArgumentException("Unknown V3TableCellVerticalAlign code '"+codeString+"'"); + } + + public String toCode(V3TableCellVerticalAlign code) { + if (code == V3TableCellVerticalAlign.BASELINE) + return "baseline"; + if (code == V3TableCellVerticalAlign.BOTTOM) + return "bottom"; + if (code == V3TableCellVerticalAlign.MIDDLE) + return "middle"; + if (code == V3TableCellVerticalAlign.TOP) + return "top"; + return "?"; + } + + public String toSystem(V3TableCellVerticalAlign code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrame.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrame.java index 2533399112b..6ff3dba1944 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrame.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TableFrame { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrameEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrameEnumFactory.java new file mode 100644 index 00000000000..e49871b3d2b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableFrameEnumFactory.java @@ -0,0 +1,58 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TableFrameEnumFactory implements EnumFactory { + + public V3TableFrame fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("above".equals(codeString)) + return V3TableFrame.ABOVE; + if ("below".equals(codeString)) + return V3TableFrame.BELOW; + if ("border".equals(codeString)) + return V3TableFrame.BORDER; + if ("box".equals(codeString)) + return V3TableFrame.BOX; + if ("hsides".equals(codeString)) + return V3TableFrame.HSIDES; + if ("lhs".equals(codeString)) + return V3TableFrame.LHS; + if ("rhs".equals(codeString)) + return V3TableFrame.RHS; + if ("void".equals(codeString)) + return V3TableFrame.VOID; + if ("vsides".equals(codeString)) + return V3TableFrame.VSIDES; + throw new IllegalArgumentException("Unknown V3TableFrame code '"+codeString+"'"); + } + + public String toCode(V3TableFrame code) { + if (code == V3TableFrame.ABOVE) + return "above"; + if (code == V3TableFrame.BELOW) + return "below"; + if (code == V3TableFrame.BORDER) + return "border"; + if (code == V3TableFrame.BOX) + return "box"; + if (code == V3TableFrame.HSIDES) + return "hsides"; + if (code == V3TableFrame.LHS) + return "lhs"; + if (code == V3TableFrame.RHS) + return "rhs"; + if (code == V3TableFrame.VOID) + return "void"; + if (code == V3TableFrame.VSIDES) + return "vsides"; + return "?"; + } + + public String toSystem(V3TableFrame code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRules.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRules.java index b56b2c397ab..ef53ac01d34 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRules.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TableRules { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRulesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRulesEnumFactory.java new file mode 100644 index 00000000000..8510c650e87 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TableRulesEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TableRulesEnumFactory implements EnumFactory { + + public V3TableRules fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("all".equals(codeString)) + return V3TableRules.ALL; + if ("cols".equals(codeString)) + return V3TableRules.COLS; + if ("groups".equals(codeString)) + return V3TableRules.GROUPS; + if ("none".equals(codeString)) + return V3TableRules.NONE; + if ("rows".equals(codeString)) + return V3TableRules.ROWS; + throw new IllegalArgumentException("Unknown V3TableRules code '"+codeString+"'"); + } + + public String toCode(V3TableRules code) { + if (code == V3TableRules.ALL) + return "all"; + if (code == V3TableRules.COLS) + return "cols"; + if (code == V3TableRules.GROUPS) + return "groups"; + if (code == V3TableRules.NONE) + return "none"; + if (code == V3TableRules.ROWS) + return "rows"; + return "?"; + } + + public String toSystem(V3TableRules code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwareness.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwareness.java index e36ff8fe5e2..0516d6811b5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwareness.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TargetAwareness { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwarenessEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwarenessEnumFactory.java new file mode 100644 index 00000000000..c6031575826 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TargetAwarenessEnumFactory.java @@ -0,0 +1,46 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TargetAwarenessEnumFactory implements EnumFactory { + + public V3TargetAwareness fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("D".equals(codeString)) + return V3TargetAwareness.D; + if ("F".equals(codeString)) + return V3TargetAwareness.F; + if ("I".equals(codeString)) + return V3TargetAwareness.I; + if ("M".equals(codeString)) + return V3TargetAwareness.M; + if ("P".equals(codeString)) + return V3TargetAwareness.P; + if ("U".equals(codeString)) + return V3TargetAwareness.U; + throw new IllegalArgumentException("Unknown V3TargetAwareness code '"+codeString+"'"); + } + + public String toCode(V3TargetAwareness code) { + if (code == V3TargetAwareness.D) + return "D"; + if (code == V3TargetAwareness.F) + return "F"; + if (code == V3TargetAwareness.I) + return "I"; + if (code == V3TargetAwareness.M) + return "M"; + if (code == V3TargetAwareness.P) + return "P"; + if (code == V3TargetAwareness.U) + return "U"; + return "?"; + } + + public String toSystem(V3TargetAwareness code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilities.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilities.java index d54205e3fec..661e5cb9fd6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilities.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TelecommunicationCapabilities { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java new file mode 100644 index 00000000000..ee765b8e066 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TelecommunicationCapabilitiesEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TelecommunicationCapabilitiesEnumFactory implements EnumFactory { + + public V3TelecommunicationCapabilities fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("data".equals(codeString)) + return V3TelecommunicationCapabilities.DATA; + if ("fax".equals(codeString)) + return V3TelecommunicationCapabilities.FAX; + if ("sms".equals(codeString)) + return V3TelecommunicationCapabilities.SMS; + if ("tty".equals(codeString)) + return V3TelecommunicationCapabilities.TTY; + if ("voice".equals(codeString)) + return V3TelecommunicationCapabilities.VOICE; + throw new IllegalArgumentException("Unknown V3TelecommunicationCapabilities code '"+codeString+"'"); + } + + public String toCode(V3TelecommunicationCapabilities code) { + if (code == V3TelecommunicationCapabilities.DATA) + return "data"; + if (code == V3TelecommunicationCapabilities.FAX) + return "fax"; + if (code == V3TelecommunicationCapabilities.SMS) + return "sms"; + if (code == V3TelecommunicationCapabilities.TTY) + return "tty"; + if (code == V3TelecommunicationCapabilities.VOICE) + return "voice"; + return "?"; + } + + public String toSystem(V3TelecommunicationCapabilities code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEvent.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEvent.java index df8dc4addcb..33f76e15ee4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEvent.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TimingEvent { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEventEnumFactory.java similarity index 58% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEventEnumFactory.java index 96d826e19d8..4120643a61d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TimingEventEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3TimingEventEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCode.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCode.java index 8f5902c5d0d..af8c958b2e6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCode.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TransmissionRelationshipTypeCode { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java new file mode 100644 index 00000000000..be9f5033106 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TransmissionRelationshipTypeCodeEnumFactory.java @@ -0,0 +1,26 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class V3TransmissionRelationshipTypeCodeEnumFactory implements EnumFactory { + + public V3TransmissionRelationshipTypeCode fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("SEQL".equals(codeString)) + return V3TransmissionRelationshipTypeCode.SEQL; + throw new IllegalArgumentException("Unknown V3TransmissionRelationshipTypeCode code '"+codeString+"'"); + } + + public String toCode(V3TransmissionRelationshipTypeCode code) { + if (code == V3TransmissionRelationshipTypeCode.SEQL) + return "SEQL"; + return "?"; + } + + public String toSystem(V3TransmissionRelationshipTypeCode code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUS.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUS.java index bbf25cfceba..e22047b5302 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUS.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3TribalEntityUS { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUSEnumFactory.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUSEnumFactory.java index 9f227f0124c..3ead9a2b5c4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3TribalEntityUSEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3TribalEntityUSEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturer.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturer.java index bd14d6bfe9c..40a6e85b97d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturer.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum V3VaccineManufacturer { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturerEnumFactory.java similarity index 75% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturerEnumFactory.java index 62deeb4a98a..a5d8c2f19e1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/V3VaccineManufacturerEnumFactory.java @@ -1,38 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -*/ - -// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 - - -import org.hl7.fhir.dstu21.model.EnumFactory; +import org.hl7.fhir.dstu3.model.EnumFactory; public class V3VaccineManufacturerEnumFactory implements EnumFactory { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatus.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatus.java index f78eca05b6b..baf74143392 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatus.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum VaccinationProtocolDoseStatus { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java new file mode 100644 index 00000000000..2a40439023f --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class VaccinationProtocolDoseStatusEnumFactory implements EnumFactory { + + public VaccinationProtocolDoseStatus fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("count".equals(codeString)) + return VaccinationProtocolDoseStatus.COUNT; + if ("nocount".equals(codeString)) + return VaccinationProtocolDoseStatus.NOCOUNT; + throw new IllegalArgumentException("Unknown VaccinationProtocolDoseStatus code '"+codeString+"'"); + } + + public String toCode(VaccinationProtocolDoseStatus code) { + if (code == VaccinationProtocolDoseStatus.COUNT) + return "count"; + if (code == VaccinationProtocolDoseStatus.NOCOUNT) + return "nocount"; + return "?"; + } + + public String toSystem(VaccinationProtocolDoseStatus code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReason.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReason.java index 13009eca72c..c7b5db5123d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReason.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum VaccinationProtocolDoseStatusReason { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java new file mode 100644 index 00000000000..5ef4f5acc46 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VaccinationProtocolDoseStatusReasonEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class VaccinationProtocolDoseStatusReasonEnumFactory implements EnumFactory { + + public VaccinationProtocolDoseStatusReason fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("advstorage".equals(codeString)) + return VaccinationProtocolDoseStatusReason.ADVSTORAGE; + if ("coldchbrk".equals(codeString)) + return VaccinationProtocolDoseStatusReason.COLDCHBRK; + if ("explot".equals(codeString)) + return VaccinationProtocolDoseStatusReason.EXPLOT; + if ("outsidesched".equals(codeString)) + return VaccinationProtocolDoseStatusReason.OUTSIDESCHED; + if ("prodrecall".equals(codeString)) + return VaccinationProtocolDoseStatusReason.PRODRECALL; + throw new IllegalArgumentException("Unknown VaccinationProtocolDoseStatusReason code '"+codeString+"'"); + } + + public String toCode(VaccinationProtocolDoseStatusReason code) { + if (code == VaccinationProtocolDoseStatusReason.ADVSTORAGE) + return "advstorage"; + if (code == VaccinationProtocolDoseStatusReason.COLDCHBRK) + return "coldchbrk"; + if (code == VaccinationProtocolDoseStatusReason.EXPLOT) + return "explot"; + if (code == VaccinationProtocolDoseStatusReason.OUTSIDESCHED) + return "outsidesched"; + if (code == VaccinationProtocolDoseStatusReason.PRODRECALL) + return "prodrecall"; + return "?"; + } + + public String toSystem(VaccinationProtocolDoseStatusReason code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantState.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantState.java index 6c509253a68..57669a36cfd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantState.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum VariantState { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantStateEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantStateEnumFactory.java new file mode 100644 index 00000000000..7a985401dfe --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VariantStateEnumFactory.java @@ -0,0 +1,34 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class VariantStateEnumFactory implements EnumFactory { + + public VariantState fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("positive".equals(codeString)) + return VariantState.POSITIVE; + if ("negative".equals(codeString)) + return VariantState.NEGATIVE; + if ("absent".equals(codeString)) + return VariantState.ABSENT; + throw new IllegalArgumentException("Unknown VariantState code '"+codeString+"'"); + } + + public String toCode(VariantState code) { + if (code == VariantState.POSITIVE) + return "positive"; + if (code == VariantState.NEGATIVE) + return "negative"; + if (code == VariantState.ABSENT) + return "absent"; + return "?"; + } + + public String toSystem(VariantState code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProduct.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProduct.java index e7737306b5c..26a1ec55c9b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProduct.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum VisionProduct { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProductEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProductEnumFactory.java new file mode 100644 index 00000000000..3d02958a87b --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/VisionProductEnumFactory.java @@ -0,0 +1,30 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class VisionProductEnumFactory implements EnumFactory { + + public VisionProduct fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("lens".equals(codeString)) + return VisionProduct.LENS; + if ("contact".equals(codeString)) + return VisionProduct.CONTACT; + throw new IllegalArgumentException("Unknown VisionProduct code '"+codeString+"'"); + } + + public String toCode(VisionProduct code) { + if (code == VisionProduct.LENS) + return "lens"; + if (code == VisionProduct.CONTACT) + return "contact"; + return "?"; + } + + public String toSystem(VisionProduct code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipType.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipType.java index 6f1003f58bb..5e3ae882037 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipType.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.model.valuesets; +package org.hl7.fhir.dstu3.model.valuesets; -import org.hl7.fhir.dstu21.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; public enum XdsRelationshipType { diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipTypeEnumFactory.java new file mode 100644 index 00000000000..0fd62d76cae --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/XdsRelationshipTypeEnumFactory.java @@ -0,0 +1,42 @@ +package org.hl7.fhir.dstu3.model.valuesets; + +import org.hl7.fhir.dstu3.model.EnumFactory; + +public class XdsRelationshipTypeEnumFactory implements EnumFactory { + + public XdsRelationshipType fromCode(String codeString) throws IllegalArgumentException { + if (codeString == null || "".equals(codeString)) + return null; + if ("APND".equals(codeString)) + return XdsRelationshipType.APND; + if ("RPLC".equals(codeString)) + return XdsRelationshipType.RPLC; + if ("XFRM".equals(codeString)) + return XdsRelationshipType.XFRM; + if ("XFRM_RPLC".equals(codeString)) + return XdsRelationshipType.XFRMRPLC; + if ("signs".equals(codeString)) + return XdsRelationshipType.SIGNS; + throw new IllegalArgumentException("Unknown XdsRelationshipType code '"+codeString+"'"); + } + + public String toCode(XdsRelationshipType code) { + if (code == XdsRelationshipType.APND) + return "APND"; + if (code == XdsRelationshipType.RPLC) + return "RPLC"; + if (code == XdsRelationshipType.XFRM) + return "XFRM"; + if (code == XdsRelationshipType.XFRMRPLC) + return "XFRM_RPLC"; + if (code == XdsRelationshipType.SIGNS) + return "signs"; + return "?"; + } + + public String toSystem(XdsRelationshipType code) { + return code.getSystem(); + } + +} + diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/holder.txt b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/holder.txt similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/holder.txt rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/valuesets/holder.txt diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetChecker.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetChecker.java new file mode 100644 index 00000000000..baf707175a7 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetChecker.java @@ -0,0 +1,10 @@ +package org.hl7.fhir.dstu3.terminologies; + +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander.ETooCostly; +import org.hl7.fhir.dstu3.utils.EOperationOutcome; + +public interface ValueSetChecker { + + boolean codeInValueSet(String system, String code) throws ETooCostly, EOperationOutcome, Exception; + +} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetCheckerSimple.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetCheckerSimple.java similarity index 83% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetCheckerSimple.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetCheckerSimple.java index ca4db68c0a7..0119b5f6cf9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetCheckerSimple.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetCheckerSimple.java @@ -1,18 +1,18 @@ -package org.hl7.fhir.dstu21.terminologies; +package org.hl7.fhir.dstu3.terminologies; import java.util.List; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetFilterComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionContainsComponent; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander.ValueSetExpansionOutcome; -import org.hl7.fhir.dstu21.utils.EOperationOutcome; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.utils.IWorkerContext.ValidationResult; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetFilterComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.dstu3.utils.EOperationOutcome; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.utils.IWorkerContext.ValidationResult; public class ValueSetCheckerSimple implements ValueSetChecker { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpander.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpander.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpander.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpander.java index f819ba9de7a..c8a5f0f254d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpander.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpander.java @@ -1,9 +1,9 @@ -package org.hl7.fhir.dstu21.terminologies; +package org.hl7.fhir.dstu3.terminologies; import java.io.FileNotFoundException; import java.io.IOException; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet; public interface ValueSetExpander { public class ETooCostly extends Exception { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderFactory.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderFactory.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderFactory.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderFactory.java index 79781780f38..bd59307a6a9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderFactory.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderFactory.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.terminologies; +package org.hl7.fhir.dstu3.terminologies; /* Copyright (c) 2011+, HL7, Inc diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderSimple.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderSimple.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderSimple.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderSimple.java index 2226d06524c..f17be6ab555 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/terminologies/ValueSetExpanderSimple.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/ValueSetExpanderSimple.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.terminologies; +package org.hl7.fhir.dstu3.terminologies; import java.io.FileNotFoundException; import java.io.IOException; @@ -38,24 +38,24 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.NotImplementedException; -import org.hl7.fhir.dstu21.exceptions.TerminologyServiceException; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.Factory; -import org.hl7.fhir.dstu21.model.PrimitiveType; -import org.hl7.fhir.dstu21.model.Type; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptReferenceComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetFilterComponent; -import org.hl7.fhir.dstu21.model.ValueSet.FilterOperator; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetComposeComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionContainsComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionParameterComponent; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.utils.ToolingExtensions; +import org.hl7.fhir.dstu3.exceptions.TerminologyServiceException; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.Factory; +import org.hl7.fhir.dstu3.model.PrimitiveType; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptReferenceComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetFilterComponent; +import org.hl7.fhir.dstu3.model.ValueSet.FilterOperator; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetComposeComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionParameterComponent; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.utils.ToolingExtensions; import org.hl7.fhir.utilities.Utilities; public class ValueSetExpanderSimple implements ValueSetExpander { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/EOperationOutcome.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/EOperationOutcome.java similarity index 75% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/EOperationOutcome.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/EOperationOutcome.java index f68db95461a..5dfd1339e3d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/EOperationOutcome.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/EOperationOutcome.java @@ -1,6 +1,6 @@ -package org.hl7.fhir.dstu21.utils; +package org.hl7.fhir.dstu3.utils; -import org.hl7.fhir.dstu21.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.OperationOutcome; public class EOperationOutcome extends Exception { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/FHIRPathEngine.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/FHIRPathEngine.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java index 308c92f1960..1238b2f3bb2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/FHIRPathEngine.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.utils; +package org.hl7.fhir.dstu3.utils; import java.util.ArrayList; import java.util.EnumSet; @@ -8,28 +8,28 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hl7.fhir.dstu21.exceptions.DefinitionException; -import org.hl7.fhir.dstu21.exceptions.FHIRException; -import org.hl7.fhir.dstu21.exceptions.PathEngineException; -import org.hl7.fhir.dstu21.model.Base; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.Element; -import org.hl7.fhir.dstu21.model.ElementDefinition; -import org.hl7.fhir.dstu21.model.ElementDefinition.TypeRefComponent; -import org.hl7.fhir.dstu21.model.ExpressionNode; -import org.hl7.fhir.dstu21.model.ExpressionNode.Function; -import org.hl7.fhir.dstu21.model.ExpressionNode.Kind; -import org.hl7.fhir.dstu21.model.ExpressionNode.Operation; -import org.hl7.fhir.dstu21.model.ExpressionNode.SourceLocation; -import org.hl7.fhir.dstu21.model.Factory; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.model.Type; +import org.hl7.fhir.dstu3.exceptions.DefinitionException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.exceptions.PathEngineException; +import org.hl7.fhir.dstu3.model.Base; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.Element; +import org.hl7.fhir.dstu3.model.ElementDefinition; +import org.hl7.fhir.dstu3.model.ExpressionNode; +import org.hl7.fhir.dstu3.model.Factory; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.dstu3.model.ElementDefinition.TypeRefComponent; +import org.hl7.fhir.dstu3.model.ExpressionNode.Function; +import org.hl7.fhir.dstu3.model.ExpressionNode.Kind; +import org.hl7.fhir.dstu3.model.ExpressionNode.Operation; +import org.hl7.fhir.dstu3.model.ExpressionNode.SourceLocation; import org.hl7.fhir.utilities.Table; import org.hl7.fhir.utilities.Utilities; @@ -1862,7 +1862,7 @@ public class FHIRPathEngine { @Override public Resource createResource(MappingContext context, String parentId, String resourceType) throws FHIRException { - Resource resource = org.hl7.fhir.dstu21.model.ResourceFactory.createResource(resourceType); + Resource resource = org.hl7.fhir.dstu3.model.ResourceFactory.createResource(resourceType); String abbrev = worker.getAbbreviation(resourceType); if (!ids.containsKey(abbrev)) diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/INarrativeGenerator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/INarrativeGenerator.java similarity index 51% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/INarrativeGenerator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/INarrativeGenerator.java index 24b286ad475..a60b304dd7f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/INarrativeGenerator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/INarrativeGenerator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.utils; +package org.hl7.fhir.dstu3.utils; public interface INarrativeGenerator { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/IWorkerContext.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/IWorkerContext.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/IWorkerContext.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/IWorkerContext.java index 77b862d2c97..e92643c8b74 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/IWorkerContext.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/IWorkerContext.java @@ -1,20 +1,20 @@ -package org.hl7.fhir.dstu21.utils; +package org.hl7.fhir.dstu3.utils; import java.util.List; -import org.hl7.fhir.dstu21.formats.IParser; -import org.hl7.fhir.dstu21.formats.ParserType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; -import org.hl7.fhir.dstu21.terminologies.ValueSetExpander.ValueSetExpansionOutcome; -import org.hl7.fhir.dstu21.validation.IResourceValidator; +import org.hl7.fhir.dstu3.formats.IParser; +import org.hl7.fhir.dstu3.formats.ParserType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.dstu3.validation.IResourceValidator; /** diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/ToolingExtensions.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/ToolingExtensions.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/ToolingExtensions.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/ToolingExtensions.java index 8267f30d752..65f894af0e2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/utils/ToolingExtensions.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/utils/ToolingExtensions.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.utils; +package org.hl7.fhir.dstu3.utils; import java.net.URISyntaxException; @@ -36,31 +36,31 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.exceptions.FHIRFormatError; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.DataElement; -import org.hl7.fhir.dstu21.model.DomainResource; -import org.hl7.fhir.dstu21.model.Element; -import org.hl7.fhir.dstu21.model.ElementDefinition; -import org.hl7.fhir.dstu21.model.Extension; -import org.hl7.fhir.dstu21.model.ExtensionHelper; -import org.hl7.fhir.dstu21.model.Factory; -import org.hl7.fhir.dstu21.model.Identifier; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.MarkdownType; -import org.hl7.fhir.dstu21.model.PrimitiveType; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemComponent; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.Type; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetCodeSystemComponent; -import org.hl7.fhir.dstu21.validation.ValidationMessage.Source; +import org.hl7.fhir.dstu3.exceptions.FHIRFormatError; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.DataElement; +import org.hl7.fhir.dstu3.model.DomainResource; +import org.hl7.fhir.dstu3.model.Element; +import org.hl7.fhir.dstu3.model.ElementDefinition; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.ExtensionHelper; +import org.hl7.fhir.dstu3.model.Factory; +import org.hl7.fhir.dstu3.model.Identifier; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.MarkdownType; +import org.hl7.fhir.dstu3.model.PrimitiveType; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetCodeSystemComponent; +import org.hl7.fhir.dstu3.validation.ValidationMessage.Source; public class ToolingExtensions { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/BaseValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/BaseValidator.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/BaseValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/BaseValidator.java index b173352229d..24d704ac95d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/BaseValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/BaseValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; /* Copyright (c) 2011+, HL7, Inc @@ -33,9 +33,9 @@ import java.text.MessageFormat; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueType; -import org.hl7.fhir.dstu21.validation.ValidationMessage.Source; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueType; +import org.hl7.fhir.dstu3.validation.ValidationMessage.Source; public class BaseValidator { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ExtensionLocatorService.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ExtensionLocatorService.java similarity index 88% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ExtensionLocatorService.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ExtensionLocatorService.java index 796a2b2a119..0a57c476af2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ExtensionLocatorService.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ExtensionLocatorService.java @@ -1,7 +1,7 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; -import org.hl7.fhir.dstu21.exceptions.DefinitionException; -import org.hl7.fhir.dstu21.model.StructureDefinition; +import org.hl7.fhir.dstu3.exceptions.DefinitionException; +import org.hl7.fhir.dstu3.model.StructureDefinition; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/IResourceValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/IResourceValidator.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/IResourceValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/IResourceValidator.java index c10f68adbcb..f90652b74e4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/IResourceValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/IResourceValidator.java @@ -1,8 +1,8 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; import java.util.List; -import org.hl7.fhir.dstu21.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.StructureDefinition; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/InstanceValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/InstanceValidator.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/InstanceValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/InstanceValidator.java index 9a5cc5fb113..8926262982b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/InstanceValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/InstanceValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; import java.util.ArrayList; import java.util.HashMap; @@ -8,54 +8,54 @@ import java.util.Map.Entry; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.hl7.fhir.dstu21.exceptions.DefinitionException; -import org.hl7.fhir.dstu21.exceptions.FHIRException; -import org.hl7.fhir.dstu21.formats.FormatUtilities; -import org.hl7.fhir.dstu21.model.Address; -import org.hl7.fhir.dstu21.model.Attachment; -import org.hl7.fhir.dstu21.model.Base; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.ContactPoint; -import org.hl7.fhir.dstu21.model.DomainResource; -import org.hl7.fhir.dstu21.model.ElementDefinition; -import org.hl7.fhir.dstu21.model.ElementDefinition.ConstraintSeverity; -import org.hl7.fhir.dstu21.model.ElementDefinition.ElementDefinitionBindingComponent; -import org.hl7.fhir.dstu21.model.ElementDefinition.ElementDefinitionConstraintComponent; -import org.hl7.fhir.dstu21.model.ElementDefinition.TypeRefComponent; -import org.hl7.fhir.dstu21.model.Enumerations.BindingStrength; -import org.hl7.fhir.dstu21.model.Extension; -import org.hl7.fhir.dstu21.model.HumanName; -import org.hl7.fhir.dstu21.model.Identifier; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueType; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Property; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemComponent; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.Range; -import org.hl7.fhir.dstu21.model.Ratio; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.ResourceType; -import org.hl7.fhir.dstu21.model.SampledData; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.StructureDefinition; -import org.hl7.fhir.dstu21.model.StructureDefinition.ExtensionContext; -import org.hl7.fhir.dstu21.model.StructureDefinition.StructureDefinitionKind; -import org.hl7.fhir.dstu21.model.StructureDefinition.StructureDefinitionSnapshotComponent; -import org.hl7.fhir.dstu21.model.Timing; -import org.hl7.fhir.dstu21.model.Type; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionContainsComponent; -import org.hl7.fhir.dstu21.utils.FHIRPathEngine; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.utils.IWorkerContext.ValidationResult; -import org.hl7.fhir.dstu21.validation.ValidationMessage.Source; +import org.hl7.fhir.dstu3.exceptions.DefinitionException; +import org.hl7.fhir.dstu3.exceptions.FHIRException; +import org.hl7.fhir.dstu3.formats.FormatUtilities; +import org.hl7.fhir.dstu3.model.Address; +import org.hl7.fhir.dstu3.model.Attachment; +import org.hl7.fhir.dstu3.model.Base; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.ContactPoint; +import org.hl7.fhir.dstu3.model.DomainResource; +import org.hl7.fhir.dstu3.model.ElementDefinition; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.HumanName; +import org.hl7.fhir.dstu3.model.Identifier; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Property; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.Range; +import org.hl7.fhir.dstu3.model.Ratio; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.ResourceType; +import org.hl7.fhir.dstu3.model.SampledData; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.Timing; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.ElementDefinition.ConstraintSeverity; +import org.hl7.fhir.dstu3.model.ElementDefinition.ElementDefinitionBindingComponent; +import org.hl7.fhir.dstu3.model.ElementDefinition.ElementDefinitionConstraintComponent; +import org.hl7.fhir.dstu3.model.ElementDefinition.TypeRefComponent; +import org.hl7.fhir.dstu3.model.Enumerations.BindingStrength; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueType; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.StructureDefinition.ExtensionContext; +import org.hl7.fhir.dstu3.model.StructureDefinition.StructureDefinitionKind; +import org.hl7.fhir.dstu3.model.StructureDefinition.StructureDefinitionSnapshotComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionContainsComponent; +import org.hl7.fhir.dstu3.utils.FHIRPathEngine; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.utils.IWorkerContext.ValidationResult; +import org.hl7.fhir.dstu3.validation.ValidationMessage.Source; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xml.XMLUtil; @@ -705,7 +705,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat // } // - private void checkFixedValue(List errors, String path, WrapperElement focus, org.hl7.fhir.dstu21.model.Element fixed, String propName) { + private void checkFixedValue(List errors, String path, WrapperElement focus, org.hl7.fhir.dstu3.model.Element fixed, String propName) { if (fixed == null && focus == null) ; // this is all good else if (fixed == null && focus != null) @@ -714,45 +714,45 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, false, "Mising element " + propName); else { String value = focus.getAttribute("value"); - if (fixed instanceof org.hl7.fhir.dstu21.model.BooleanType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.BooleanType) fixed).asStringValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.BooleanType) fixed).asStringValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.IntegerType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.IntegerType) fixed).asStringValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.IntegerType) fixed).asStringValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.DecimalType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.DecimalType) fixed).asStringValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.DecimalType) fixed).asStringValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.Base64BinaryType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.Base64BinaryType) fixed).asStringValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.Base64BinaryType) fixed).asStringValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.InstantType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.InstantType) fixed).getValue().toString(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.InstantType) fixed).asStringValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.StringType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.StringType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.StringType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.UriType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.UriType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.UriType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.DateType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.DateType) fixed).getValue().toString(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.DateType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.DateTimeType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.DateTimeType) fixed).getValue().toString(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.DateTimeType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.OidType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.OidType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.OidType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.UuidType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.UuidType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.UuidType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.CodeType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.CodeType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.CodeType) fixed).getValue() + "'"); - else if (fixed instanceof org.hl7.fhir.dstu21.model.IdType) - rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu21.model.IdType) fixed).getValue(), value), - "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu21.model.IdType) fixed).getValue() + "'"); + if (fixed instanceof org.hl7.fhir.dstu3.model.BooleanType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.BooleanType) fixed).asStringValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.BooleanType) fixed).asStringValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.IntegerType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.IntegerType) fixed).asStringValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.IntegerType) fixed).asStringValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.DecimalType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.DecimalType) fixed).asStringValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.DecimalType) fixed).asStringValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.Base64BinaryType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.Base64BinaryType) fixed).asStringValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.Base64BinaryType) fixed).asStringValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.InstantType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.InstantType) fixed).getValue().toString(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.InstantType) fixed).asStringValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.StringType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.StringType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.StringType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.UriType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.UriType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.UriType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.DateType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.DateType) fixed).getValue().toString(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.DateType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.DateTimeType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.DateTimeType) fixed).getValue().toString(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.DateTimeType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.OidType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.OidType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.OidType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.UuidType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.UuidType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.UuidType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.CodeType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.CodeType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.CodeType) fixed).getValue() + "'"); + else if (fixed instanceof org.hl7.fhir.dstu3.model.IdType) + rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.dstu3.model.IdType) fixed).getValue(), value), + "Value is '" + value + "' but must be '" + ((org.hl7.fhir.dstu3.model.IdType) fixed).getValue() + "'"); else if (fixed instanceof Quantity) checkQuantity(errors, path, focus, (Quantity) fixed); else if (fixed instanceof Address) diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/QuestionnaireResponseValidator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java similarity index 91% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/QuestionnaireResponseValidator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java index d96edf4b951..7b302322176 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/QuestionnaireResponseValidator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/QuestionnaireResponseValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -11,32 +11,32 @@ import java.util.List; import java.util.Set; import org.apache.commons.lang3.Validate; -import org.hl7.fhir.dstu21.model.Attachment; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.InstantType; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueType; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemComponent; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseItemComponent; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseStatus; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.Resource; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.TimeType; -import org.hl7.fhir.dstu21.model.Type; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.utils.IWorkerContext; +import org.hl7.fhir.dstu3.model.Attachment; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.InstantType; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.TimeType; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueType; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemComponent; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseStatus; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.utils.IWorkerContext; /** * Validates that an instance of {@link QuestionnaireResponse} is valid against the {@link Questionnaire} that it claims diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationErrorHandler.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationErrorHandler.java similarity index 89% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationErrorHandler.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationErrorHandler.java index c4edec56feb..4fb756b7efc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationErrorHandler.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationErrorHandler.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; /* Copyright (c) 2011+, HL7, Inc All rights reserved. @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. import java.util.List; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueType; -import org.hl7.fhir.dstu21.validation.ValidationMessage.Source; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueType; +import org.hl7.fhir.dstu3.validation.ValidationMessage.Source; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationMessage.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationMessage.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationMessage.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationMessage.java index 53b4106551a..d1aeb1589ef 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/ValidationMessage.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/ValidationMessage.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; /* Copyright (c) 2011+, HL7, Inc @@ -31,11 +31,11 @@ package org.hl7.fhir.dstu21.validation; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.OperationOutcome.IssueSeverity; -import org.hl7.fhir.dstu21.model.OperationOutcome.OperationOutcomeIssueComponent; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.utils.ToolingExtensions; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.OperationOutcome.IssueSeverity; +import org.hl7.fhir.dstu3.model.OperationOutcome.OperationOutcomeIssueComponent; +import org.hl7.fhir.dstu3.utils.ToolingExtensions; import org.hl7.fhir.utilities.Utilities; public class ValidationMessage diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationAnnotator.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationAnnotator.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationAnnotator.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationAnnotator.java index c77c0e61802..82cd6f5ed78 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationAnnotator.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationAnnotator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; import java.util.Stack; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationData.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationData.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationData.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationData.java index 99dbd6b9135..8a6112951b6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/validation/XmlLocationData.java +++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/validation/XmlLocationData.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.validation; +package org.hl7.fhir.dstu3.validation; public class XmlLocationData { diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/exceptions/FHIRException.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/exceptions/FHIRException.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/CSFile.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/CSFile.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/CSFile.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/CSFile.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/FileNotifier.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/FileNotifier.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/FileNotifier.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/FileNotifier.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Inflector.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Inflector.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Inflector.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Inflector.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Table.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Table.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Table.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Table.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Utilities.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Utilities.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/Utilities.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/Utilities.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java rename to hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java diff --git a/hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties b/hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties new file mode 100644 index 00000000000..8c1ea05b949 --- /dev/null +++ b/hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties @@ -0,0 +1,151 @@ +# This file contains version definitions + +resource.Account=org.hl7.fhir.dstu3.model.Account +resource.AllergyIntolerance=org.hl7.fhir.dstu3.model.AllergyIntolerance +resource.Appointment=org.hl7.fhir.dstu3.model.Appointment +resource.AppointmentResponse=org.hl7.fhir.dstu3.model.AppointmentResponse +resource.AuditEvent=org.hl7.fhir.dstu3.model.AuditEvent +resource.Basic=org.hl7.fhir.dstu3.model.Basic +resource.Binary=org.hl7.fhir.dstu3.model.Binary +resource.BodySite=org.hl7.fhir.dstu3.model.BodySite +resource.Bundle=org.hl7.fhir.dstu3.model.Bundle +resource.CarePlan=org.hl7.fhir.dstu3.model.CarePlan +resource.Claim=org.hl7.fhir.dstu3.model.Claim +resource.ClaimResponse=org.hl7.fhir.dstu3.model.ClaimResponse +resource.ClinicalImpression=org.hl7.fhir.dstu3.model.ClinicalImpression +resource.Communication=org.hl7.fhir.dstu3.model.Communication +resource.CommunicationRequest=org.hl7.fhir.dstu3.model.CommunicationRequest +resource.Composition=org.hl7.fhir.dstu3.model.Composition +resource.ConceptMap=org.hl7.fhir.dstu3.model.ConceptMap +resource.Condition=org.hl7.fhir.dstu3.model.Condition +resource.Conformance=org.hl7.fhir.dstu3.model.Conformance +resource.Contract=org.hl7.fhir.dstu3.model.Contract +resource.Coverage=org.hl7.fhir.dstu3.model.Coverage +resource.DataElement=org.hl7.fhir.dstu3.model.DataElement +resource.DecisionSupportRule=org.hl7.fhir.dstu3.model.DecisionSupportRule +resource.DecisionSupportServiceModule=org.hl7.fhir.dstu3.model.DecisionSupportServiceModule +resource.DetectedIssue=org.hl7.fhir.dstu3.model.DetectedIssue +resource.Device=org.hl7.fhir.dstu3.model.Device +resource.DeviceComponent=org.hl7.fhir.dstu3.model.DeviceComponent +resource.DeviceMetric=org.hl7.fhir.dstu3.model.DeviceMetric +resource.DeviceUseRequest=org.hl7.fhir.dstu3.model.DeviceUseRequest +resource.DeviceUseStatement=org.hl7.fhir.dstu3.model.DeviceUseStatement +resource.DiagnosticOrder=org.hl7.fhir.dstu3.model.DiagnosticOrder +resource.DiagnosticReport=org.hl7.fhir.dstu3.model.DiagnosticReport +resource.DocumentManifest=org.hl7.fhir.dstu3.model.DocumentManifest +resource.DocumentReference=org.hl7.fhir.dstu3.model.DocumentReference +resource.EligibilityRequest=org.hl7.fhir.dstu3.model.EligibilityRequest +resource.EligibilityResponse=org.hl7.fhir.dstu3.model.EligibilityResponse +resource.Encounter=org.hl7.fhir.dstu3.model.Encounter +resource.EnrollmentRequest=org.hl7.fhir.dstu3.model.EnrollmentRequest +resource.EnrollmentResponse=org.hl7.fhir.dstu3.model.EnrollmentResponse +resource.EpisodeOfCare=org.hl7.fhir.dstu3.model.EpisodeOfCare +resource.ExpansionProfile=org.hl7.fhir.dstu3.model.ExpansionProfile +resource.ExplanationOfBenefit=org.hl7.fhir.dstu3.model.ExplanationOfBenefit +resource.FamilyMemberHistory=org.hl7.fhir.dstu3.model.FamilyMemberHistory +resource.Flag=org.hl7.fhir.dstu3.model.Flag +resource.Goal=org.hl7.fhir.dstu3.model.Goal +resource.Group=org.hl7.fhir.dstu3.model.Group +resource.GuidanceResponse=org.hl7.fhir.dstu3.model.GuidanceResponse +resource.HealthcareService=org.hl7.fhir.dstu3.model.HealthcareService +resource.ImagingObjectSelection=org.hl7.fhir.dstu3.model.ImagingObjectSelection +resource.ImagingStudy=org.hl7.fhir.dstu3.model.ImagingStudy +resource.Immunization=org.hl7.fhir.dstu3.model.Immunization +resource.ImmunizationRecommendation=org.hl7.fhir.dstu3.model.ImmunizationRecommendation +resource.ImplementationGuide=org.hl7.fhir.dstu3.model.ImplementationGuide +resource.Library=org.hl7.fhir.dstu3.model.Library +resource.List=org.hl7.fhir.dstu3.model.ListResource +resource.Location=org.hl7.fhir.dstu3.model.Location +resource.Measure=org.hl7.fhir.dstu3.model.Measure +resource.Media=org.hl7.fhir.dstu3.model.Media +resource.Medication=org.hl7.fhir.dstu3.model.Medication +resource.MedicationAdministration=org.hl7.fhir.dstu3.model.MedicationAdministration +resource.MedicationDispense=org.hl7.fhir.dstu3.model.MedicationDispense +resource.MedicationOrder=org.hl7.fhir.dstu3.model.MedicationOrder +resource.MedicationStatement=org.hl7.fhir.dstu3.model.MedicationStatement +resource.MessageHeader=org.hl7.fhir.dstu3.model.MessageHeader +resource.ModuleDefinition=org.hl7.fhir.dstu3.model.ModuleDefinition +resource.ModuleMetadata=org.hl7.fhir.dstu3.model.ModuleMetadata +resource.NamingSystem=org.hl7.fhir.dstu3.model.NamingSystem +resource.NutritionOrder=org.hl7.fhir.dstu3.model.NutritionOrder +resource.Observation=org.hl7.fhir.dstu3.model.Observation +resource.OperationDefinition=org.hl7.fhir.dstu3.model.OperationDefinition +resource.OperationOutcome=org.hl7.fhir.dstu3.model.OperationOutcome +resource.Order=org.hl7.fhir.dstu3.model.Order +resource.OrderResponse=org.hl7.fhir.dstu3.model.OrderResponse +resource.OrderSet=org.hl7.fhir.dstu3.model.OrderSet +resource.Organization=org.hl7.fhir.dstu3.model.Organization +resource.Parameters=org.hl7.fhir.dstu3.model.Parameters +resource.Patient=org.hl7.fhir.dstu3.model.Patient +resource.PaymentNotice=org.hl7.fhir.dstu3.model.PaymentNotice +resource.PaymentReconciliation=org.hl7.fhir.dstu3.model.PaymentReconciliation +resource.Person=org.hl7.fhir.dstu3.model.Person +resource.Practitioner=org.hl7.fhir.dstu3.model.Practitioner +resource.Procedure=org.hl7.fhir.dstu3.model.Procedure +resource.ProcedureRequest=org.hl7.fhir.dstu3.model.ProcedureRequest +resource.ProcessRequest=org.hl7.fhir.dstu3.model.ProcessRequest +resource.ProcessResponse=org.hl7.fhir.dstu3.model.ProcessResponse +resource.Provenance=org.hl7.fhir.dstu3.model.Provenance +resource.Questionnaire=org.hl7.fhir.dstu3.model.Questionnaire +resource.QuestionnaireResponse=org.hl7.fhir.dstu3.model.QuestionnaireResponse +resource.ReferralRequest=org.hl7.fhir.dstu3.model.ReferralRequest +resource.RelatedPerson=org.hl7.fhir.dstu3.model.RelatedPerson +resource.RiskAssessment=org.hl7.fhir.dstu3.model.RiskAssessment +resource.Schedule=org.hl7.fhir.dstu3.model.Schedule +resource.SearchParameter=org.hl7.fhir.dstu3.model.SearchParameter +resource.Sequence=org.hl7.fhir.dstu3.model.Sequence +resource.Slot=org.hl7.fhir.dstu3.model.Slot +resource.Specimen=org.hl7.fhir.dstu3.model.Specimen +resource.StructureDefinition=org.hl7.fhir.dstu3.model.StructureDefinition +resource.Subscription=org.hl7.fhir.dstu3.model.Subscription +resource.Substance=org.hl7.fhir.dstu3.model.Substance +resource.SupplyDelivery=org.hl7.fhir.dstu3.model.SupplyDelivery +resource.SupplyRequest=org.hl7.fhir.dstu3.model.SupplyRequest +resource.TestScript=org.hl7.fhir.dstu3.model.TestScript +resource.ValueSet=org.hl7.fhir.dstu3.model.ValueSet +resource.VisionPrescription=org.hl7.fhir.dstu3.model.VisionPrescription + +datatype.Address=org.hl7.fhir.dstu3.model.Address +datatype.Age=org.hl7.fhir.dstu3.model.Age +datatype.Annotation=org.hl7.fhir.dstu3.model.Annotation +datatype.Attachment=org.hl7.fhir.dstu3.model.Attachment +datatype.CodeableConcept=org.hl7.fhir.dstu3.model.CodeableConcept +datatype.Coding=org.hl7.fhir.dstu3.model.Coding +datatype.ContactPoint=org.hl7.fhir.dstu3.model.ContactPoint +datatype.Count=org.hl7.fhir.dstu3.model.Count +datatype.Distance=org.hl7.fhir.dstu3.model.Distance +datatype.Duration=org.hl7.fhir.dstu3.model.Duration +datatype.ElementDefinition=org.hl7.fhir.dstu3.model.ElementDefinition +datatype.Extension=org.hl7.fhir.dstu3.model.Extension +datatype.HumanName=org.hl7.fhir.dstu3.model.HumanName +datatype.Identifier=org.hl7.fhir.dstu3.model.Identifier +datatype.Meta=org.hl7.fhir.dstu3.model.Meta +datatype.Money=org.hl7.fhir.dstu3.model.Money +datatype.Narrative=org.hl7.fhir.dstu3.model.Narrative +datatype.Period=org.hl7.fhir.dstu3.model.Period +datatype.Quantity=org.hl7.fhir.dstu3.model.Quantity +datatype.Range=org.hl7.fhir.dstu3.model.Range +datatype.Ratio=org.hl7.fhir.dstu3.model.Ratio +datatype.Reference=org.hl7.fhir.dstu3.model.Reference +datatype.SampledData=org.hl7.fhir.dstu3.model.SampledData +datatype.Signature=org.hl7.fhir.dstu3.model.Signature +datatype.SimpleQuantity=org.hl7.fhir.dstu3.model.SimpleQuantity +datatype.Timing=org.hl7.fhir.dstu3.model.Timing +datatype.base64binary=org.hl7.fhir.dstu3.model.Base64BinaryType +datatype.boolean=org.hl7.fhir.dstu3.model.BooleanType +datatype.code=org.hl7.fhir.dstu3.model.CodeType +datatype.code.2=org.hl7.fhir.dstu3.model.Enumeration +datatype.date=org.hl7.fhir.dstu3.model.DateType +datatype.dateTime=org.hl7.fhir.dstu3.model.DateTimeType +datatype.decimal=org.hl7.fhir.dstu3.model.DecimalType +datatype.id=org.hl7.fhir.dstu3.model.IdType +datatype.instant=org.hl7.fhir.dstu3.model.InstantType +datatype.integer=org.hl7.fhir.dstu3.model.IntegerType +datatype.markdown=org.hl7.fhir.dstu3.model.MarkdownType +datatype.oid=org.hl7.fhir.dstu3.model.OidType +datatype.positiveInt=org.hl7.fhir.dstu3.model.PositiveIntType +datatype.string=org.hl7.fhir.dstu3.model.StringType +datatype.time=org.hl7.fhir.dstu3.model.TimeType +datatype.unsignedInt=org.hl7.fhir.dstu3.model.UnsignedIntType +datatype.uri=org.hl7.fhir.dstu3.model.UriType +datatype.xhtml=org.hl7.fhir.utilities.xhtml.XhtmlNode diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu3Test.java similarity index 67% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu3Test.java index 41d285cdd1a..75940b35a56 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/RuntimeResourceDefinitionDstu3Test.java @@ -2,13 +2,13 @@ package ca.uhn.fhir.context; import static org.junit.Assert.*; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Patient; import org.junit.Test; -public class RuntimeResourceDefinitionDstu21Test { +public class RuntimeResourceDefinitionDstu3Test { - private FhirContext ourCtx = FhirContext.forDstu2_1(); + private FhirContext ourCtx = FhirContext.forDstu3(); @Test public void testAsClass() { diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu3Test.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu3Test.java index 353036aafb2..f5f6a9b243e 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/BaseDateTimeTypeDstu3Test.java @@ -10,16 +10,16 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.TemporalPrecisionEnum; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.TemporalPrecisionEnum; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -public class BaseDateTimeTypeDstu21Test { +public class BaseDateTimeTypeDstu3Test { private static Locale ourDefaultLocale; - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseDateTimeTypeDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseDateTimeTypeDstu3Test.class); private SimpleDateFormat myDateInstantParser; @Before diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/DateTypeTest.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/DateTypeTest.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/DateTypeTest.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/DateTypeTest.java index de6602de2d8..c38568d004a 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/model/DateTypeTest.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/DateTypeTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import java.util.Calendar; import java.util.TimeZone; -import org.hl7.fhir.dstu21.model.DateType; +import org.hl7.fhir.dstu3.model.DateType; import org.junit.Test; public class DateTypeTest { diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu3Test.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu3Test.java index d280af3ee62..8737dc34289 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorDstu3Test.java @@ -8,26 +8,26 @@ import static org.junit.Assert.assertTrue; import java.util.Date; import org.hamcrest.core.StringContains; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.DiagnosticReport.DiagnosticReportStatus; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.Encounter.EncounterClass; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.MedicationOrder.MedicationOrderStatus; -import org.hl7.fhir.dstu21.model.Narrative; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.OperationOutcome; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Period; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.SimpleQuantity; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Narrative; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.OperationOutcome; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Period; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.SimpleQuantity; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.DiagnosticReport.DiagnosticReportStatus; +import org.hl7.fhir.dstu3.model.Encounter.EncounterClass; +import org.hl7.fhir.dstu3.model.MedicationOrder.MedicationOrderStatus; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -35,9 +35,9 @@ import org.junit.Test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.parser.DataFormatException; -public class DefaultThymeleafNarrativeGeneratorDstu21Test { - private static FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(DefaultThymeleafNarrativeGeneratorDstu21Test.class); +public class DefaultThymeleafNarrativeGeneratorDstu3Test { + private static FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(DefaultThymeleafNarrativeGeneratorDstu3Test.class); private DefaultThymeleafNarrativeGenerator myGen; @Before diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu3Test.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu3Test.java index 12de43d1b7d..4bc1dca467f 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/CustomTypeDstu3Test.java @@ -3,9 +3,9 @@ package ca.uhn.fhir.parser; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Quantity; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Quantity; import org.junit.Test; import ca.uhn.fhir.context.FhirContext; @@ -16,14 +16,14 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.util.ElementUtil; -public class CustomTypeDstu21Test { +public class CustomTypeDstu3Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomTypeDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomTypeDstu3Test.class); @Test public void testEncode() { - FhirContext ctx = FhirContext.forDstu2_1(); + FhirContext ctx = FhirContext.forDstu3(); MyCustomPatient patient = new MyCustomPatient(); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java index 57580c53bf7..017459b76f6 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java @@ -17,34 +17,34 @@ import java.util.UUID; import org.apache.commons.io.IOUtils; import org.hamcrest.Matchers; -import org.hl7.fhir.dstu21.model.Binary; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.Condition; -import org.hl7.fhir.dstu21.model.Condition.ConditionVerificationStatus; -import org.hl7.fhir.dstu21.model.Conformance; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.Extension; -import org.hl7.fhir.dstu21.model.HumanName; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Identifier.IdentifierUse; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Parameters; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; +import org.hl7.fhir.dstu3.model.Binary; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.Condition; +import org.hl7.fhir.dstu3.model.Conformance; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.HumanName; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Parameters; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.Condition.ConditionVerificationStatus; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.dstu3.model.Identifier.IdentifierUse; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.utilities.xhtml.XhtmlNode; import org.junit.After; import org.junit.Assert; @@ -59,9 +59,9 @@ import net.sf.json.JSON; import net.sf.json.JSONSerializer; import net.sf.json.JsonConfig; -public class JsonParserDstu21Test { - private static final FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(JsonParserDstu21Test.class); +public class JsonParserDstu3Test { + private static final FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(JsonParserDstu3Test.class); @Test public void testEncodeParametersWithId() { @@ -594,7 +594,7 @@ public class JsonParserDstu21Test { @Test @Ignore public void testParseAndEncodeBundle() throws Exception { - String content = IOUtils.toString(JsonParserDstu21Test.class.getResourceAsStream("/bundle-example.json")); + String content = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/bundle-example.json")); Bundle parsed = ourCtx.newXmlParser().parseResource(Bundle.class, content); assertEquals("Bundle/example/_history/1", parsed.getIdElement().getValue()); @@ -642,7 +642,7 @@ public class JsonParserDstu21Test { */ @Test @Ignore public void testParseAndEncodeBundleFromXmlToJson() throws Exception { - String content = IOUtils.toString(JsonParserDstu21Test.class.getResourceAsStream("/bundle-example2.xml")); + String content = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/bundle-example2.xml")); Bundle parsed = ourCtx.newXmlParser().parseResource(Bundle.class, content); @@ -666,7 +666,7 @@ public class JsonParserDstu21Test { @Test @Ignore public void testParseAndEncodeBundleNewStyle() throws Exception { - String content = IOUtils.toString(JsonParserDstu21Test.class.getResourceAsStream("/bundle-example.json")); + String content = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/bundle-example.json")); Bundle parsed = ourCtx.newJsonParser().parseResource(Bundle.class, content); assertEquals("Bundle/example/_history/1", parsed.getIdElement().getValue()); @@ -972,7 +972,7 @@ public class JsonParserDstu21Test { @Test public void testReportSerialize() { - ReportObservationDstu21 obsv = new ReportObservationDstu21(); + ReportObservationDstu3 obsv = new ReportObservationDstu3(); obsv.getCode().addCoding().setCode("name"); obsv.setValue(new StringType("value test")); obsv.setStatus(ObservationStatus.FINAL); @@ -994,7 +994,7 @@ public class JsonParserDstu21Test { @Test public void testReportSerializeWithMatchingId() { - ReportObservationDstu21 obsv = new ReportObservationDstu21(); + ReportObservationDstu3 obsv = new ReportObservationDstu3(); obsv.getCode().addCoding().setCode("name"); obsv.setValue(new StringType("value test")); obsv.setStatus(ObservationStatus.FINAL); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu3.java similarity index 86% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu3.java index bbe64faf28a..f1e23561ee1 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu21.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/ReportObservationDstu3.java @@ -1,8 +1,8 @@ package ca.uhn.fhir.parser; -import org.hl7.fhir.dstu21.model.BooleanType; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.BooleanType; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.StringType; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; @@ -11,7 +11,7 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.util.ElementUtil; @ResourceDef(name = "Observation", id = "reportobservation") -public class ReportObservationDstu21 extends Observation { +public class ReportObservationDstu3 extends Observation { /** * Each extension is defined in a field. Any valid HAPI Data Type can be used for the field type. Note that the @@ -62,7 +62,7 @@ public class ReportObservationDstu21 extends Observation { } /** Setter for mandatory */ - public ReportObservationDstu21 setMandatory(Boolean isMandatory) { + public ReportObservationDstu3 setMandatory(Boolean isMandatory) { mandatory = new BooleanType(isMandatory); return this; } @@ -76,7 +76,7 @@ public class ReportObservationDstu21 extends Observation { } /** Setter for readOnly */ - public ReportObservationDstu21 setReadOnly(Boolean isReadOnly) { + public ReportObservationDstu3 setReadOnly(Boolean isReadOnly) { readOnly = new BooleanType(isReadOnly); return this; } @@ -90,7 +90,7 @@ public class ReportObservationDstu21 extends Observation { } /** Setter for defaultCursor */ - public ReportObservationDstu21 setDefaultCursor(Boolean isDefaultCursor) { + public ReportObservationDstu3 setDefaultCursor(Boolean isDefaultCursor) { defaultCursor = new BooleanType(isDefaultCursor); return this; } @@ -104,7 +104,7 @@ public class ReportObservationDstu21 extends Observation { } /** Setter for sectionContentId */ - public ReportObservationDstu21 setSectionContentId(String sectionContentId) { + public ReportObservationDstu3 setSectionContentId(String sectionContentId) { this.sectionContentId = new StringType(sectionContentId); return this; } diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/RoundTripDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/RoundTripDstu3Test.java similarity index 95% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/RoundTripDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/RoundTripDstu3Test.java index 2e6745ea349..9fd8d52fa1e 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/RoundTripDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/RoundTripDstu3Test.java @@ -22,9 +22,9 @@ import org.junit.Test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.XmlUtil; -public class RoundTripDstu21Test { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RoundTripDstu21Test.class); - private static FhirContext ourCtx = FhirContext.forDstu2_1(); +public class RoundTripDstu3Test { + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RoundTripDstu3Test.class); + private static FhirContext ourCtx = FhirContext.forDstu3(); @Test public void testIt() { diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java index 8654c22b437..a2295137616 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/XmlParserDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java @@ -29,52 +29,52 @@ import org.custommonkey.xmlunit.XMLUnit; import org.hamcrest.collection.IsEmptyCollection; import org.hamcrest.core.StringContains; import org.hamcrest.text.StringContainsInOrder; -import org.hl7.fhir.dstu21.model.Address.AddressUse; -import org.hl7.fhir.dstu21.model.AllergyIntolerance; -import org.hl7.fhir.dstu21.model.Annotation; -import org.hl7.fhir.dstu21.model.Binary; -import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleLinkComponent; -import org.hl7.fhir.dstu21.model.Bundle.BundleType; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.CodeableConcept; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.Composition; -import org.hl7.fhir.dstu21.model.ConceptMap; -import org.hl7.fhir.dstu21.model.ContactPoint.ContactPointSystem; -import org.hl7.fhir.dstu21.model.DataElement; -import org.hl7.fhir.dstu21.model.DateTimeType; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.DocumentManifest; -import org.hl7.fhir.dstu21.model.Duration; -import org.hl7.fhir.dstu21.model.ElementDefinition; -import org.hl7.fhir.dstu21.model.ElementDefinition.ElementDefinitionBindingComponent; -import org.hl7.fhir.dstu21.model.Encounter; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.Enumerations.DocumentReferenceStatus; -import org.hl7.fhir.dstu21.model.Extension; -import org.hl7.fhir.dstu21.model.HumanName; -import org.hl7.fhir.dstu21.model.HumanName.NameUse; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Identifier; -import org.hl7.fhir.dstu21.model.Identifier.IdentifierUse; -import org.hl7.fhir.dstu21.model.InstantType; -import org.hl7.fhir.dstu21.model.Medication; -import org.hl7.fhir.dstu21.model.MedicationOrder; -import org.hl7.fhir.dstu21.model.MedicationStatement; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationRelationshipType; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Quantity; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.SimpleQuantity; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.UriType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.model.AllergyIntolerance; +import org.hl7.fhir.dstu3.model.Annotation; +import org.hl7.fhir.dstu3.model.Binary; +import org.hl7.fhir.dstu3.model.Bundle; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.CodeableConcept; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.Composition; +import org.hl7.fhir.dstu3.model.ConceptMap; +import org.hl7.fhir.dstu3.model.DataElement; +import org.hl7.fhir.dstu3.model.DateTimeType; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.DocumentManifest; +import org.hl7.fhir.dstu3.model.Duration; +import org.hl7.fhir.dstu3.model.ElementDefinition; +import org.hl7.fhir.dstu3.model.Encounter; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.HumanName; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Identifier; +import org.hl7.fhir.dstu3.model.InstantType; +import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.MedicationOrder; +import org.hl7.fhir.dstu3.model.MedicationStatement; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Quantity; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.SimpleQuantity; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Address.AddressUse; +import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleLinkComponent; +import org.hl7.fhir.dstu3.model.Bundle.BundleType; +import org.hl7.fhir.dstu3.model.ContactPoint.ContactPointSystem; +import org.hl7.fhir.dstu3.model.ElementDefinition.ElementDefinitionBindingComponent; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.dstu3.model.Enumerations.DocumentReferenceStatus; +import org.hl7.fhir.dstu3.model.HumanName.NameUse; +import org.hl7.fhir.dstu3.model.Identifier.IdentifierUse; +import org.hl7.fhir.dstu3.model.Observation.ObservationRelationshipType; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.After; import org.junit.BeforeClass; @@ -88,9 +88,9 @@ import ca.uhn.fhir.parser.IParserErrorHandler.IParseLocation; import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.server.Constants; -public class XmlParserDstu21Test { - private static final FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(XmlParserDstu21Test.class); +public class XmlParserDstu3Test { + private static final FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(XmlParserDstu3Test.class); @Test public void testBundleWithBinary() { @@ -1040,7 +1040,7 @@ public class XmlParserDstu21Test { @Test @Ignore public void testEncodeWithEncodeElements() throws Exception { - String content = IOUtils.toString(XmlParserDstu21Test.class.getResourceAsStream("/bundle-example.xml")); + String content = IOUtils.toString(XmlParserDstu3Test.class.getResourceAsStream("/bundle-example.xml")); Patient patient = new Patient(); patient.addName().addFamily("FAMILY"); @@ -1155,7 +1155,7 @@ public class XmlParserDstu21Test { @Test @Ignore public void testParseAndEncodeBundle() throws Exception { - String content = IOUtils.toString(XmlParserDstu21Test.class.getResourceAsStream("/bundle-example.xml")); + String content = IOUtils.toString(XmlParserDstu3Test.class.getResourceAsStream("/bundle-example.xml")); Bundle parsed = ourCtx.newXmlParser().parseResource(Bundle.class, content); assertEquals("Bundle/example/_history/1", parsed.getIdElement().getValue()); @@ -1190,7 +1190,7 @@ public class XmlParserDstu21Test { @Test @Ignore public void testParseAndEncodeBundleNewStyle() throws Exception { - String content = IOUtils.toString(XmlParserDstu21Test.class.getResourceAsStream("/bundle-example.xml")); + String content = IOUtils.toString(XmlParserDstu3Test.class.getResourceAsStream("/bundle-example.xml")); IParser newXmlParser = ourCtx.newXmlParser(); Bundle parsed = newXmlParser.parseResource(Bundle.class, content); @@ -1606,7 +1606,7 @@ public class XmlParserDstu21Test { */ @Test public void testParseBundleWithLinksOfUnknownRelation() throws Exception { - String input = IOUtils.toString(XmlParserDstu21Test.class.getResourceAsStream("/bundle_orion.xml")); + String input = IOUtils.toString(XmlParserDstu3Test.class.getResourceAsStream("/bundle_orion.xml")); Bundle parsed = ourCtx.newXmlParser().parseResource(Bundle.class, input); BundleLinkComponent link = parsed.getLink().get(0); @@ -1641,7 +1641,7 @@ public class XmlParserDstu21Test { @Test @Ignore public void testParseContained() { - FhirContext c = FhirContext.forDstu2_1(); + FhirContext c = FhirContext.forDstu3(); IParser parser = c.newXmlParser().setPrettyPrint(true); Observation o = new Observation(); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu3Test.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu3Test.java index edc03518dce..6e649826fe3 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/RequestValidatingInterceptorDstu3Test.java @@ -21,10 +21,10 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.AfterClass; import org.junit.Before; @@ -46,12 +46,12 @@ import ca.uhn.fhir.util.PortUtil; import ca.uhn.fhir.validation.IValidatorModule; import ca.uhn.fhir.validation.ResultSeverityEnum; -public class RequestValidatingInterceptorDstu21Test { +public class RequestValidatingInterceptorDstu3Test { private static CloseableHttpClient ourClient; - private static FhirContext ourCtx = FhirContext.forDstu2_1(); + private static FhirContext ourCtx = FhirContext.forDstu3(); private static boolean ourLastRequestWasSearch; - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RequestValidatingInterceptorDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RequestValidatingInterceptorDstu3Test.class); private static int ourPort; private static Server ourServer; diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu3Test.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu3Test.java index 574f293a0c5..3052b8dad3d 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ResponseValidatingInterceptorDstu3Test.java @@ -19,10 +19,10 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.model.Enumerations.AdministrativeGender; -import org.hl7.fhir.dstu21.model.Identifier.IdentifierUse; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.dstu3.model.Identifier.IdentifierUse; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.AfterClass; import org.junit.Before; @@ -40,11 +40,11 @@ import ca.uhn.fhir.util.PortUtil; import ca.uhn.fhir.validation.IValidatorModule; import ca.uhn.fhir.validation.ResultSeverityEnum; -public class ResponseValidatingInterceptorDstu21Test { +public class ResponseValidatingInterceptorDstu3Test { private static CloseableHttpClient ourClient; - private static FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseValidatingInterceptorDstu21Test.class); + private static FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseValidatingInterceptorDstu3Test.class); private static int ourPort; private static Server ourServer; private static RestfulServer ourServlet; diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu3Test.java similarity index 94% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu3Test.java index bb4ff5b9f03..ef8330bd780 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu3Test.java @@ -6,7 +6,7 @@ import static org.junit.Assert.fail; import javax.servlet.ServletException; import org.hamcrest.core.StringContains; -import org.hl7.fhir.dstu21.model.Patient; +import org.hl7.fhir.dstu3.model.Patient; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.Test; @@ -18,9 +18,9 @@ import ca.uhn.fhir.rest.annotation.Operation; import ca.uhn.fhir.rest.annotation.OperationParam; import ca.uhn.fhir.rest.annotation.Read; -public class ServerUsingOldTypesDstu21Test { +public class ServerUsingOldTypesDstu3Test { - private static FhirContext ourCtx = FhirContext.forDstu2_1(); + private static FhirContext ourCtx = FhirContext.forDstu3(); @Test public void testReadProviderString() { diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java similarity index 93% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java index 420b904e1cf..2301da8966f 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java @@ -20,20 +20,20 @@ import java.util.Set; import java.util.zip.GZIPInputStream; import org.apache.commons.io.IOUtils; -import org.hl7.fhir.dstu21.hapi.validation.DefaultProfileValidationSupport; -import org.hl7.fhir.dstu21.hapi.validation.FhirInstanceValidator; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport.CodeValidationResult; -import org.hl7.fhir.dstu21.hapi.validation.ValidationSupportChain; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.Observation; -import org.hl7.fhir.dstu21.model.Observation.ObservationStatus; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptDefinitionComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ConceptSetComponent; -import org.hl7.fhir.dstu21.model.ValueSet.ValueSetExpansionComponent; +import org.hl7.fhir.dstu3.hapi.validation.DefaultProfileValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.hapi.validation.ValidationSupportChain; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport.CodeValidationResult; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.Observation; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptDefinitionComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.After; import org.junit.Before; @@ -48,10 +48,10 @@ import org.mockito.stubbing.Answer; import ca.uhn.fhir.context.FhirContext; -public class FhirInstanceValidatorDstu21Test { +public class FhirInstanceValidatorDstu3Test { - private static FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirInstanceValidatorDstu21Test.class); + private static FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirInstanceValidatorDstu3Test.class); private DefaultProfileValidationSupport myDefaultValidationSupport = new DefaultProfileValidationSupport(); private FhirInstanceValidator myInstanceVal; private IValidationSupport myMockSupport; @@ -115,7 +115,7 @@ public class FhirInstanceValidatorDstu21Test { IBaseResource retVal; String id = (String) theInvocation.getArguments()[2]; if ("Questionnaire/q_jon".equals(id)) { - retVal = ourCtx.newJsonParser().parseResource(IOUtils.toString(FhirInstanceValidatorDstu21Test.class.getResourceAsStream("/q_jon.json"))); + retVal = ourCtx.newJsonParser().parseResource(IOUtils.toString(FhirInstanceValidatorDstu3Test.class.getResourceAsStream("/q_jon.json"))); } else { retVal = myDefaultValidationSupport.fetchResource((FhirContext) theInvocation.getArguments()[0], (Class) theInvocation.getArguments()[1], id); } @@ -227,7 +227,7 @@ public class FhirInstanceValidatorDstu21Test { @Test public void testValidateBigRawJsonResource() throws Exception { - InputStream stream = FhirInstanceValidatorDstu21Test.class.getResourceAsStream("/conformance.json.gz"); + InputStream stream = FhirInstanceValidatorDstu3Test.class.getResourceAsStream("/conformance.json.gz"); stream = new GZIPInputStream(stream); String input = IOUtils.toString(stream); @@ -264,7 +264,7 @@ public class FhirInstanceValidatorDstu21Test { @Test public void testValidateQuestionnaireResponse() throws IOException { - String input = IOUtils.toString(FhirInstanceValidatorDstu21Test.class.getResourceAsStream("/qr_jon.xml")); + String input = IOUtils.toString(FhirInstanceValidatorDstu3Test.class.getResourceAsStream("/qr_jon.xml")); ValidationResult output = myVal.validateWithResult(input); logResultsAndReturnAll(output); @@ -277,7 +277,7 @@ public class FhirInstanceValidatorDstu21Test { @Test @Ignore public void testValidateStructureDefinition() throws IOException { - String input = IOUtils.toString(FhirInstanceValidatorDstu21Test.class.getResourceAsStream("/sdc-questionnaire.profile.xml")); + String input = IOUtils.toString(FhirInstanceValidatorDstu3Test.class.getResourceAsStream("/sdc-questionnaire.profile.xml")); ValidationResult output = myVal.validateWithResult(input); logResultsAndReturnAll(output); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu3Test.java similarity index 92% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu3Test.java index c7f00ced28b..ff54d3d946d 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorDstu3Test.java @@ -13,31 +13,31 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.IOUtils; -import org.hl7.fhir.dstu21.hapi.validation.HapiWorkerContext; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemComponent; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseItemComponent; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseStatus; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.ValueSet; -import org.hl7.fhir.dstu21.utils.IWorkerContext; -import org.hl7.fhir.dstu21.validation.QuestionnaireResponseValidator; -import org.hl7.fhir.dstu21.validation.ValidationMessage; +import org.hl7.fhir.dstu3.hapi.validation.HapiWorkerContext; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseItemComponent; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseStatus; +import org.hl7.fhir.dstu3.utils.IWorkerContext; +import org.hl7.fhir.dstu3.validation.QuestionnaireResponseValidator; +import org.hl7.fhir.dstu3.validation.ValidationMessage; import org.junit.Before; import org.junit.Test; import ca.uhn.fhir.context.FhirContext; -public class QuestionnaireResponseValidatorDstu21Test { - private static final FhirContext ourCtx = FhirContext.forDstu2_1(); +public class QuestionnaireResponseValidatorDstu3Test { + private static final FhirContext ourCtx = FhirContext.forDstu3(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorDstu21Test.class); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorDstu3Test.class); private QuestionnaireResponseValidator myVal; private IWorkerContext myWorkerCtx; @@ -323,7 +323,7 @@ public class QuestionnaireResponseValidatorDstu21Test { // @Test public void validateHealthConnexExample() throws Exception { - String input = IOUtils.toString(QuestionnaireResponseValidatorDstu21Test.class.getResourceAsStream("/questionnaireanswers-0f431c50ddbe4fff8e0dd6b7323625fc.xml")); + String input = IOUtils.toString(QuestionnaireResponseValidatorDstu3Test.class.getResourceAsStream("/questionnaireanswers-0f431c50ddbe4fff8e0dd6b7323625fc.xml")); QuestionnaireResponse qa = ourCtx.newXmlParser().parseResource(QuestionnaireResponse.class, input); ArrayList errors = new ArrayList(); diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu3Test.java similarity index 90% rename from hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu3Test.java index eddd15fbd8a..8e511ba88cc 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/QuestionnaireResponseValidatorIntegrationDstu3Test.java @@ -8,26 +8,26 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.hl7.fhir.dstu21.hapi.validation.FhirQuestionnaireResponseValidator; -import org.hl7.fhir.dstu21.hapi.validation.IValidationSupport; -import org.hl7.fhir.dstu21.model.Coding; -import org.hl7.fhir.dstu21.model.IntegerType; -import org.hl7.fhir.dstu21.model.Questionnaire; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemComponent; -import org.hl7.fhir.dstu21.model.Questionnaire.QuestionnaireItemType; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse; -import org.hl7.fhir.dstu21.model.QuestionnaireResponse.QuestionnaireResponseStatus; -import org.hl7.fhir.dstu21.model.Reference; -import org.hl7.fhir.dstu21.model.StringType; -import org.hl7.fhir.dstu21.model.ValueSet; +import org.hl7.fhir.dstu3.hapi.validation.FhirQuestionnaireResponseValidator; +import org.hl7.fhir.dstu3.hapi.validation.IValidationSupport; +import org.hl7.fhir.dstu3.model.Coding; +import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.Questionnaire; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse; +import org.hl7.fhir.dstu3.model.Reference; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.ValueSet; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemComponent; +import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType; +import org.hl7.fhir.dstu3.model.QuestionnaireResponse.QuestionnaireResponseStatus; import org.junit.Before; import org.junit.Test; import ca.uhn.fhir.context.FhirContext; -public class QuestionnaireResponseValidatorIntegrationDstu21Test { - private static final FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorIntegrationDstu21Test.class); +public class QuestionnaireResponseValidatorIntegrationDstu3Test { + private static final FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorIntegrationDstu3Test.class); private IValidationSupport myResourceLoaderMock; private FhirValidator myVal; diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/PatientResourceProvider.java b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/PatientResourceProvider.java similarity index 97% rename from hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/PatientResourceProvider.java rename to hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/PatientResourceProvider.java index 0534f923f60..e0221b809d3 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/PatientResourceProvider.java +++ b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/PatientResourceProvider.java @@ -1,11 +1,11 @@ -package org.hl7.fhir.dstu21.hapi.rest.server; +package org.hl7.fhir.dstu3.hapi.rest.server; import java.util.Set; -import org.hl7.fhir.dstu21.model.Organization; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.Practitioner; +import org.hl7.fhir.dstu3.model.Organization; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.Practitioner; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProviderDstu21Test.java b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProviderDstu3Test.java similarity index 96% rename from hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProviderDstu21Test.java rename to hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProviderDstu3Test.java index 10b2eda9077..d7957a98c38 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/org/hl7/fhir/dstu21/hapi/rest/server/ServerConformanceProviderDstu21Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerConformanceProviderDstu3Test.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.dstu21.hapi.rest.server; +package org.hl7.fhir.dstu3.hapi.rest.server; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; @@ -16,19 +16,20 @@ import java.util.Set; import javax.servlet.ServletConfig; import javax.servlet.http.HttpServletRequest; -import org.hl7.fhir.dstu21.model.Conformance; -import org.hl7.fhir.dstu21.model.Conformance.ConditionalDeleteStatus; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceSearchParamComponent; -import org.hl7.fhir.dstu21.model.Conformance.SystemRestfulInteraction; -import org.hl7.fhir.dstu21.model.Conformance.TypeRestfulInteraction; -import org.hl7.fhir.dstu21.model.DateType; -import org.hl7.fhir.dstu21.model.DiagnosticReport; -import org.hl7.fhir.dstu21.model.IdType; -import org.hl7.fhir.dstu21.model.OperationDefinition; -import org.hl7.fhir.dstu21.model.Patient; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.hapi.rest.server.ServerConformanceProvider; +import org.hl7.fhir.dstu3.model.Conformance; +import org.hl7.fhir.dstu3.model.DateType; +import org.hl7.fhir.dstu3.model.DiagnosticReport; +import org.hl7.fhir.dstu3.model.IdType; +import org.hl7.fhir.dstu3.model.OperationDefinition; +import org.hl7.fhir.dstu3.model.Patient; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Conformance.ConditionalDeleteStatus; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceSearchParamComponent; +import org.hl7.fhir.dstu3.model.Conformance.SystemRestfulInteraction; +import org.hl7.fhir.dstu3.model.Conformance.TypeRestfulInteraction; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.Test; @@ -64,10 +65,10 @@ import ca.uhn.fhir.rest.server.ResourceBinding; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.validation.ValidationResult; -public class ServerConformanceProviderDstu21Test { +public class ServerConformanceProviderDstu3Test { - private static FhirContext ourCtx = FhirContext.forDstu2_1(); - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ServerConformanceProviderDstu21Test.class); + private static FhirContext ourCtx = FhirContext.forDstu3(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ServerConformanceProviderDstu3Test.class); private HttpServletRequest createHttpServletRequest() { HttpServletRequest req = mock(HttpServletRequest.class); diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/bundle_orion.xml b/hapi-fhir-structures-dstu3/src/test/resources/bundle_orion.xml similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/bundle_orion.xml rename to hapi-fhir-structures-dstu3/src/test/resources/bundle_orion.xml diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/conformance.json.gz b/hapi-fhir-structures-dstu3/src/test/resources/conformance.json.gz similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/conformance.json.gz rename to hapi-fhir-structures-dstu3/src/test/resources/conformance.json.gz diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/logback-test.xml b/hapi-fhir-structures-dstu3/src/test/resources/logback-test.xml similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/logback-test.xml rename to hapi-fhir-structures-dstu3/src/test/resources/logback-test.xml diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/medicationstatement_invalidelement.xml b/hapi-fhir-structures-dstu3/src/test/resources/medicationstatement_invalidelement.xml similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/medicationstatement_invalidelement.xml rename to hapi-fhir-structures-dstu3/src/test/resources/medicationstatement_invalidelement.xml diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/q_jon.json b/hapi-fhir-structures-dstu3/src/test/resources/q_jon.json similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/q_jon.json rename to hapi-fhir-structures-dstu3/src/test/resources/q_jon.json diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/qr_jon.xml b/hapi-fhir-structures-dstu3/src/test/resources/qr_jon.xml similarity index 99% rename from hapi-fhir-structures-dstu2.1/src/test/resources/qr_jon.xml rename to hapi-fhir-structures-dstu3/src/test/resources/qr_jon.xml index 6b13ca19f7b..6379703c20e 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/resources/qr_jon.xml +++ b/hapi-fhir-structures-dstu3/src/test/resources/qr_jon.xml @@ -7,10 +7,10 @@ - + - + diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml b/hapi-fhir-structures-dstu3/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml rename to hapi-fhir-structures-dstu3/src/test/resources/questionnaire-sdc-profile-example-ussg-fht.xml diff --git a/hapi-fhir-structures-dstu2.1/src/test/resources/smart-conf.xml b/hapi-fhir-structures-dstu3/src/test/resources/smart-conf.xml similarity index 100% rename from hapi-fhir-structures-dstu2.1/src/test/resources/smart-conf.xml rename to hapi-fhir-structures-dstu3/src/test/resources/smart-conf.xml diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 67e0542b0e4..d3226ac0ae7 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -44,6 +44,11 @@ hapi-fhir-structures-dstu2 1.4-SNAPSHOT + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + 1.4-SNAPSHOT + org.thymeleaf diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/BaseController.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/BaseController.java index fd2018f2bea..035c3d9456a 100644 --- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/BaseController.java +++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/BaseController.java @@ -28,10 +28,10 @@ import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.ContentType; import org.apache.http.entity.HttpEntityWrapper; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceComponent; -import org.hl7.fhir.dstu21.model.DecimalType; -import org.hl7.fhir.dstu21.model.Extension; +import org.hl7.fhir.dstu3.model.DecimalType; +import org.hl7.fhir.dstu3.model.Extension; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceComponent; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IDomainResource; @@ -303,8 +303,8 @@ public class BaseController { return loadAndAddConfDstu1(theServletRequest, theRequest, theModel); case DSTU2: return loadAndAddConfDstu2(theServletRequest, theRequest, theModel); - case DSTU2_1: - return loadAndAddConfDstu21(theServletRequest, theRequest, theModel); + case DSTU3: + return loadAndAddConfDstu3(theServletRequest, theRequest, theModel); } throw new IllegalStateException("Unknown version: " + theRequest.getFhirVersion(myConfig)); } @@ -429,17 +429,17 @@ public class BaseController { return conformance; } - private IBaseResource loadAndAddConfDstu21(HttpServletRequest theServletRequest, final HomeRequest theRequest, final ModelMap theModel) { + private IBaseResource loadAndAddConfDstu3(HttpServletRequest theServletRequest, final HomeRequest theRequest, final ModelMap theModel) { CaptureInterceptor interceptor = new CaptureInterceptor(); GenericClient client = theRequest.newClient(theServletRequest, getContext(theRequest), myConfig, interceptor); - org.hl7.fhir.dstu21.model.Conformance conformance; + org.hl7.fhir.dstu3.model.Conformance conformance; try { - conformance = client.fetchConformance().ofType(org.hl7.fhir.dstu21.model.Conformance.class).execute(); + conformance = client.fetchConformance().ofType(org.hl7.fhir.dstu3.model.Conformance.class).execute(); } catch (Exception e) { ourLog.warn("Failed to load conformance statement", e); theModel.put("errorMsg", "Failed to load conformance statement, error was: " + e.toString()); - conformance = new org.hl7.fhir.dstu21.model.Conformance(); + conformance = new org.hl7.fhir.dstu3.model.Conformance(); } theModel.put("jsonEncodedConf", getContext(theRequest).newJsonParser().encodeResourceToString(conformance)); diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java index d8bfecdb5cd..5736ea121b8 100644 --- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java +++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java @@ -17,11 +17,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.dstu21.model.CodeType; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceComponent; -import org.hl7.fhir.dstu21.model.Conformance.ConformanceRestResourceSearchParamComponent; -import org.hl7.fhir.dstu21.model.StringType; +import org.hl7.fhir.dstu3.model.CodeType; +import org.hl7.fhir.dstu3.model.StringType; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceComponent; +import org.hl7.fhir.dstu3.model.Conformance.ConformanceRestResourceSearchParamComponent; import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; import org.springframework.ui.ModelMap; @@ -320,8 +320,8 @@ public class Controller extends BaseController { case DSTU2: haveSearchParams = extractSearchParamsDstu2(conformance, resourceName, includes, revIncludes, sortParams, queries, haveSearchParams, queryIncludes); break; - case DSTU2_1: - haveSearchParams = extractSearchParamsDstu21(conformance, resourceName, includes, revIncludes, sortParams, queries, haveSearchParams, queryIncludes); + case DSTU3: + haveSearchParams = extractSearchParamsDstu3(conformance, resourceName, includes, revIncludes, sortParams, queries, haveSearchParams, queryIncludes); break; default: throw new IllegalStateException("Unknown FHIR version: " + theRequest.getFhirVersion(myConfig)); @@ -775,9 +775,9 @@ public class Controller extends BaseController { return haveSearchParams; } - private boolean extractSearchParamsDstu21(IBaseResource theConformance, String resourceName, TreeSet includes, TreeSet theRevIncludes, TreeSet sortParams, List queries, boolean haveSearchParams, + private boolean extractSearchParamsDstu3(IBaseResource theConformance, String resourceName, TreeSet includes, TreeSet theRevIncludes, TreeSet sortParams, List queries, boolean haveSearchParams, List> queryIncludes) { - org.hl7.fhir.dstu21.model.Conformance conformance = (org.hl7.fhir.dstu21.model.Conformance) theConformance; + org.hl7.fhir.dstu3.model.Conformance conformance = (org.hl7.fhir.dstu3.model.Conformance) theConformance; for (ConformanceRestComponent nextRest : conformance.getRest()) { for (ConformanceRestResourceComponent nextRes : nextRest.getResource()) { if (nextRes.getTypeElement().getValue().equals(resourceName)) { @@ -787,7 +787,7 @@ public class Controller extends BaseController { } } for (ConformanceRestResourceSearchParamComponent next : nextRes.getSearchParam()) { - if (next.getTypeElement().getValue() != org.hl7.fhir.dstu21.model.Enumerations.SearchParamType.COMPOSITE) { + if (next.getTypeElement().getValue() != org.hl7.fhir.dstu3.model.Enumerations.SearchParamType.COMPOSITE) { sortParams.add(next.getNameElement().getValue()); } } @@ -798,7 +798,7 @@ public class Controller extends BaseController { // It's a different resource from the one we're searching, so // scan for revinclude candidates for (ConformanceRestResourceSearchParamComponent next : nextRes.getSearchParam()) { - if (next.getTypeElement().getValue() == org.hl7.fhir.dstu21.model.Enumerations.SearchParamType.REFERENCE) { + if (next.getTypeElement().getValue() == org.hl7.fhir.dstu3.model.Enumerations.SearchParamType.REFERENCE) { for (CodeType nextTargetType : next.getTarget()) { if (nextTargetType.getValue().equals(resourceName)) { theRevIncludes.add(nextRes.getTypeElement().getValue() + ":" + next.getName()); diff --git a/hapi-fhir-validation-resources-dstu2.1/.gitignore b/hapi-fhir-validation-resources-dstu3/.gitignore similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/.gitignore rename to hapi-fhir-validation-resources-dstu3/.gitignore diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml similarity index 84% rename from hapi-fhir-validation-resources-dstu2.1/pom.xml rename to hapi-fhir-validation-resources-dstu3/pom.xml index 7e23ecbdb37..e12f73b66b2 100644 --- a/hapi-fhir-validation-resources-dstu2.1/pom.xml +++ b/hapi-fhir-validation-resources-dstu3/pom.xml @@ -8,10 +8,10 @@ ../hapi-deployable-pom/pom.xml - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 jar - HAPI FHIR - Validation Resources (DSTU2.1) + HAPI FHIR - Validation Resources (DSTU3) diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/account.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/account.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/account.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/account.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/address.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/address.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/address.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/address.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/age.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/age.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/age.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/age.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/allergyintolerance.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/allergyintolerance.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/allergyintolerance.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/allergyintolerance.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/annotation.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/annotation.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/annotation.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/annotation.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/appointment.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/appointment.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/appointment.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/appointment.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/appointmentresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/appointmentresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/appointmentresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/appointmentresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/attachment.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/attachment.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/attachment.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/attachment.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/auditevent.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/auditevent.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/auditevent.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/auditevent.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/backboneelement.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/backboneelement.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/backboneelement.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/backboneelement.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/basic.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/basic.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/basic.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/basic.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/binary.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/binary.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/binary.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/binary.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/bodysite.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/bodysite.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/bodysite.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/bodysite.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/boolean.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/boolean.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/boolean.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/boolean.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/bundle.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/bundle.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/bundle.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/bundle.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/careplan.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/careplan.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/careplan.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/careplan.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/cholesterol.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/cholesterol.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/cholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/cholesterol.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/claim.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/claim.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/claim.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/claim.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/claimresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/claimresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/claimresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/claimresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/clinicaldocument.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/clinicaldocument.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/clinicaldocument.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/clinicaldocument.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/clinicalimpression.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/clinicalimpression.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/clinicalimpression.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/clinicalimpression.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/code.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/code.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/code.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/code.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/codeableconcept.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/codeableconcept.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/codeableconcept.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/codeableconcept.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/coding.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/coding.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/coding.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/coding.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/communication.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/communication.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/communication.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/communication.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/communicationrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/communicationrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/communicationrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/communicationrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/composition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/composition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/composition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/composition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/conceptmap.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/conceptmap.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/conceptmap.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/conceptmap.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/condition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/condition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/condition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/condition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/conformance.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/conformance.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/conformance.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/conformance.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/consentdirective.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/consentdirective.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/consentdirective.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/consentdirective.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/contactpoint.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/contactpoint.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/contactpoint.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/contactpoint.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/contract.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/contract.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/contract.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/contract.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/count.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/count.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/count.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/count.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/coverage.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/coverage.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/coverage.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/coverage.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/dataelement.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/dataelement.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/dataelement.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/dataelement.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/date.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/date.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/date.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/date.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/datetime.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/datetime.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/datetime.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/datetime.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decimal.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decimal.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decimal.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decimal.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decisionsupportrule.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decisionsupportrule.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decisionsupportrule.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decisionsupportrule.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decisionsupportservicemodule.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decisionsupportservicemodule.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/decisionsupportservicemodule.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/decisionsupportservicemodule.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/detectedissue.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/detectedissue.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/detectedissue.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/detectedissue.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/device.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/device.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/device.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/device.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicecomponent.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicecomponent.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicecomponent.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicecomponent.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicemetric.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicemetric.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicemetric.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicemetric.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicemetricobservation.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicemetricobservation.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/devicemetricobservation.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/devicemetricobservation.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/deviceuserequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/deviceuserequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/deviceuserequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/deviceuserequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/deviceusestatement.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/deviceusestatement.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/deviceusestatement.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/deviceusestatement.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/diagnosticorder.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/diagnosticorder.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/diagnosticorder.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/diagnosticorder.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/diagnosticreport.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/diagnosticreport.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/diagnosticreport.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/diagnosticreport.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/distance.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/distance.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/distance.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/distance.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/documentmanifest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/documentmanifest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/documentmanifest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/documentmanifest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/documentreference.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/documentreference.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/documentreference.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/documentreference.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/domainresource.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/domainresource.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/domainresource.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/domainresource.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/duration.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/duration.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/duration.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/duration.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/element.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/element.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/element.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/element.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/elementdefinition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/elementdefinition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/elementdefinition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/elementdefinition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/eligibilityrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/eligibilityrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/eligibilityrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/eligibilityrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/eligibilityresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/eligibilityresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/eligibilityresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/eligibilityresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/encounter.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/encounter.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/encounter.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/encounter.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/enrollmentrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/enrollmentrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/enrollmentrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/enrollmentrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/enrollmentresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/enrollmentresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/enrollmentresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/enrollmentresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/episodeofcare.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/episodeofcare.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/episodeofcare.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/episodeofcare.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/expansionprofile.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/expansionprofile.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/expansionprofile.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/expansionprofile.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/explanationofbenefit.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/explanationofbenefit.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/explanationofbenefit.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/explanationofbenefit.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/extension.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/extension.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/extension.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/extension.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/familymemberhistory.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/familymemberhistory.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/familymemberhistory.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/familymemberhistory.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/flag.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/flag.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/flag.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/flag.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/genetics.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/genetics.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/genetics.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/genetics.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/goal.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/goal.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/goal.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/goal.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/group.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/group.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/group.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/group.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/guidancerequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/guidancerequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/guidancerequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/guidancerequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/guidanceresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/guidanceresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/guidanceresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/guidanceresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/hdlcholesterol.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/hdlcholesterol.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/hdlcholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/hdlcholesterol.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/healthcareservice.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/healthcareservice.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/healthcareservice.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/healthcareservice.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/hlaresult.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/hlaresult.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/hlaresult.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/hlaresult.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/humanname.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/humanname.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/humanname.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/humanname.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/id.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/id.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/id.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/id.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/identifier.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/identifier.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/identifier.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/identifier.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/imagingobjectselection.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/imagingobjectselection.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/imagingobjectselection.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/imagingobjectselection.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/imagingstudy.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/imagingstudy.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/imagingstudy.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/imagingstudy.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/immunization.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/immunization.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/immunization.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/immunization.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/immunizationrecommendation.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/immunizationrecommendation.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/immunizationrecommendation.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/immunizationrecommendation.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/implementationguide.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/implementationguide.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/implementationguide.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/implementationguide.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/instant.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/instant.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/instant.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/instant.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/integer.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/integer.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/integer.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/integer.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/ldlcholesterol.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/ldlcholesterol.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/ldlcholesterol.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/ldlcholesterol.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/library.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/library.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/library.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/library.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/linkage.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/linkage.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/linkage.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/linkage.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/lipidprofile.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/lipidprofile.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/lipidprofile.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/lipidprofile.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/list.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/list.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/list.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/list.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/location.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/location.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/location.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/location.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/markdown.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/markdown.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/markdown.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/markdown.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/measure.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/measure.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/measure.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/measure.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/measurereport.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/measurereport.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/measurereport.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/measurereport.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/media.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/media.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/media.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/media.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medication.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medication.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medication.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medication.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationadministration.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationadministration.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationadministration.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationadministration.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationdispense.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationdispense.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationdispense.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationdispense.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationorder.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationorder.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationorder.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationorder.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationstatement.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationstatement.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/medicationstatement.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/medicationstatement.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/messageheader.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/messageheader.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/messageheader.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/messageheader.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/meta.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/meta.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/meta.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/meta.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/moduledefinition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/moduledefinition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/moduledefinition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/moduledefinition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/modulemetadata.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/modulemetadata.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/modulemetadata.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/modulemetadata.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/money.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/money.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/money.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/money.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/namingsystem.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/namingsystem.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/namingsystem.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/namingsystem.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/narrative.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/narrative.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/narrative.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/narrative.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/nutritionorder.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/nutritionorder.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/nutritionorder.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/nutritionorder.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/observation.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/observation.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/observation.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/observation.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/observationforgenetics.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/observationforgenetics.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/observationforgenetics.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/observationforgenetics.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/oid.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/oid.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/oid.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/oid.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/operationdefinition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/operationdefinition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/operationdefinition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/operationdefinition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/operationoutcome.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/operationoutcome.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/operationoutcome.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/operationoutcome.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/order.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/order.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/order.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/order.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderforgenetics.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderforgenetics.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderforgenetics.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderforgenetics.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderset.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderset.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/orderset.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/orderset.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/organization.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/organization.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/organization.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/organization.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/parameters.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/parameters.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/parameters.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/parameters.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/patient.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/patient.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/patient.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/patient.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/paymentnotice.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/paymentnotice.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/paymentnotice.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/paymentnotice.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/paymentreconciliation.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/paymentreconciliation.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/paymentreconciliation.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/paymentreconciliation.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/period.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/period.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/period.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/period.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/person.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/person.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/person.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/person.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/positiveint.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/positiveint.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/positiveint.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/positiveint.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/practitioner.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/practitioner.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/practitioner.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/practitioner.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/procedure.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/procedure.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/procedure.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/procedure.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/procedurerequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/procedurerequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/procedurerequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/procedurerequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/processrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/processrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/processrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/processrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/processresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/processresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/processresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/processresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/provenance.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/provenance.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/provenance.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/provenance.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/quantity.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/quantity.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/quantity.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/quantity.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/questionnaire.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/questionnaire.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/questionnaire.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/questionnaire.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/questionnaireresponse.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/questionnaireresponse.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/questionnaireresponse.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/questionnaireresponse.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/range.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/range.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/range.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/range.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/ratio.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/ratio.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/ratio.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/ratio.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/reference.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/reference.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/reference.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/reference.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/referralrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/referralrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/referralrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/referralrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/relatedperson.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/relatedperson.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/relatedperson.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/relatedperson.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/reportforgenetics.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/reportforgenetics.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/reportforgenetics.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/reportforgenetics.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/resource.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/resource.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/resource.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/resource.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/riskassessment.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/riskassessment.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/riskassessment.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/riskassessment.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/sampleddata.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/sampleddata.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/sampleddata.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/sampleddata.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/schedule.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/schedule.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/schedule.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/schedule.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/searchparameter.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/searchparameter.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/searchparameter.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/searchparameter.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/sequence.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/sequence.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/sequence.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/sequence.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/shareablevalueset.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/shareablevalueset.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/shareablevalueset.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/shareablevalueset.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/signature.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/signature.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/signature.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/signature.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/simplequantity.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/simplequantity.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/simplequantity.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/simplequantity.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/slot.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/slot.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/slot.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/slot.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/specimen.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/specimen.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/specimen.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/specimen.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/string.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/string.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/string.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/string.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/structuredefinition.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/structuredefinition.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/structuredefinition.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/structuredefinition.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/subscription.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/subscription.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/subscription.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/subscription.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/substance.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/substance.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/substance.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/substance.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/supplydelivery.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/supplydelivery.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/supplydelivery.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/supplydelivery.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/supplyrequest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/supplyrequest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/supplyrequest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/supplyrequest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/testscript.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/testscript.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/testscript.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/testscript.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/time.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/time.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/time.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/time.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/timing.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/timing.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/timing.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/timing.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/triglyceride.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/triglyceride.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/triglyceride.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/triglyceride.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/unsignedint.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/unsignedint.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/unsignedint.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/unsignedint.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/uri.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/uri.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/uri.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/uri.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/uuid.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/uuid.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/uuid.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/uuid.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/valueset.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/valueset.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/valueset.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/valueset.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/visionprescription.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/visionprescription.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/visionprescription.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/visionprescription.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/xdsdocumentmanifest.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/xdsdocumentmanifest.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/xdsdocumentmanifest.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/xdsdocumentmanifest.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/xdsdocumentreference.profile.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/xdsdocumentreference.profile.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/xdsdocumentreference.profile.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/profile/xdsdocumentreference.profile.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/account.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/account.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/account.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/account.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/allergyintolerance.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/allergyintolerance.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/allergyintolerance.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/allergyintolerance.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/appointment.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/appointment.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/appointment.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/appointment.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/appointmentresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/appointmentresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/appointmentresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/appointmentresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/auditevent.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/auditevent.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/auditevent.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/auditevent.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/basic.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/basic.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/basic.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/basic.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/binary.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/binary.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/binary.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/binary.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/bodysite.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/bodysite.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/bodysite.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/bodysite.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/bundle.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/bundle.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/bundle.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/bundle.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/careplan.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/careplan.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/careplan.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/careplan.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/cholesterol.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/cholesterol.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/cholesterol.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/cholesterol.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/claim.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/claim.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/claim.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/claim.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/claimresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/claimresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/claimresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/claimresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/clinicaldocument.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/clinicaldocument.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/clinicaldocument.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/clinicaldocument.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/clinicalimpression.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/clinicalimpression.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/clinicalimpression.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/clinicalimpression.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/communication.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/communication.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/communication.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/communication.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/communicationrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/communicationrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/communicationrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/communicationrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/composition.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/composition.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/composition.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/composition.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/conceptmap.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/conceptmap.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/conceptmap.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/conceptmap.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/condition.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/condition.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/condition.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/condition.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/conformance.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/conformance.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/conformance.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/conformance.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/consentdirective.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/consentdirective.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/consentdirective.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/consentdirective.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/contract.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/contract.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/contract.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/contract.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/coverage.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/coverage.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/coverage.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/coverage.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/dataelement.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/dataelement.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/dataelement.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/dataelement.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/decisionsupportrule.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/decisionsupportrule.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/decisionsupportrule.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/decisionsupportrule.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/decisionsupportservicemodule.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/decisionsupportservicemodule.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/decisionsupportservicemodule.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/decisionsupportservicemodule.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/detectedissue.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/detectedissue.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/detectedissue.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/detectedissue.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/device.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/device.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/device.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/device.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicecomponent.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicecomponent.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicecomponent.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicecomponent.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicemetric.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicemetric.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicemetric.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicemetric.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicemetricobservation.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicemetricobservation.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/devicemetricobservation.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/devicemetricobservation.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/deviceuserequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/deviceuserequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/deviceuserequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/deviceuserequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/deviceusestatement.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/deviceusestatement.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/deviceusestatement.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/deviceusestatement.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/diagnosticorder.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/diagnosticorder.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/diagnosticorder.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/diagnosticorder.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/diagnosticreport.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/diagnosticreport.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/diagnosticreport.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/diagnosticreport.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/documentmanifest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/documentmanifest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/documentmanifest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/documentmanifest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/documentreference.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/documentreference.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/documentreference.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/documentreference.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/eligibilityrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/eligibilityrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/eligibilityrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/eligibilityrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/eligibilityresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/eligibilityresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/eligibilityresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/eligibilityresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/encounter.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/encounter.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/encounter.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/encounter.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/enrollmentrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/enrollmentrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/enrollmentrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/enrollmentrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/enrollmentresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/enrollmentresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/enrollmentresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/enrollmentresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/episodeofcare.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/episodeofcare.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/episodeofcare.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/episodeofcare.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/expansionprofile.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/expansionprofile.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/expansionprofile.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/expansionprofile.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/explanationofbenefit.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/explanationofbenefit.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/explanationofbenefit.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/explanationofbenefit.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/familymemberhistory.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/familymemberhistory.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/familymemberhistory.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/familymemberhistory.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-single.xsd b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/fhir-single.xsd similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-single.xsd rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/fhir-single.xsd diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-xhtml.xsd b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/fhir-xhtml.xsd similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-xhtml.xsd rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/fhir-xhtml.xsd diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/flag.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/flag.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/flag.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/flag.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/genetics.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/genetics.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/genetics.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/genetics.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/goal.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/goal.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/goal.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/goal.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/group.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/group.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/group.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/group.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/guidancerequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/guidancerequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/guidancerequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/guidancerequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/guidanceresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/guidanceresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/guidanceresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/guidanceresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/hdlcholesterol.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/hdlcholesterol.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/hdlcholesterol.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/hdlcholesterol.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/healthcareservice.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/healthcareservice.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/healthcareservice.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/healthcareservice.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/hlaresult.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/hlaresult.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/hlaresult.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/hlaresult.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/imagingobjectselection.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/imagingobjectselection.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/imagingobjectselection.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/imagingobjectselection.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/imagingstudy.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/imagingstudy.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/imagingstudy.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/imagingstudy.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/immunization.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/immunization.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/immunization.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/immunization.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/immunizationrecommendation.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/immunizationrecommendation.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/immunizationrecommendation.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/immunizationrecommendation.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/implementationguide.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/implementationguide.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/implementationguide.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/implementationguide.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/ldlcholesterol.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/ldlcholesterol.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/ldlcholesterol.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/ldlcholesterol.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/library.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/library.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/library.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/library.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/linkage.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/linkage.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/linkage.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/linkage.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/lipidprofile.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/lipidprofile.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/lipidprofile.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/lipidprofile.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/list.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/list.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/list.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/list.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/location.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/location.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/location.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/location.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/measure.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/measure.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/measure.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/measure.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/measurereport.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/measurereport.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/measurereport.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/measurereport.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/media.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/media.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/media.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/media.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medication.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medication.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medication.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medication.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationadministration.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationadministration.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationadministration.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationadministration.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationdispense.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationdispense.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationdispense.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationdispense.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationorder.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationorder.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationorder.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationorder.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationstatement.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationstatement.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/medicationstatement.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/medicationstatement.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/messageheader.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/messageheader.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/messageheader.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/messageheader.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/moduledefinition.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/moduledefinition.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/moduledefinition.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/moduledefinition.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/modulemetadata.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/modulemetadata.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/modulemetadata.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/modulemetadata.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/namingsystem.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/namingsystem.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/namingsystem.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/namingsystem.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/nutritionorder.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/nutritionorder.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/nutritionorder.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/nutritionorder.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/observation.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/observation.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/observation.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/observation.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/observationforgenetics.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/observationforgenetics.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/observationforgenetics.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/observationforgenetics.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/operationdefinition.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/operationdefinition.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/operationdefinition.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/operationdefinition.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/operationoutcome.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/operationoutcome.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/operationoutcome.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/operationoutcome.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/order.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/order.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/order.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/order.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderforgenetics.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderforgenetics.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderforgenetics.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderforgenetics.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderset.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderset.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/orderset.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/orderset.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/organization.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/organization.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/organization.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/organization.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/patient.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/patient.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/patient.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/patient.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/paymentnotice.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/paymentnotice.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/paymentnotice.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/paymentnotice.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/paymentreconciliation.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/paymentreconciliation.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/paymentreconciliation.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/paymentreconciliation.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/person.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/person.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/person.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/person.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/practitioner.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/practitioner.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/practitioner.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/practitioner.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/procedure.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/procedure.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/procedure.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/procedure.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/procedurerequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/procedurerequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/procedurerequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/procedurerequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/processrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/processrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/processrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/processrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/processresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/processresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/processresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/processresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/provenance.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/provenance.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/provenance.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/provenance.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/questionnaire.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/questionnaire.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/questionnaire.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/questionnaire.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/questionnaireresponse.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/questionnaireresponse.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/questionnaireresponse.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/questionnaireresponse.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/referralrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/referralrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/referralrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/referralrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/relatedperson.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/relatedperson.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/relatedperson.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/relatedperson.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/reportforgenetics.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/reportforgenetics.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/reportforgenetics.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/reportforgenetics.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/riskassessment.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/riskassessment.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/riskassessment.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/riskassessment.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/schedule.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/schedule.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/schedule.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/schedule.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/searchparameter.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/searchparameter.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/searchparameter.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/searchparameter.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/sequence.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/sequence.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/sequence.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/sequence.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/shareablevalueset.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/shareablevalueset.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/shareablevalueset.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/shareablevalueset.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/slot.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/slot.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/slot.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/slot.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/specimen.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/specimen.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/specimen.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/specimen.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/structuredefinition.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/structuredefinition.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/structuredefinition.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/structuredefinition.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/subscription.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/subscription.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/subscription.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/subscription.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/substance.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/substance.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/substance.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/substance.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/supplydelivery.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/supplydelivery.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/supplydelivery.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/supplydelivery.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/supplyrequest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/supplyrequest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/supplyrequest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/supplyrequest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/testscript.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/testscript.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/testscript.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/testscript.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/triglyceride.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/triglyceride.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/triglyceride.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/triglyceride.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/valueset.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/valueset.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/valueset.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/valueset.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/visionprescription.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/visionprescription.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/visionprescription.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/visionprescription.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xdsdocumentmanifest.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xdsdocumentmanifest.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xdsdocumentmanifest.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xdsdocumentmanifest.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xdsdocumentreference.sch b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xdsdocumentreference.sch similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xdsdocumentreference.sch rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xdsdocumentreference.sch diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xml.xsd b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xml.xsd similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/xml.xsd rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/schema/xml.xsd diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/v2-tables.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/v2-tables.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/v2-tables.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/v2-tables.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/v3-codesystems.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/v3-codesystems.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/v3-codesystems.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/v3-codesystems.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/valuesets.xml b/hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml similarity index 100% rename from hapi-fhir-validation-resources-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/valueset/valuesets.xml rename to hapi-fhir-validation-resources-dstu3/src/main/resources/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml diff --git a/hapi-tinder-plugin/.classpath b/hapi-tinder-plugin/.classpath index 2271082efec..fafda0399f3 100644 --- a/hapi-tinder-plugin/.classpath +++ b/hapi-tinder-plugin/.classpath @@ -34,6 +34,5 @@ - diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 2fe12b1f69f..65c0ac4c762 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -41,7 +41,7 @@ @@ -57,7 +57,7 @@ ca.uhn.hapi.fhir - hapi-fhir-validation-resources-dstu2.1 + hapi-fhir-validation-resources-dstu3 1.4-SNAPSHOT diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/AgeDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java similarity index 89% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/AgeDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java index 57d830f0985..35216b9ddfc 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/AgeDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/AgeDt.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.QuantityDt; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; import ca.uhn.fhir.model.primitive.IntegerDt; /* diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/BoundCodeableConceptDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java similarity index 96% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/BoundCodeableConceptDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java index e0f5f671a8e..a76446c93bf 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/BoundCodeableConceptDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/BoundCodeableConceptDt.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; /* * #%L @@ -31,8 +31,8 @@ import org.apache.commons.lang3.Validate; import ca.uhn.fhir.model.api.IBoundCodeableConcept; import ca.uhn.fhir.model.api.IValueSetEnumBinder; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu21.composite.CodingDt; +import ca.uhn.fhir.model.dstu3.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu3.composite.CodingDt; @DatatypeDef(name = "CodeableConcept", isSpecialization = true) public class BoundCodeableConceptDt> extends CodeableConceptDt implements IBoundCodeableConcept { diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodeableConceptDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodeableConceptDt.java similarity index 99% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodeableConceptDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodeableConceptDt.java index 97746c08fa0..10c148ceb9d 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodeableConceptDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodeableConceptDt.java @@ -14,7 +14,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import java.util.List; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodingDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodingDt.java similarity index 99% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodingDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodingDt.java index 254eb32b01e..2cd41a2461e 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CodingDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CodingDt.java @@ -14,7 +14,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import java.util.List; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ContainedDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java similarity index 97% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ContainedDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java index 3f3f2f2322d..d19e81d843e 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ContainedDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ContainedDt.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CountDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java similarity index 89% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CountDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java index 4b279ecbd58..b8443caa1dd 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/CountDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/CountDt.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.QuantityDt; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DistanceDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java similarity index 89% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DistanceDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java index 398f71ca1f1..e1a3b3e5384 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DistanceDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DistanceDt.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.QuantityDt; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; import ca.uhn.fhir.model.primitive.IntegerDt; /* diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DurationDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java similarity index 89% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DurationDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java index 6d261f2e7d2..a7447f3e15f 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/DurationDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/DurationDt.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.QuantityDt; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/MoneyDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java similarity index 89% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/MoneyDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java index d04b8404913..45dcb6810f1 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/MoneyDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/MoneyDt.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; -import ca.uhn.fhir.model.dstu21.composite.QuantityDt; +import ca.uhn.fhir.model.dstu3.composite.QuantityDt; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/NarrativeDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java similarity index 98% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/NarrativeDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java index 81cc8f121eb..036f0a75e99 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/NarrativeDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/NarrativeDt.java @@ -14,7 +14,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/QuantityDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/QuantityDt.java similarity index 99% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/QuantityDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/QuantityDt.java index 7c6b173144d..bfcb6dc9d6d 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/QuantityDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/QuantityDt.java @@ -14,7 +14,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import java.math.BigDecimal; import java.util.List; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ResourceReferenceDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java similarity index 99% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ResourceReferenceDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java index 54ce5c234da..0f28995cf43 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/ResourceReferenceDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/ResourceReferenceDt.java @@ -14,7 +14,7 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; /* * #%L diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/SimpleQuantityDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java similarity index 98% rename from hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/SimpleQuantityDt.java rename to hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java index 5e26b311014..48ebdaf57ab 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu21/composite/SimpleQuantityDt.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu3/composite/SimpleQuantityDt.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.model.dstu21.composite; +package ca.uhn.fhir.model.dstu3.composite; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.SimpleSetter; diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java index 765d969f77c..d3d930c2e18 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java @@ -69,12 +69,14 @@ public class TinderJpaRestServerMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { FhirContext fhirContext; + String packageSuffix = ""; if ("dstu".equals(version)) { fhirContext = FhirContext.forDstu1(); } else if ("dstu2".equals(version)) { fhirContext = FhirContext.forDstu2(); - } else if ("dstu21".equals(version)) { - fhirContext = FhirContext.forDstu2_1(); + } else if ("dstu3".equals(version)) { + fhirContext = FhirContext.forDstu3(); + packageSuffix = ".dstu3"; } else { throw new MojoFailureException("Unknown version configured: " + version); } @@ -148,6 +150,7 @@ public class TinderJpaRestServerMojo extends AbstractMojo { ctx.put("packageBase", packageBase); ctx.put("configPackageBase", configPackageBase); ctx.put("version", version); + ctx.put("package_suffix", packageSuffix); ctx.put("esc", new EscapeTool()); if (BaseStructureSpreadsheetParser.determineVersionEnum(version).isRi()) { ctx.put("resourcePackage", "org.hl7.fhir." + version + ".model"); @@ -217,7 +220,7 @@ public class TinderJpaRestServerMojo extends AbstractMojo { TinderJpaRestServerMojo mojo = new TinderJpaRestServerMojo(); mojo.myProject = new MavenProject(); - mojo.version = "dstu21"; + mojo.version = "dstu3"; mojo.packageBase = "ca.uhn.test"; mojo.configPackageBase = "ca.uhn.test"; // mojo.baseResourceNames = new ArrayList(Collections.singletonList("observation")); diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java index ed8a8e5b9c9..35f6b5bb9ba 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java @@ -103,8 +103,8 @@ public class ValueSetGenerator { if (version.equals("dstu2")) { name = "/org/hl7/fhir/instance/model/valueset/valuesets.xml"; } - if (version.equals("dstu21")) { - name = "/org/hl7/fhir/instance/model/dstu21/valueset/valuesets.xml"; + if (version.equals("dstu3")) { + name = "/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml"; } ourLog.info("Loading valuesets from: {}", name); String vs = IOUtils.toString(ValueSetGenerator.class.getResourceAsStream(name)); diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VersionPropertyFileGeneratorMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VersionPropertyFileGeneratorMojo.java index 6957b1f2c9f..d3ffe7cfa1a 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VersionPropertyFileGeneratorMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/VersionPropertyFileGeneratorMojo.java @@ -127,8 +127,8 @@ public class VersionPropertyFileGeneratorMojo extends AbstractMojo { public static void main(String[] theArgs) throws MojoExecutionException, MojoFailureException { VersionPropertyFileGeneratorMojo m = new VersionPropertyFileGeneratorMojo(); - m.packageName = "org.hl7.fhir.dstu21.model"; - m.targetFile = new File("../hapi-fhir-structures-dstu2.1/src/main/resources/org/hl7/fhir/dstu21/model/fhirversion.properties"); + m.packageName = "org.hl7.fhir.dstu3.model"; + m.targetFile = new File("../hapi-fhir-structures-dstu3/src/main/resources/org/hl7/fhir/dstu3/model/fhirversion.properties"); m.execute(); diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java index 7f19c816d34..992b8828a56 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java @@ -67,7 +67,7 @@ public abstract class BaseStructureParser { public BaseStructureParser(String theVersion, String theBaseDir) { myVersion = theVersion; myBaseDir = theBaseDir; - myIsRi = myVersion.equals("dstu21"); + myIsRi = myVersion.equals("dstu3"); } public String getVersion() { @@ -218,14 +218,14 @@ public abstract class BaseStructureParser { if (theNextType.endsWith("Dt")) { unqualifiedTypeName = theNextType.substring(0, theNextType.length() - 2); try { - return Class.forName("org.hl7.fhir.dstu21.model." + unqualifiedTypeName + "Type").getName(); + return Class.forName("org.hl7.fhir.dstu3.model." + unqualifiedTypeName + "Type").getName(); } catch (ClassNotFoundException e1) { // not found } } try { - return Class.forName("org.hl7.fhir.dstu21.model." + unqualifiedTypeName).getName(); + return Class.forName("org.hl7.fhir.dstu3.model." + unqualifiedTypeName).getName(); } catch (ClassNotFoundException e) { // not found } @@ -434,9 +434,15 @@ public abstract class BaseStructureParser { } } + String packageSuffix = ""; + if (determineVersionEnum().isRi()) { + packageSuffix = "." + myVersion; + } + VelocityContext ctx = new VelocityContext(); ctx.put("includeDescriptionAnnotations", true); ctx.put("packageBase", thePackageBase); + ctx.put("package_suffix", packageSuffix); ctx.put("hash", "#"); ctx.put("imports", imports); ctx.put("profile", theResource.getProfile()); @@ -545,6 +551,11 @@ public abstract class BaseStructureParser { ourLog.debug("Writing file: {}", versionFile.getAbsolutePath()); + String packageSuffix = ""; + if (determineVersionEnum().isRi()) { + packageSuffix = "." + myVersion; + } + VelocityContext ctx = new VelocityContext(); ctx.put("nameToResourceClass", myNameToResourceClass); ctx.put("nameToDatatypeClass", myNameToDatatypeClass); @@ -552,7 +563,7 @@ public abstract class BaseStructureParser { ctx.put("versionEnumName", determineVersionEnum().name()); ctx.put("esc", new EscapeTool()); ctx.put("isRi", determineVersionEnum().isRi()); - + ctx.put("package_suffix", packageSuffix); String capitalize = WordUtils.capitalize(myVersion); if ("Dstu".equals(capitalize)) { capitalize = "Dstu1"; @@ -585,8 +596,8 @@ public abstract class BaseStructureParser { versionEnum = FhirVersionEnum.DSTU1; } else if ("dstu2".equals(version)) { versionEnum = FhirVersionEnum.DSTU2; - } else if ("dstu21".equals(version)) { - versionEnum = FhirVersionEnum.DSTU2_1; + } else if ("dstu3".equals(version)) { + versionEnum = FhirVersionEnum.DSTU3; } else { throw new MojoFailureException("Unknown version: " + version); } diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/activitydefinition.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/activitydefinition.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/activitydefinition.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/activitydefinition.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/address.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/address.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/address.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/address.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/annotation.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/annotation.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/annotation.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/annotation.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/attachment.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/attachment.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/attachment.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/attachment.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/backboneelement.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/backboneelement.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/backboneelement.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/backboneelement.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/codeableconcept.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/codeableconcept.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/codeableconcept.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/codeableconcept.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/coding.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/coding.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/coding.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/coding.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/contactpoint.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/contactpoint.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/contactpoint.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/contactpoint.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/element.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/element.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/element.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/element.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/elementdefinition.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/elementdefinition.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/elementdefinition.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/elementdefinition.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/extension.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/extension.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/extension.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/extension.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/humanname.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/humanname.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/humanname.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/humanname.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/identifier.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/identifier.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/identifier.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/identifier.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/meta.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/meta.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/meta.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/meta.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/narrative.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/narrative.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/narrative.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/narrative.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/period.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/period.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/period.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/period.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/primitives.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/primitives.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/primitives.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/primitives.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/quantity.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/quantity.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/quantity.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/quantity.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/range.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/range.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/range.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/range.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/ratio.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/ratio.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/ratio.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/ratio.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/reference.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/reference.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/reference.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/reference.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/sampleddata.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/sampleddata.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/sampleddata.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/sampleddata.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/signature.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/signature.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/signature.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/signature.xml diff --git a/hapi-tinder-plugin/src/main/resources/dt/dstu21/timing.xml b/hapi-tinder-plugin/src/main/resources/dt/dstu3/timing.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/dt/dstu21/timing.xml rename to hapi-tinder-plugin/src/main/resources/dt/dstu3/timing.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/account-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/account-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/account-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/account-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/allergyintolerance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/allergyintolerance-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/allergyintolerance-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/allergyintolerance-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/appointment-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/appointment-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/appointment-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/appointment-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/appointmentresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/appointmentresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/appointmentresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/appointmentresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/auditevent-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/auditevent-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/auditevent-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/auditevent-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/basic-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/basic-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/basic-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/basic-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/binary-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/binary-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/binary-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/binary-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/bodysite-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/bodysite-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/bodysite-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/bodysite-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/bundle-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/bundle-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/bundle-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/bundle-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/careplan-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/careplan-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/careplan-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/careplan-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/claim-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/claim-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/claim-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/claim-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/claimresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/claimresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/claimresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/claimresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/clinicalimpression-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/clinicalimpression-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/clinicalimpression-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/clinicalimpression-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/codesystem-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/codesystem-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/codesystem-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/codesystem-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/communication-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/communication-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/communication-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/communication-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/communicationrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/communicationrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/communicationrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/communicationrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/composition-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/composition-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/composition-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/composition-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/conceptmap-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/conceptmap-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/conceptmap-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/conceptmap-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/condition-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/condition-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/condition-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/condition-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/conformance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/conformance-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/conformance-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/conformance-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/contract-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/contract-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/contract-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/contract-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/coverage-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/coverage-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/coverage-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/coverage-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/dataelement-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/dataelement-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/dataelement-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/dataelement-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/decisionsupportrule-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/decisionsupportrule-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/decisionsupportrule-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/decisionsupportrule-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/decisionsupportservicemodule-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/decisionsupportservicemodule-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/decisionsupportservicemodule-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/decisionsupportservicemodule-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/detectedissue-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/detectedissue-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/detectedissue-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/detectedissue-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/device-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/device-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/device-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/device-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/devicecomponent-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/devicecomponent-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/devicecomponent-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/devicecomponent-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/devicemetric-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/devicemetric-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/devicemetric-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/devicemetric-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/deviceuserequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/deviceuserequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/deviceuserequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/deviceuserequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/deviceusestatement-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/deviceusestatement-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/deviceusestatement-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/deviceusestatement-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/diagnosticorder-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/diagnosticorder-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/diagnosticorder-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/diagnosticorder-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/diagnosticreport-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/diagnosticreport-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/diagnosticreport-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/diagnosticreport-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/documentation-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/documentation-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/documentation-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/documentation-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/documentmanifest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/documentmanifest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/documentmanifest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/documentmanifest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/documentreference-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/documentreference-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/documentreference-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/documentreference-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/domainresource-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/domainresource-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/domainresource-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/domainresource-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/eligibilityrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/eligibilityrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/eligibilityrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/eligibilityrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/eligibilityresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/eligibilityresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/eligibilityresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/eligibilityresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/encounter-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/encounter-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/encounter-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/encounter-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/enrollmentrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/enrollmentrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/enrollmentrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/enrollmentrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/enrollmentresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/enrollmentresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/enrollmentresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/enrollmentresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/episodeofcare-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/episodeofcare-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/episodeofcare-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/episodeofcare-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/expansionprofile-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/expansionprofile-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/expansionprofile-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/expansionprofile-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/explanationofbenefit-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/explanationofbenefit-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/explanationofbenefit-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/explanationofbenefit-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/familymemberhistory-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/familymemberhistory-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/familymemberhistory-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/familymemberhistory-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/flag-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/flag-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/flag-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/flag-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/goal-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/goal-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/goal-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/goal-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/group-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/group-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/group-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/group-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/guidancerequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/guidancerequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/guidanceresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/guidanceresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/guidanceresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/guidanceresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/healthcareservice-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/healthcareservice-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/healthcareservice-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/healthcareservice-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/imagingobjectselection-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/imagingobjectselection-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/imagingobjectselection-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/imagingobjectselection-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/imagingstudy-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/imagingstudy-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/imagingstudy-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/imagingstudy-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/immunization-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/immunization-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/immunization-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/immunization-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/immunizationrecommendation-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/immunizationrecommendation-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/immunizationrecommendation-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/immunizationrecommendation-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/implementationguide-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/implementationguide-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/implementationguide-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/implementationguide-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/library-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/library-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/library-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/library-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/linkage-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/linkage-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/linkage-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/linkage-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/list-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/list-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/list-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/list-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/location-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/location-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/location-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/location-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/measure-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/measure-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/measure-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/measure-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/media-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/media-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/media-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/media-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/medication-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/medication-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/medication-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/medication-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/medicationadministration-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/medicationadministration-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/medicationadministration-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/medicationadministration-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/medicationdispense-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/medicationdispense-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/medicationdispense-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/medicationdispense-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/medicationorder-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/medicationorder-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/medicationorder-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/medicationorder-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/medicationstatement-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/medicationstatement-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/medicationstatement-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/medicationstatement-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/messageheader-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/messageheader-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/messageheader-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/messageheader-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/moduledefinition-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/moduledefinition-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/moduledefinition-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/moduledefinition-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/modulemetadata-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/modulemetadata-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/modulemetadata-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/modulemetadata-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/namingsystem-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/namingsystem-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/namingsystem-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/namingsystem-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/nutritionorder-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/nutritionorder-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/nutritionorder-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/nutritionorder-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/observation-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/observation-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/observation-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/observation-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/operationdefinition-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/operationdefinition-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/operationdefinition-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/operationdefinition-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/operationoutcome-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/operationoutcome-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/operationoutcome-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/operationoutcome-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/order-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/order-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/order-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/order-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/orderresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/orderresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/orderresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/orderresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/orderset-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/orderset-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/orderset-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/orderset-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/organization-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/organization-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/organization-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/organization-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/parameters-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/parameters-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/parameters-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/parameters-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/patient-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/patient-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/patient-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/patient-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/paymentnotice-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/paymentnotice-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/paymentnotice-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/paymentnotice-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/paymentreconciliation-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/paymentreconciliation-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/paymentreconciliation-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/paymentreconciliation-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/person-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/person-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/person-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/person-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/practitioner-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/practitioner-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/practitioner-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/practitioner-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/procedure-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/procedure-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/procedure-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/procedure-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/procedurerequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/procedurerequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/procedurerequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/procedurerequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/processrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/processrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/processrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/processrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/processresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/processresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/processresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/processresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/protocol-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/protocol-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/protocol-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/protocol-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/provenance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/provenance-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/provenance-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/provenance-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/questionnaire-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/questionnaire-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/questionnaire-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/questionnaire-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/questionnaireresponse-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/questionnaireresponse-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/questionnaireresponse-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/questionnaireresponse-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/referralrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/referralrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/referralrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/referralrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/relatedperson-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/relatedperson-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/relatedperson-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/relatedperson-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/remittance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/remittance-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/remittance-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/remittance-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/resource-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/resource-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/resource-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/resource-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/riskassessment-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/riskassessment-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/riskassessment-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/riskassessment-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/schedule-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/schedule-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/schedule-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/schedule-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/searchparameter-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/searchparameter-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/searchparameter-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/searchparameter-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/sequence-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/sequence-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/sequence-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/sequence-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/slot-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/slot-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/slot-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/slot-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/specimen-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/specimen-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/specimen-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/specimen-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/structuredefinition-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/structuredefinition-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/structuredefinition-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/structuredefinition-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/subscription-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/subscription-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/subscription-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/subscription-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/substance-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/substance-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/substance-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/substance-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/supplydelivery-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/supplydelivery-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/supplydelivery-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/supplydelivery-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/supplyrequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/supplyrequest-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/supplyrequest-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/supplyrequest-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/supportingdocumentation-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/supportingdocumentation-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/supportingdocumentation-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/supportingdocumentation-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/template-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/template-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/template-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/template-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/test-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/test-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/test-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/test-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/testscript-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/testscript-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/testscript-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/testscript-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/user-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/user-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/user-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/user-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/valueset-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/valueset-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/valueset-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/valueset-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/visionprescription-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu3/visionprescription-spreadsheet.xml similarity index 100% rename from hapi-tinder-plugin/src/main/resources/res/dstu21/visionprescription-spreadsheet.xml rename to hapi-tinder-plugin/src/main/resources/res/dstu3/visionprescription-spreadsheet.xml diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm index fe406054341..017ffcc2473 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm @@ -6,9 +6,9 @@ import java.util.*; import org.apache.commons.lang3.StringUtils; #if ( $version != 'dstu' && (${className} == 'Encounter' || ${className} == 'Patient' || ${className} == 'ValueSet' || ${className} == 'QuestionnaireAnswers')) -import ca.uhn.fhir.jpa.provider.BaseJpaResourceProvider${className}${versionCapitalized}; +import ca.uhn.fhir.jpa.provider${package_suffix}.BaseJpaResourceProvider${className}${versionCapitalized}; #else -import ca.uhn.fhir.jpa.provider.JpaResourceProvider${versionCapitalized}; +import ca.uhn.fhir.jpa.provider${package_suffix}.JpaResourceProvider${versionCapitalized}; #end import ca.uhn.fhir.jpa.dao.SearchParameterMap; import ca.uhn.fhir.model.api.IResource; diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm index a9e5f5ceb0e..9dbc77a6cae 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm @@ -26,7 +26,7 @@ import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; @Configuration -public abstract class BaseJavaConfig${versionCapitalized} extends ca.uhn.fhir.jpa.config.Base${versionCapitalized}Config { +public abstract class BaseJavaConfig${versionCapitalized} extends ca.uhn.fhir.jpa.config${package_suffix}.Base${versionCapitalized}Config { @Bean(name="myResourceProviders${versionCapitalized}") public List resourceProviders${versionCapitalized}() { @@ -50,11 +50,11 @@ public abstract class BaseJavaConfig${versionCapitalized} extends ca.uhn.fhir.jp @Bean(name="my${res.name}Dao${versionCapitalized}", autowire=Autowire.BY_NAME) @Lazy public IFhirResourceDao<${resourcePackage}.${res.declaringClassNameComplete}> dao${res.declaringClassNameComplete}${versionCapitalized}() { - ca.uhn.fhir.jpa.dao.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}> retVal; + ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}> retVal; #if ( ${versionCapitalized} != 'Dstu1' && ( ${res.name} == 'Bundle' || ${res.name} == 'Encounter' || ${res.name} == 'Everything' || ${res.name} == 'Patient' || ${res.name} == 'Subscription' || ${res.name} == 'ValueSet' || ${res.name} == 'QuestionnaireResponse' || ${res.name} == 'SearchParameter')) - retVal = new ca.uhn.fhir.jpa.dao.FhirResourceDao${res.name}${versionCapitalized}(); + retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${res.name}${versionCapitalized}(); #else - retVal = new ca.uhn.fhir.jpa.dao.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}>(); + retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}>(); #end retVal.setResourceType(${resourcePackage}.${res.declaringClassNameComplete}.class); retVal.setContext(fhirContext${versionCapitalized}()); diff --git a/pom.xml b/pom.xml index 1bb619f3bd6..5d916680eba 100644 --- a/pom.xml +++ b/pom.xml @@ -1447,8 +1447,8 @@ hapi-fhir-validation-resources-dstu2 hapi-fhir-structures-dstu2 hapi-fhir-structures-hl7org-dstu2 - hapi-fhir-validation-resources-dstu2.1 - hapi-fhir-structures-dstu2.1 + hapi-fhir-validation-resources-dstu3 + hapi-fhir-structures-dstu3 hapi-fhir-jaxrsserver-base hapi-fhir-jaxrsserver-example hapi-fhir-jpaserver-base diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 96aff62ea57..cf2bcdab3cc 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -120,7 +120,7 @@ change, trailing zeros will now be preserved when serializing as well. - Add DSTU2.1 example to hpia-fhir-jpaserver-example. Thanks to Karl + Add DSTU3 example to hapi-fhir-jpaserver-example. Thanks to Karl Davis for the Pull Request! diff --git a/src/site/xdoc/doc_dstu2.xml b/src/site/xdoc/doc_dstu2.xml index c0f12dc226e..2186ff64a55 100644 --- a/src/site/xdoc/doc_dstu2.xml +++ b/src/site/xdoc/doc_dstu2.xml @@ -83,7 +83,7 @@ -
+

If you have an existing application built using a version of previous @@ -104,10 +104,10 @@ if it's happening to you, it's happening to others. We're happy to help.

- +

- The following is a list of things that have changed in the DSTU2.1 + The following is a list of things that have changed in the DSTU3 structures which you will need to accomodate in your code as you upgrade:

@@ -116,7 +116,7 @@
  • Structures are all found in the - org.hl7.fhir.dstu21.model package, + org.hl7.fhir.dstu3.model package, instead of the ca.uhn.fhir.model.dstu2.resource, ca.uhn.fhir.model.dstu2.composite, and ca.uhn.fhir.model.dstu2.valueset packages.