From 7692e5d71431cc86ca351e4699a34d2daf59056e Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Tue, 22 Dec 2015 09:32:06 -0500 Subject: [PATCH] More work on DSTU2.1 structs --- .../ca/uhn/fhir/context/ModelScanner.java | 102 +- .../RuntimePrimitiveDatatypeDefinition.java | 9 +- .../ca/uhn/fhir/model/api/IFhirVersion.java | 3 + .../java/ca/uhn/fhir/model/api/IResource.java | 9 - .../ca/uhn/fhir/model/primitive/IdDt.java | 21 + .../java/ca/uhn/fhir/parser/JsonParser.java | 2 +- .../uhn/fhir/rest/client/GenericClient.java | 2 +- .../BaseOutcomeReturningMethodBinding.java | 7 +- .../ca/uhn/fhir/rest/method/MethodUtil.java | 2 +- .../fhir/rest/method/OperationParameter.java | 13 +- .../uhn/fhir/rest/method/RequestDetails.java | 8 +- .../fhir/rest/method/UpdateMethodBinding.java | 9 +- .../uhn/fhir/rest/server/RestfulServer.java | 15 +- .../model/api/IBaseBackboneElement.java | 4 +- .../instance/model/api/IBaseDatatype.java | 4 +- .../instance/model/api/IBaseResource.java | 16 + .../hl7/fhir/instance/model/api/IIdType.java | 16 + .../ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 11 +- .../dao/FhirResourceDaoEncounterDstu2.java | 9 +- .../dao/FhirResourceDaoEncounterDstu21.java | 8 +- .../jpa/dao/FhirResourceDaoPatientDstu2.java | 8 +- .../jpa/dao/FhirResourceDaoPatientDstu21.java | 8 +- .../FhirResourceDaoSubscriptionDstu21.java | 12 +- .../jpa/dao/IFhirResourceDaoEncounter.java | 8 +- .../fhir/jpa/dao/IFhirResourceDaoPatient.java | 6 +- .../jpa/dao/SearchParamExtractorDstu21.java | 10 +- ...aseJpaResourceProviderEncounterDstu21.java | 8 +- .../BaseJpaResourceProviderPatientDstu21.java | 22 +- .../provider/JpaResourceProviderDstu21.java | 32 +- .../java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java | 30 + .../FhirResourceDaoDstu21SearchFtTest.java | 86 +- .../FhirResourceDaoDstu21SearchNoFtTest.java | 24 +- .../dao/dstu21/FhirResourceDaoDstu21Test.java | 12 +- .../FhirResourceDaoDstu21UpdateTest.java | 17 +- .../FhirResourceDaoDstu21ValidateTest.java | 5 +- .../FhirResourceDaoValueSetDstu21Test.java | 2 + .../dao/dstu21/FhirSystemDaoDstu21Test.java | 14 +- .../BaseResourceProviderDstu21Test.java | 141 + .../QuestionnaireResourceProviderDstu21.java | 15 + .../dstu21/ResourceProviderDstu21Test.java | 2373 ++++++ .../ResourceProviderDstu21ValueSetTest.java | 376 + .../dstu21/SystemProviderDstu21Test.java | 426 + .../ca/uhn/fhir/model/dstu/FhirDstu1.java | 7 + .../hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java | 11 +- .../hapi/rest/server/Dstu21BundleFactory.java | 67 +- .../org/hl7/fhir/dstu21/model/Account.java | 164 +- .../org/hl7/fhir/dstu21/model/Address.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Age.java | 2 +- .../fhir/dstu21/model/AllergyIntolerance.java | 272 +- .../org/hl7/fhir/dstu21/model/Annotation.java | 2 +- .../hl7/fhir/dstu21/model/Appointment.java | 146 +- .../dstu21/model/AppointmentResponse.java | 128 +- .../org/hl7/fhir/dstu21/model/Attachment.java | 2 +- .../org/hl7/fhir/dstu21/model/AuditEvent.java | 308 +- .../fhir/dstu21/model/BackboneElement.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Basic.java | 110 +- .../org/hl7/fhir/dstu21/model/Binary.java | 20 +- .../org/hl7/fhir/dstu21/model/BodySite.java | 56 +- .../org/hl7/fhir/dstu21/model/Bundle.java | 56 +- .../org/hl7/fhir/dstu21/model/CarePlan.java | 236 +- .../java/org/hl7/fhir/dstu21/model/Claim.java | 164 +- .../hl7/fhir/dstu21/model/ClaimResponse.java | 128 +- .../fhir/dstu21/model/ClinicalImpression.java | 254 +- .../fhir/dstu21/model/CodeableConcept.java | 2 +- .../org/hl7/fhir/dstu21/model/Coding.java | 2 +- .../hl7/fhir/dstu21/model/Communication.java | 218 +- .../dstu21/model/CommunicationRequest.java | 236 +- .../hl7/fhir/dstu21/model/Composition.java | 290 +- .../org/hl7/fhir/dstu21/model/ConceptMap.java | 326 +- .../org/hl7/fhir/dstu21/model/Condition.java | 254 +- .../hl7/fhir/dstu21/model/Conformance.java | 290 +- .../org/hl7/fhir/dstu21/model/Constants.java | 4 +- .../hl7/fhir/dstu21/model/ContactPoint.java | 2 +- .../org/hl7/fhir/dstu21/model/Contract.java | 92 +- .../java/org/hl7/fhir/dstu21/model/Count.java | 2 +- .../org/hl7/fhir/dstu21/model/Coverage.java | 164 +- .../hl7/fhir/dstu21/model/DataElement.java | 200 +- .../dstu21/model/DecisionSupportRule.java | 2 +- .../model/DecisionSupportServiceModule.java | 2 +- .../hl7/fhir/dstu21/model/DetectedIssue.java | 110 +- .../org/hl7/fhir/dstu21/model/Device.java | 164 +- .../fhir/dstu21/model/DeviceComponent.java | 56 +- .../hl7/fhir/dstu21/model/DeviceMetric.java | 92 +- .../fhir/dstu21/model/DeviceUseRequest.java | 56 +- .../fhir/dstu21/model/DeviceUseStatement.java | 56 +- .../fhir/dstu21/model/DiagnosticOrder.java | 308 +- .../fhir/dstu21/model/DiagnosticReport.java | 272 +- .../org/hl7/fhir/dstu21/model/Distance.java | 2 +- .../fhir/dstu21/model/DocumentManifest.java | 236 +- .../fhir/dstu21/model/DocumentReference.java | 470 +- .../hl7/fhir/dstu21/model/DomainResource.java | 2 +- .../org/hl7/fhir/dstu21/model/Duration.java | 2 +- .../org/hl7/fhir/dstu21/model/Element.java | 2 +- .../fhir/dstu21/model/ElementDefinition.java | 2 +- .../fhir/dstu21/model/EligibilityRequest.java | 110 +- .../dstu21/model/EligibilityResponse.java | 146 +- .../org/hl7/fhir/dstu21/model/Encounter.java | 362 +- .../fhir/dstu21/model/EnrollmentRequest.java | 56 +- .../fhir/dstu21/model/EnrollmentResponse.java | 20 +- .../hl7/fhir/dstu21/model/Enumerations.java | 2 +- .../hl7/fhir/dstu21/model/EpisodeOfCare.java | 182 +- .../fhir/dstu21/model/ExpansionProfile.java | 146 +- .../dstu21/model/ExplanationOfBenefit.java | 146 +- .../org/hl7/fhir/dstu21/model/Extension.java | 2 +- .../dstu21/model/FamilyMemberHistory.java | 110 +- .../java/org/hl7/fhir/dstu21/model/Flag.java | 92 +- .../java/org/hl7/fhir/dstu21/model/Goal.java | 110 +- .../java/org/hl7/fhir/dstu21/model/Group.java | 164 +- .../fhir/dstu21/model/GuidanceResponse.java | 2 +- .../fhir/dstu21/model/HealthcareService.java | 146 +- .../org/hl7/fhir/dstu21/model/HumanName.java | 2 +- .../org/hl7/fhir/dstu21/model/IdType.java | 22 + .../org/hl7/fhir/dstu21/model/Identifier.java | 2 +- .../dstu21/model/ImagingObjectSelection.java | 110 +- .../hl7/fhir/dstu21/model/ImagingStudy.java | 182 +- .../hl7/fhir/dstu21/model/Immunization.java | 290 +- .../model/ImmunizationRecommendation.java | 164 +- .../dstu21/model/ImplementationGuide.java | 182 +- .../org/hl7/fhir/dstu21/model/Library.java | 2 +- .../hl7/fhir/dstu21/model/ListResource.java | 200 +- .../org/hl7/fhir/dstu21/model/Location.java | 254 +- .../org/hl7/fhir/dstu21/model/Measure.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Media.java | 146 +- .../org/hl7/fhir/dstu21/model/Medication.java | 110 +- .../model/MedicationAdministration.java | 200 +- .../fhir/dstu21/model/MedicationDispense.java | 236 +- .../fhir/dstu21/model/MedicationOrder.java | 146 +- .../dstu21/model/MedicationStatement.java | 128 +- .../hl7/fhir/dstu21/model/MessageHeader.java | 254 +- .../java/org/hl7/fhir/dstu21/model/Meta.java | 54 +- .../fhir/dstu21/model/ModuleDefinition.java | 2 +- .../hl7/fhir/dstu21/model/ModuleMetadata.java | 128 +- .../java/org/hl7/fhir/dstu21/model/Money.java | 2 +- .../hl7/fhir/dstu21/model/NamingSystem.java | 254 +- .../org/hl7/fhir/dstu21/model/Narrative.java | 2 +- .../hl7/fhir/dstu21/model/NutritionOrder.java | 182 +- .../hl7/fhir/dstu21/model/Observation.java | 594 +- .../dstu21/model/OperationDefinition.java | 236 +- .../fhir/dstu21/model/OperationOutcome.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Order.java | 164 +- .../hl7/fhir/dstu21/model/OrderResponse.java | 110 +- .../org/hl7/fhir/dstu21/model/OrderSet.java | 2 +- .../hl7/fhir/dstu21/model/Organization.java | 218 +- .../org/hl7/fhir/dstu21/model/Parameters.java | 2 +- .../org/hl7/fhir/dstu21/model/Patient.java | 452 +- .../hl7/fhir/dstu21/model/PaymentNotice.java | 146 +- .../dstu21/model/PaymentReconciliation.java | 146 +- .../org/hl7/fhir/dstu21/model/Period.java | 28 +- .../org/hl7/fhir/dstu21/model/Person.java | 344 +- .../hl7/fhir/dstu21/model/Practitioner.java | 362 +- .../org/hl7/fhir/dstu21/model/Procedure.java | 146 +- .../fhir/dstu21/model/ProcedureRequest.java | 110 +- .../hl7/fhir/dstu21/model/ProcessRequest.java | 74 +- .../fhir/dstu21/model/ProcessResponse.java | 92 +- .../org/hl7/fhir/dstu21/model/Provenance.java | 182 +- .../org/hl7/fhir/dstu21/model/Quantity.java | 2 +- .../hl7/fhir/dstu21/model/Questionnaire.java | 128 +- .../dstu21/model/QuestionnaireResponse.java | 146 +- .../java/org/hl7/fhir/dstu21/model/Range.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Ratio.java | 2 +- .../org/hl7/fhir/dstu21/model/Reference.java | 2 +- .../fhir/dstu21/model/ReferralRequest.java | 146 +- .../hl7/fhir/dstu21/model/RelatedPerson.java | 272 +- .../org/hl7/fhir/dstu21/model/Resource.java | 2 +- .../fhir/dstu21/model/ResourceFactory.java | 2 +- .../hl7/fhir/dstu21/model/ResourceType.java | 2 +- .../hl7/fhir/dstu21/model/RiskAssessment.java | 146 +- .../hl7/fhir/dstu21/model/SampledData.java | 2 +- .../org/hl7/fhir/dstu21/model/Schedule.java | 74 +- .../fhir/dstu21/model/SearchParameter.java | 128 +- .../org/hl7/fhir/dstu21/model/Sequence.java | 128 +- .../org/hl7/fhir/dstu21/model/Signature.java | 2 +- .../hl7/fhir/dstu21/model/SimpleQuantity.java | 2 +- .../java/org/hl7/fhir/dstu21/model/Slot.java | 92 +- .../org/hl7/fhir/dstu21/model/Specimen.java | 200 +- .../dstu21/model/StructureDefinition.java | 380 +- .../hl7/fhir/dstu21/model/Subscription.java | 128 +- .../org/hl7/fhir/dstu21/model/Substance.java | 128 +- .../hl7/fhir/dstu21/model/SupplyDelivery.java | 92 +- .../hl7/fhir/dstu21/model/SupplyRequest.java | 128 +- .../org/hl7/fhir/dstu21/model/TestScript.java | 128 +- .../org/hl7/fhir/dstu21/model/Timing.java | 2 +- .../org/hl7/fhir/dstu21/model/ValueSet.java | 236 +- .../fhir/dstu21/model/VisionPrescription.java | 92 +- .../fhir/dstu21/model/annotations/Block.java | 55 - .../fhir/dstu21/model/annotations/Child.java | 165 - .../dstu21/model/annotations/DatatypeDef.java | 88 - .../dstu21/model/annotations/Description.java | 55 - .../dstu21/model/annotations/Extension.java | 74 - .../dstu21/model/annotations/ResourceDef.java | 59 - .../annotations/SearchParamDefinition.java | 79 - .../fhir/dstu21/model/api/IAnyResource.java | 34 - .../dstu21/model/api/IBackboneElement.java | 26 - .../org/hl7/fhir/dstu21/model/api/IBase.java | 32 - .../model/api/IBaseBackboneElement.java | 26 - .../fhir/dstu21/model/api/IBaseBinary.java | 37 - .../model/api/IBaseBooleanDatatype.java | 26 - .../fhir/dstu21/model/api/IBaseBundle.java | 48 - .../fhir/dstu21/model/api/IBaseCoding.java | 31 - .../dstu21/model/api/IBaseConformance.java | 6 - .../fhir/dstu21/model/api/IBaseDatatype.java | 26 - .../model/api/IBaseDatatypeElement.java | 26 - .../model/api/IBaseDecimalDatatype.java | 27 - .../fhir/dstu21/model/api/IBaseElement.java | 27 - .../dstu21/model/api/IBaseEnumFactory.java | 42 - .../dstu21/model/api/IBaseEnumeration.java | 28 - .../fhir/dstu21/model/api/IBaseExtension.java | 37 - .../fhir/dstu21/model/api/IBaseFhirEnum.java | 66 - .../dstu21/model/api/IBaseHasExtensions.java | 31 - .../model/api/IBaseHasModifierExtensions.java | 31 - .../model/api/IBaseIntegerDatatype.java | 26 - .../fhir/dstu21/model/api/IBaseMetaType.java | 35 - .../model/api/IBaseOperationOutcome.java | 5 - .../dstu21/model/api/IBaseParameters.java | 26 - .../fhir/dstu21/model/api/IBaseReference.java | 37 - .../fhir/dstu21/model/api/IBaseResource.java | 40 - .../hl7/fhir/dstu21/model/api/IBaseXhtml.java | 6 - .../fhir/dstu21/model/api/ICompositeType.java | 26 - .../dstu21/model/api/IDomainResource.java | 37 - .../hl7/fhir/dstu21/model/api/IIdType.java | 138 - .../hl7/fhir/dstu21/model/api/INarrative.java | 34 - .../fhir/dstu21/model/api/IPrimitiveType.java | 35 - .../model/valuesets/Additionalmaterials.java | 2 +- .../AdditionalmaterialsEnumFactory.java | 2 +- .../dstu21/model/valuesets/Adjudication.java | 2 +- .../valuesets/AdjudicationEnumFactory.java | 2 +- .../model/valuesets/AdjudicationError.java | 2 +- .../AdjudicationErrorEnumFactory.java | 2 +- .../model/valuesets/AdjudicationReason.java | 2 +- .../AdjudicationReasonEnumFactory.java | 2 +- .../dstu21/model/valuesets/AnimalBreeds.java | 2 +- .../valuesets/AnimalBreedsEnumFactory.java | 2 +- .../model/valuesets/AnimalGenderstatus.java | 2 +- .../AnimalGenderstatusEnumFactory.java | 2 +- .../dstu21/model/valuesets/AnimalSpecies.java | 2 +- .../valuesets/AnimalSpeciesEnumFactory.java | 2 +- .../model/valuesets/AnzscoOccupations.java | 2 +- .../AnzscoOccupationsEnumFactory.java | 2 +- .../model/valuesets/AuditSourceType.java | 2 +- .../valuesets/AuditSourceTypeEnumFactory.java | 2 +- .../model/valuesets/BasicResourceType.java | 2 +- .../BasicResourceTypeEnumFactory.java | 2 +- .../model/valuesets/BenefitCategory.java | 2 +- .../valuesets/BenefitCategoryEnumFactory.java | 2 +- .../model/valuesets/BenefitNetwork.java | 2 +- .../valuesets/BenefitNetworkEnumFactory.java | 2 +- .../model/valuesets/BenefitSubcategory.java | 2 +- .../BenefitSubcategoryEnumFactory.java | 2 +- .../dstu21/model/valuesets/BenefitTerm.java | 2 +- .../valuesets/BenefitTermEnumFactory.java | 2 +- .../dstu21/model/valuesets/BenefitType.java | 2 +- .../valuesets/BenefitTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/BenefitUnit.java | 2 +- .../valuesets/BenefitUnitEnumFactory.java | 2 +- .../valuesets/CarePlanActivityCategory.java | 2 +- .../CarePlanActivityCategoryEnumFactory.java | 2 +- .../valuesets/ChoiceListOrientation.java | 2 +- .../ChoiceListOrientationEnumFactory.java | 2 +- .../model/valuesets/ClaimException.java | 2 +- .../valuesets/ClaimExceptionEnumFactory.java | 2 +- .../model/valuesets/ClaimModifiers.java | 2 +- .../valuesets/ClaimModifiersEnumFactory.java | 2 +- .../valuesets/ClassificationOrContext.java | 2 +- .../ClassificationOrContextEnumFactory.java | 2 +- .../model/valuesets/ConditionCategory.java | 2 +- .../ConditionCategoryEnumFactory.java | 2 +- .../model/valuesets/ConditionClinical.java | 2 +- .../ConditionClinicalEnumFactory.java | 2 +- .../model/valuesets/ConditionState.java | 2 +- .../valuesets/ConditionStateEnumFactory.java | 2 +- .../valuesets/ConformanceExpectation.java | 2 +- .../ConformanceExpectationEnumFactory.java | 2 +- .../model/valuesets/ContactentityType.java | 2 +- .../ContactentityTypeEnumFactory.java | 2 +- .../model/valuesets/ContractAction.java | 2 +- .../valuesets/ContractActionEnumFactory.java | 2 +- .../model/valuesets/ContractActorrole.java | 2 +- .../ContractActorroleEnumFactory.java | 2 +- .../model/valuesets/ContractSignerType.java | 2 +- .../ContractSignerTypeEnumFactory.java | 2 +- .../model/valuesets/ContractSubtype.java | 2 +- .../valuesets/ContractSubtypeEnumFactory.java | 2 +- .../model/valuesets/ContractTermSubtype.java | 2 +- .../ContractTermSubtypeEnumFactory.java | 2 +- .../model/valuesets/ContractTermType.java | 2 +- .../ContractTermTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/ContractType.java | 2 +- .../valuesets/ContractTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/DeviceAction.java | 2 +- .../valuesets/DeviceActionEnumFactory.java | 2 +- .../model/valuesets/EncounterAdmitSource.java | 2 +- .../EncounterAdmitSourceEnumFactory.java | 2 +- .../dstu21/model/valuesets/EncounterDiet.java | 2 +- .../valuesets/EncounterDietEnumFactory.java | 2 +- .../EncounterDischargeDisposition.java | 2 +- ...ounterDischargeDispositionEnumFactory.java | 2 +- .../model/valuesets/EncounterPriority.java | 2 +- .../EncounterPriorityEnumFactory.java | 2 +- .../EncounterSpecialArrangements.java | 2 +- ...counterSpecialArrangementsEnumFactory.java | 2 +- .../dstu21/model/valuesets/EncounterType.java | 2 +- .../valuesets/EncounterTypeEnumFactory.java | 2 +- .../model/valuesets/EntformulaAdditive.java | 2 +- .../EntformulaAdditiveEnumFactory.java | 2 +- .../dstu21/model/valuesets/FlagCategory.java | 2 +- .../valuesets/FlagCategoryEnumFactory.java | 2 +- .../dstu21/model/valuesets/FlagPriority.java | 2 +- .../valuesets/FlagPriorityEnumFactory.java | 2 +- .../dstu21/model/valuesets/FmConditions.java | 2 +- .../valuesets/FmConditionsEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/Forms.java | 2 +- .../model/valuesets/FormsEnumFactory.java | 2 +- .../dstu21/model/valuesets/Fundsreserve.java | 2 +- .../valuesets/FundsreserveEnumFactory.java | 2 +- .../model/valuesets/GoalAcceptanceStatus.java | 2 +- .../GoalAcceptanceStatusEnumFactory.java | 2 +- .../dstu21/model/valuesets/GoalCategory.java | 2 +- .../valuesets/GoalCategoryEnumFactory.java | 2 +- .../dstu21/model/valuesets/GoalPriority.java | 2 +- .../valuesets/GoalPriorityEnumFactory.java | 2 +- .../model/valuesets/GoalRelationshipType.java | 2 +- .../GoalRelationshipTypeEnumFactory.java | 2 +- .../model/valuesets/GoalStatusReason.java | 2 +- .../GoalStatusReasonEnumFactory.java | 2 +- ...munizationRecommendationDateCriterion.java | 2 +- ...ecommendationDateCriterionEnumFactory.java | 2 +- .../ImmunizationRecommendationStatus.java | 2 +- ...zationRecommendationStatusEnumFactory.java | 2 +- .../dstu21/model/valuesets/Intervention.java | 2 +- .../valuesets/InterventionEnumFactory.java | 2 +- .../valuesets/LOINC480020Answerlist.java | 2 +- .../LOINC480020AnswerlistEnumFactory.java | 2 +- .../valuesets/LOINC480194Answerlist.java | 2 +- .../LOINC480194AnswerlistEnumFactory.java | 2 +- .../valuesets/LOINC530345Answerlist.java | 2 +- .../LOINC530345AnswerlistEnumFactory.java | 2 +- .../valuesets/LOINC530378Answerlist.java | 2 +- .../LOINC530378AnswerlistEnumFactory.java | 2 +- .../model/valuesets/ListEmptyReason.java | 2 +- .../valuesets/ListEmptyReasonEnumFactory.java | 2 +- .../model/valuesets/ListExampleCodes.java | 2 +- .../ListExampleCodesEnumFactory.java | 2 +- .../dstu21/model/valuesets/ListItemFlag.java | 2 +- .../valuesets/ListItemFlagEnumFactory.java | 2 +- .../dstu21/model/valuesets/ListOrder.java | 2 +- .../model/valuesets/ListOrderEnumFactory.java | 2 +- .../model/valuesets/LocationPhysicalType.java | 2 +- .../LocationPhysicalTypeEnumFactory.java | 2 +- .../valuesets/MessageReasonEncounter.java | 2 +- .../MessageReasonEncounterEnumFactory.java | 2 +- .../model/valuesets/MessageTransport.java | 2 +- .../MessageTransportEnumFactory.java | 2 +- .../model/valuesets/MissingToothReason.java | 2 +- .../MissingToothReasonEnumFactory.java | 2 +- .../model/valuesets/ObjectLifecycle.java | 2 +- .../valuesets/ObjectLifecycleEnumFactory.java | 2 +- .../dstu21/model/valuesets/ObjectRole.java | 2 +- .../valuesets/ObjectRoleEnumFactory.java | 2 +- .../dstu21/model/valuesets/ObjectType.java | 2 +- .../valuesets/ObjectTypeEnumFactory.java | 2 +- .../model/valuesets/ObservationCategory.java | 2 +- .../ObservationCategoryEnumFactory.java | 2 +- .../model/valuesets/OperationOutcome.java | 2 +- .../OperationOutcomeEnumFactory.java | 2 +- .../valuesets/OralProsthodonticMaterial.java | 2 +- .../OralProsthodonticMaterialEnumFactory.java | 2 +- .../model/valuesets/OrganizationType.java | 2 +- .../OrganizationTypeEnumFactory.java | 2 +- .../valuesets/PatientContactRelationship.java | 2 +- ...PatientContactRelationshipEnumFactory.java | 2 +- .../model/valuesets/PatientMpiMatch.java | 2 +- .../valuesets/PatientMpiMatchEnumFactory.java | 2 +- .../dstu21/model/valuesets/Payeetype.java | 2 +- .../model/valuesets/PayeetypeEnumFactory.java | 2 +- .../valuesets/PaymentAdjustmentReason.java | 2 +- .../PaymentAdjustmentReasonEnumFactory.java | 2 +- .../dstu21/model/valuesets/PaymentStatus.java | 2 +- .../valuesets/PaymentStatusEnumFactory.java | 2 +- .../dstu21/model/valuesets/PaymentType.java | 2 +- .../valuesets/PaymentTypeEnumFactory.java | 2 +- .../model/valuesets/PractitionerRole.java | 2 +- .../PractitionerRoleEnumFactory.java | 2 +- .../valuesets/PractitionerSpecialty.java | 2 +- .../PractitionerSpecialtyEnumFactory.java | 2 +- .../ProcedureProgressStatusCodes.java | 2 +- ...ocedureProgressStatusCodesEnumFactory.java | 2 +- .../valuesets/ProcedureRelationshipType.java | 2 +- .../ProcedureRelationshipTypeEnumFactory.java | 2 +- .../model/valuesets/ProcessOutcome.java | 2 +- .../valuesets/ProcessOutcomeEnumFactory.java | 2 +- .../model/valuesets/ProcessPriority.java | 2 +- .../valuesets/ProcessPriorityEnumFactory.java | 2 +- .../model/valuesets/ProvenanceAgentRole.java | 2 +- .../ProvenanceAgentRoleEnumFactory.java | 2 +- .../model/valuesets/ProvenanceAgentType.java | 2 +- .../ProvenanceAgentTypeEnumFactory.java | 2 +- .../model/valuesets/QuestionMaxOccurs.java | 2 +- .../QuestionMaxOccursEnumFactory.java | 2 +- .../QuestionnaireDisplayCategory.java | 2 +- ...estionnaireDisplayCategoryEnumFactory.java | 2 +- .../valuesets/QuestionnaireItemControl.java | 2 +- .../QuestionnaireItemControlEnumFactory.java | 2 +- .../valuesets/ReasonMedicationGivenCodes.java | 2 +- ...ReasonMedicationGivenCodesEnumFactory.java | 2 +- .../ReasonMedicationNotGivenCodes.java | 2 +- ...sonMedicationNotGivenCodesEnumFactory.java | 2 +- .../dstu21/model/valuesets/Relationship.java | 2 +- .../valuesets/RelationshipEnumFactory.java | 2 +- .../valuesets/ResourceValidationMode.java | 2 +- .../ResourceValidationModeEnumFactory.java | 2 +- .../valuesets/RestfulSecurityService.java | 2 +- .../RestfulSecurityServiceEnumFactory.java | 2 +- .../model/valuesets/RiskProbability.java | 2 +- .../valuesets/RiskProbabilityEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/Ruleset.java | 2 +- .../model/valuesets/RulesetEnumFactory.java | 2 +- .../model/valuesets/ServicePharmacy.java | 2 +- .../valuesets/ServicePharmacyEnumFactory.java | 2 +- .../dstu21/model/valuesets/ServicePlace.java | 2 +- .../valuesets/ServicePlaceEnumFactory.java | 2 +- .../model/valuesets/ServiceProduct.java | 2 +- .../valuesets/ServiceProductEnumFactory.java | 2 +- .../valuesets/ServiceProvisionConditions.java | 2 +- ...ServiceProvisionConditionsEnumFactory.java | 2 +- .../valuesets/ServiceReferralMethod.java | 2 +- .../ServiceReferralMethodEnumFactory.java | 2 +- .../dstu21/model/valuesets/ServiceUscls.java | 2 +- .../valuesets/ServiceUsclsEnumFactory.java | 2 +- .../dstu21/model/valuesets/SignatureType.java | 2 +- .../valuesets/SignatureTypeEnumFactory.java | 2 +- .../model/valuesets/SubscriptionTag.java | 2 +- .../valuesets/SubscriptionTagEnumFactory.java | 2 +- .../model/valuesets/SubstanceCategory.java | 2 +- .../SubstanceCategoryEnumFactory.java | 2 +- .../model/valuesets/SupplydeliveryType.java | 2 +- .../SupplydeliveryTypeEnumFactory.java | 2 +- .../model/valuesets/SupplyrequestKind.java | 2 +- .../SupplyrequestKindEnumFactory.java | 2 +- .../model/valuesets/SupplyrequestReason.java | 2 +- .../SupplyrequestReasonEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/Surface.java | 2 +- .../model/valuesets/SurfaceEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/Teeth.java | 2 +- .../model/valuesets/TeethEnumFactory.java | 2 +- .../valuesets/TestscriptOperationCodes.java | 2 +- .../TestscriptOperationCodesEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/Tooth.java | 2 +- .../model/valuesets/ToothEnumFactory.java | 2 +- .../hl7/fhir/dstu21/model/valuesets/Udi.java | 2 +- .../model/valuesets/UdiEnumFactory.java | 2 +- .../valuesets/V3AcknowledgementCondition.java | 2 +- ...V3AcknowledgementConditionEnumFactory.java | 2 +- .../V3AcknowledgementDetailCode.java | 2 +- ...3AcknowledgementDetailCodeEnumFactory.java | 2 +- .../V3AcknowledgementDetailType.java | 2 +- ...3AcknowledgementDetailTypeEnumFactory.java | 2 +- .../valuesets/V3AcknowledgementType.java | 2 +- .../V3AcknowledgementTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActClass.java | 2 +- .../valuesets/V3ActClassEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActCode.java | 2 +- .../model/valuesets/V3ActCodeEnumFactory.java | 2 +- .../valuesets/V3ActExposureLevelCode.java | 2 +- .../V3ActExposureLevelCodeEnumFactory.java | 2 +- .../V3ActInvoiceElementModifier.java | 2 +- ...3ActInvoiceElementModifierEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActMood.java | 2 +- .../model/valuesets/V3ActMoodEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActPriority.java | 2 +- .../valuesets/V3ActPriorityEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActReason.java | 2 +- .../valuesets/V3ActReasonEnumFactory.java | 2 +- .../V3ActRelationshipCheckpoint.java | 2 +- ...3ActRelationshipCheckpointEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipJoin.java | 2 +- .../V3ActRelationshipJoinEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipSplit.java | 2 +- .../V3ActRelationshipSplitEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipSubset.java | 2 +- .../V3ActRelationshipSubsetEnumFactory.java | 2 +- .../valuesets/V3ActRelationshipType.java | 2 +- .../V3ActRelationshipTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActSite.java | 2 +- .../model/valuesets/V3ActSiteEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3ActStatus.java | 2 +- .../valuesets/V3ActStatusEnumFactory.java | 2 +- .../model/valuesets/V3ActUSPrivacyLaw.java | 2 +- .../V3ActUSPrivacyLawEnumFactory.java | 2 +- .../model/valuesets/V3ActUncertainty.java | 2 +- .../V3ActUncertaintyEnumFactory.java | 2 +- .../model/valuesets/V3AddressPartType.java | 2 +- .../V3AddressPartTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3AddressUse.java | 2 +- .../valuesets/V3AddressUseEnumFactory.java | 2 +- .../valuesets/V3AdministrativeGender.java | 2 +- .../V3AdministrativeGenderEnumFactory.java | 2 +- ...V3AmericanIndianAlaskaNativeLanguages.java | 2 +- ...ndianAlaskaNativeLanguagesEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3Calendar.java | 2 +- .../model/valuesets/V3CalendarCycle.java | 2 +- .../valuesets/V3CalendarCycleEnumFactory.java | 2 +- .../valuesets/V3CalendarEnumFactory.java | 2 +- .../model/valuesets/V3CalendarType.java | 2 +- .../valuesets/V3CalendarTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3Charset.java | 2 +- .../model/valuesets/V3CharsetEnumFactory.java | 2 +- .../model/valuesets/V3CodingRationale.java | 2 +- .../V3CodingRationaleEnumFactory.java | 2 +- .../V3CommunicationFunctionType.java | 2 +- ...3CommunicationFunctionTypeEnumFactory.java | 2 +- .../valuesets/V3CompressionAlgorithm.java | 2 +- .../V3CompressionAlgorithmEnumFactory.java | 2 +- .../model/valuesets/V3Confidentiality.java | 2 +- .../V3ConfidentialityEnumFactory.java | 2 +- .../model/valuesets/V3ContainerCap.java | 2 +- .../valuesets/V3ContainerCapEnumFactory.java | 2 +- .../model/valuesets/V3ContainerSeparator.java | 2 +- .../V3ContainerSeparatorEnumFactory.java | 2 +- .../valuesets/V3ContentProcessingMode.java | 2 +- .../V3ContentProcessingModeEnumFactory.java | 2 +- .../model/valuesets/V3ContextControl.java | 2 +- .../V3ContextControlEnumFactory.java | 2 +- .../model/valuesets/V3DataOperation.java | 2 +- .../valuesets/V3DataOperationEnumFactory.java | 2 +- .../model/valuesets/V3DeviceAlertLevel.java | 2 +- .../V3DeviceAlertLevelEnumFactory.java | 2 +- .../model/valuesets/V3DocumentCompletion.java | 2 +- .../V3DocumentCompletionEnumFactory.java | 2 +- .../model/valuesets/V3DocumentStorage.java | 2 +- .../V3DocumentStorageEnumFactory.java | 2 +- .../model/valuesets/V3EducationLevel.java | 2 +- .../V3EducationLevelEnumFactory.java | 2 +- .../model/valuesets/V3EmployeeJobClass.java | 2 +- .../V3EmployeeJobClassEnumFactory.java | 2 +- .../valuesets/V3EncounterAdmissionSource.java | 2 +- ...V3EncounterAdmissionSourceEnumFactory.java | 2 +- .../valuesets/V3EncounterSpecialCourtesy.java | 2 +- ...V3EncounterSpecialCourtesyEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3EntityClass.java | 2 +- .../valuesets/V3EntityClassEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3EntityCode.java | 2 +- .../valuesets/V3EntityCodeEnumFactory.java | 2 +- .../model/valuesets/V3EntityDeterminer.java | 2 +- .../V3EntityDeterminerEnumFactory.java | 2 +- .../model/valuesets/V3EntityHandling.java | 2 +- .../V3EntityHandlingEnumFactory.java | 2 +- .../valuesets/V3EntityNamePartQualifier.java | 2 +- .../V3EntityNamePartQualifierEnumFactory.java | 2 +- .../V3EntityNamePartQualifierR2.java | 2 +- ...3EntityNamePartQualifierR2EnumFactory.java | 2 +- .../model/valuesets/V3EntityNamePartType.java | 2 +- .../V3EntityNamePartTypeEnumFactory.java | 2 +- .../valuesets/V3EntityNamePartTypeR2.java | 2 +- .../V3EntityNamePartTypeR2EnumFactory.java | 2 +- .../model/valuesets/V3EntityNameUse.java | 2 +- .../valuesets/V3EntityNameUseEnumFactory.java | 2 +- .../model/valuesets/V3EntityNameUseR2.java | 2 +- .../V3EntityNameUseR2EnumFactory.java | 2 +- .../dstu21/model/valuesets/V3EntityRisk.java | 2 +- .../valuesets/V3EntityRiskEnumFactory.java | 2 +- .../model/valuesets/V3EntityStatus.java | 2 +- .../valuesets/V3EntityStatusEnumFactory.java | 2 +- .../valuesets/V3EquipmentAlertLevel.java | 2 +- .../V3EquipmentAlertLevelEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3Ethnicity.java | 2 +- .../valuesets/V3EthnicityEnumFactory.java | 2 +- .../model/valuesets/V3ExposureMode.java | 2 +- .../valuesets/V3ExposureModeEnumFactory.java | 2 +- .../model/valuesets/V3GTSAbbreviation.java | 2 +- .../V3GTSAbbreviationEnumFactory.java | 2 +- .../model/valuesets/V3GenderStatus.java | 2 +- .../valuesets/V3GenderStatusEnumFactory.java | 2 +- .../model/valuesets/V3HL7UpdateMode.java | 2 +- .../valuesets/V3HL7UpdateModeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3Hl7Realm.java | 2 +- .../valuesets/V3Hl7RealmEnumFactory.java | 2 +- .../model/valuesets/V3Hl7V3Conformance.java | 2 +- .../V3Hl7V3ConformanceEnumFactory.java | 2 +- .../model/valuesets/V3HtmlLinkType.java | 2 +- .../valuesets/V3HtmlLinkTypeEnumFactory.java | 2 +- .../valuesets/V3IdentifierReliability.java | 2 +- .../V3IdentifierReliabilityEnumFactory.java | 2 +- .../model/valuesets/V3IdentifierScope.java | 2 +- .../V3IdentifierScopeEnumFactory.java | 2 +- .../valuesets/V3IntegrityCheckAlgorithm.java | 2 +- .../V3IntegrityCheckAlgorithmEnumFactory.java | 2 +- .../valuesets/V3LanguageAbilityMode.java | 2 +- .../V3LanguageAbilityModeEnumFactory.java | 2 +- .../V3LanguageAbilityProficiency.java | 2 +- ...LanguageAbilityProficiencyEnumFactory.java | 2 +- .../model/valuesets/V3LivingArrangement.java | 2 +- .../V3LivingArrangementEnumFactory.java | 2 +- .../model/valuesets/V3LocalMarkupIgnore.java | 2 +- .../V3LocalMarkupIgnoreEnumFactory.java | 2 +- .../valuesets/V3LocalRemoteControlState.java | 2 +- .../V3LocalRemoteControlStateEnumFactory.java | 2 +- .../V3ManagedParticipationStatus.java | 2 +- ...ManagedParticipationStatusEnumFactory.java | 2 +- .../model/valuesets/V3MapRelationship.java | 2 +- .../V3MapRelationshipEnumFactory.java | 2 +- .../model/valuesets/V3MaritalStatus.java | 2 +- .../valuesets/V3MaritalStatusEnumFactory.java | 2 +- .../valuesets/V3MessageWaitingPriority.java | 2 +- .../V3MessageWaitingPriorityEnumFactory.java | 2 +- .../model/valuesets/V3ModifyIndicator.java | 2 +- .../V3ModifyIndicatorEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3NullFlavor.java | 2 +- .../valuesets/V3NullFlavorEnumFactory.java | 2 +- .../V3ObservationInterpretation.java | 2 +- ...3ObservationInterpretationEnumFactory.java | 2 +- .../model/valuesets/V3ObservationMethod.java | 2 +- .../V3ObservationMethodEnumFactory.java | 2 +- .../model/valuesets/V3ObservationValue.java | 2 +- .../V3ObservationValueEnumFactory.java | 2 +- .../model/valuesets/V3OrderableDrugForm.java | 2 +- .../V3OrderableDrugFormEnumFactory.java | 2 +- .../valuesets/V3ParticipationFunction.java | 2 +- .../V3ParticipationFunctionEnumFactory.java | 2 +- .../model/valuesets/V3ParticipationMode.java | 2 +- .../V3ParticipationModeEnumFactory.java | 2 +- .../valuesets/V3ParticipationSignature.java | 2 +- .../V3ParticipationSignatureEnumFactory.java | 2 +- .../model/valuesets/V3ParticipationType.java | 2 +- .../V3ParticipationTypeEnumFactory.java | 2 +- .../model/valuesets/V3PatientImportance.java | 2 +- .../V3PatientImportanceEnumFactory.java | 2 +- .../model/valuesets/V3PaymentTerms.java | 2 +- .../valuesets/V3PaymentTermsEnumFactory.java | 2 +- .../valuesets/V3PersonDisabilityType.java | 2 +- .../V3PersonDisabilityTypeEnumFactory.java | 2 +- .../V3ProbabilityDistributionType.java | 2 +- ...robabilityDistributionTypeEnumFactory.java | 2 +- .../model/valuesets/V3ProcessingID.java | 2 +- .../valuesets/V3ProcessingIDEnumFactory.java | 2 +- .../model/valuesets/V3ProcessingMode.java | 2 +- .../V3ProcessingModeEnumFactory.java | 2 +- .../valuesets/V3QueryParameterValue.java | 2 +- .../V3QueryParameterValueEnumFactory.java | 2 +- .../model/valuesets/V3QueryPriority.java | 2 +- .../valuesets/V3QueryPriorityEnumFactory.java | 2 +- .../model/valuesets/V3QueryRequestLimit.java | 2 +- .../V3QueryRequestLimitEnumFactory.java | 2 +- .../model/valuesets/V3QueryResponse.java | 2 +- .../valuesets/V3QueryResponseEnumFactory.java | 2 +- .../model/valuesets/V3QueryStatusCode.java | 2 +- .../V3QueryStatusCodeEnumFactory.java | 2 +- .../fhir/dstu21/model/valuesets/V3Race.java | 2 +- .../model/valuesets/V3RaceEnumFactory.java | 2 +- .../model/valuesets/V3RelationalOperator.java | 2 +- .../V3RelationalOperatorEnumFactory.java | 2 +- .../valuesets/V3RelationshipConjunction.java | 2 +- .../V3RelationshipConjunctionEnumFactory.java | 2 +- .../valuesets/V3ReligiousAffiliation.java | 2 +- .../V3ReligiousAffiliationEnumFactory.java | 2 +- .../model/valuesets/V3ResponseLevel.java | 2 +- .../valuesets/V3ResponseLevelEnumFactory.java | 2 +- .../model/valuesets/V3ResponseModality.java | 2 +- .../V3ResponseModalityEnumFactory.java | 2 +- .../model/valuesets/V3ResponseMode.java | 2 +- .../valuesets/V3ResponseModeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3RoleClass.java | 2 +- .../valuesets/V3RoleClassEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3RoleCode.java | 2 +- .../valuesets/V3RoleCodeEnumFactory.java | 2 +- .../model/valuesets/V3RoleLinkStatus.java | 2 +- .../V3RoleLinkStatusEnumFactory.java | 2 +- .../model/valuesets/V3RoleLinkType.java | 2 +- .../valuesets/V3RoleLinkTypeEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3RoleStatus.java | 2 +- .../valuesets/V3RoleStatusEnumFactory.java | 2 +- .../valuesets/V3RouteOfAdministration.java | 2 +- .../V3RouteOfAdministrationEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3Sequencing.java | 2 +- .../valuesets/V3SequencingEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3SetOperator.java | 2 +- .../valuesets/V3SetOperatorEnumFactory.java | 2 +- .../model/valuesets/V3SpecimenType.java | 2 +- .../valuesets/V3SpecimenTypeEnumFactory.java | 2 +- .../V3SubstanceAdminSubstitution.java | 2 +- ...SubstanceAdminSubstitutionEnumFactory.java | 2 +- .../valuesets/V3SubstitutionCondition.java | 2 +- .../V3SubstitutionConditionEnumFactory.java | 2 +- .../valuesets/V3TableCellHorizontalAlign.java | 2 +- ...V3TableCellHorizontalAlignEnumFactory.java | 2 +- .../model/valuesets/V3TableCellScope.java | 2 +- .../V3TableCellScopeEnumFactory.java | 2 +- .../valuesets/V3TableCellVerticalAlign.java | 2 +- .../V3TableCellVerticalAlignEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3TableFrame.java | 2 +- .../valuesets/V3TableFrameEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3TableRules.java | 2 +- .../valuesets/V3TableRulesEnumFactory.java | 2 +- .../model/valuesets/V3TargetAwareness.java | 2 +- .../V3TargetAwarenessEnumFactory.java | 2 +- .../V3TelecommunicationCapabilities.java | 2 +- ...ecommunicationCapabilitiesEnumFactory.java | 2 +- .../dstu21/model/valuesets/V3TimingEvent.java | 2 +- .../valuesets/V3TimingEventEnumFactory.java | 2 +- .../V3TransmissionRelationshipTypeCode.java | 2 +- ...issionRelationshipTypeCodeEnumFactory.java | 2 +- .../model/valuesets/V3TribalEntityUS.java | 2 +- .../V3TribalEntityUSEnumFactory.java | 2 +- .../valuesets/V3VaccineManufacturer.java | 2 +- .../V3VaccineManufacturerEnumFactory.java | 2 +- .../VaccinationProtocolDoseStatus.java | 2 +- ...cinationProtocolDoseStatusEnumFactory.java | 2 +- .../VaccinationProtocolDoseStatusReason.java | 2 +- ...onProtocolDoseStatusReasonEnumFactory.java | 2 +- .../dstu21/model/valuesets/VariantState.java | 2 +- .../valuesets/VariantStateEnumFactory.java | 2 +- .../dstu21/model/valuesets/VisionProduct.java | 2 +- .../valuesets/VisionProductEnumFactory.java | 2 +- .../model/valuesets/XdsRelationshipType.java | 2 +- .../XdsRelationshipTypeEnumFactory.java | 2 +- .../hl7/fhir/exceptions/FHIRException.java | 2 + .../server/ServerUsingOldTypesDstu21Test.java | 81 + .../ca/uhn/fhir/model/dstu2/FhirDstu2.java | 6 + .../hl7/fhir/instance/FhirDstu2Hl7Org.java | 7 + .../org/hl7/fhir/instance/model/Account.java | 15 +- .../org/hl7/fhir/instance/model/Address.java | 14 +- .../java/org/hl7/fhir/instance/model/Age.java | 35 +- .../instance/model/AllergyIntolerance.java | 18 +- .../hl7/fhir/instance/model/Annotation.java | 13 +- .../hl7/fhir/instance/model/Appointment.java | 18 +- .../instance/model/AppointmentResponse.java | 16 +- .../hl7/fhir/instance/model/Attachment.java | 15 +- .../hl7/fhir/instance/model/AuditEvent.java | 19 +- .../fhir/instance/model/BackboneElement.java | 12 +- .../fhir/instance/model/Base64BinaryType.java | 3 +- .../org/hl7/fhir/instance/model/Basic.java | 15 +- .../org/hl7/fhir/instance/model/Binary.java | 15 +- .../org/hl7/fhir/instance/model/BodySite.java | 15 +- .../hl7/fhir/instance/model/BooleanType.java | 3 +- .../org/hl7/fhir/instance/model/Bundle.java | 22 +- .../org/hl7/fhir/instance/model/CarePlan.java | 18 +- .../org/hl7/fhir/instance/model/Claim.java | 22 +- .../fhir/instance/model/ClaimResponse.java | 24 +- .../instance/model/ClinicalImpression.java | 18 +- .../org/hl7/fhir/instance/model/CodeType.java | 2 +- .../fhir/instance/model/CodeableConcept.java | 14 +- .../org/hl7/fhir/instance/model/Coding.java | 14 +- .../fhir/instance/model/Communication.java | 17 +- .../instance/model/CommunicationRequest.java | 17 +- .../hl7/fhir/instance/model/Composition.java | 18 +- .../hl7/fhir/instance/model/ConceptMap.java | 23 +- .../hl7/fhir/instance/model/Condition.java | 18 +- .../hl7/fhir/instance/model/Conformance.java | 24 +- .../hl7/fhir/instance/model/ContactPoint.java | 13 +- .../org/hl7/fhir/instance/model/Contract.java | 21 +- .../org/hl7/fhir/instance/model/Count.java | 35 +- .../org/hl7/fhir/instance/model/Coverage.java | 15 +- .../hl7/fhir/instance/model/DataElement.java | 21 +- .../hl7/fhir/instance/model/DateTimeType.java | 3 +- .../org/hl7/fhir/instance/model/DateType.java | 2 +- .../hl7/fhir/instance/model/DecimalType.java | 3 +- .../fhir/instance/model/DetectedIssue.java | 18 +- .../org/hl7/fhir/instance/model/Device.java | 16 +- .../fhir/instance/model/DeviceComponent.java | 19 +- .../hl7/fhir/instance/model/DeviceMetric.java | 17 +- .../fhir/instance/model/DeviceUseRequest.java | 16 +- .../instance/model/DeviceUseStatement.java | 16 +- .../fhir/instance/model/DiagnosticOrder.java | 17 +- .../fhir/instance/model/DiagnosticReport.java | 18 +- .../org/hl7/fhir/instance/model/Distance.java | 35 +- .../fhir/instance/model/DocumentManifest.java | 22 +- .../instance/model/DocumentReference.java | 21 +- .../fhir/instance/model/DomainResource.java | 14 +- .../org/hl7/fhir/instance/model/Duration.java | 35 +- .../org/hl7/fhir/instance/model/Element.java | 13 +- .../instance/model/ElementDefinition.java | 19 +- .../instance/model/EligibilityRequest.java | 16 +- .../instance/model/EligibilityResponse.java | 19 +- .../hl7/fhir/instance/model/Encounter.java | 16 +- .../instance/model/EnrollmentRequest.java | 16 +- .../instance/model/EnrollmentResponse.java | 19 +- .../hl7/fhir/instance/model/Enumeration.java | 3 +- .../hl7/fhir/instance/model/Enumerations.java | 34 - .../fhir/instance/model/EpisodeOfCare.java | 16 +- .../instance/model/ExplanationOfBenefit.java | 19 +- .../hl7/fhir/instance/model/Extension.java | 13 +- .../instance/model/FamilyMemberHistory.java | 21 +- .../org/hl7/fhir/instance/model/Flag.java | 15 +- .../org/hl7/fhir/instance/model/Goal.java | 17 +- .../org/hl7/fhir/instance/model/Group.java | 17 +- .../instance/model/HealthcareService.java | 17 +- .../hl7/fhir/instance/model/HumanName.java | 14 +- .../org/hl7/fhir/instance/model/IdType.java | 23 +- .../hl7/fhir/instance/model/Identifier.java | 14 +- .../model/ImagingObjectSelection.java | 18 +- .../hl7/fhir/instance/model/ImagingStudy.java | 18 +- .../hl7/fhir/instance/model/Immunization.java | 18 +- .../model/ImmunizationRecommendation.java | 18 +- .../instance/model/ImplementationGuide.java | 21 +- .../hl7/fhir/instance/model/InstantType.java | 2 +- .../hl7/fhir/instance/model/IntegerType.java | 3 +- .../org/hl7/fhir/instance/model/List_.java | 18 +- .../org/hl7/fhir/instance/model/Location.java | 20 +- .../hl7/fhir/instance/model/MarkdownType.java | 2 +- .../org/hl7/fhir/instance/model/Media.java | 15 +- .../hl7/fhir/instance/model/Medication.java | 18 +- .../model/MedicationAdministration.java | 17 +- .../instance/model/MedicationDispense.java | 18 +- .../fhir/instance/model/MedicationOrder.java | 18 +- .../instance/model/MedicationStatement.java | 18 +- .../fhir/instance/model/MessageHeader.java | 19 +- .../org/hl7/fhir/instance/model/Meta.java | 7 +- .../org/hl7/fhir/instance/model/Money.java | 35 +- .../hl7/fhir/instance/model/NamingSystem.java | 21 +- .../hl7/fhir/instance/model/Narrative.java | 12 +- .../fhir/instance/model/NutritionOrder.java | 18 +- .../hl7/fhir/instance/model/Observation.java | 18 +- .../org/hl7/fhir/instance/model/OidType.java | 2 +- .../instance/model/OperationDefinition.java | 23 +- .../fhir/instance/model/OperationOutcome.java | 17 +- .../org/hl7/fhir/instance/model/Order.java | 16 +- .../fhir/instance/model/OrderResponse.java | 16 +- .../hl7/fhir/instance/model/Organization.java | 17 +- .../hl7/fhir/instance/model/Parameters.java | 16 +- .../org/hl7/fhir/instance/model/Patient.java | 20 +- .../fhir/instance/model/PaymentNotice.java | 16 +- .../instance/model/PaymentReconciliation.java | 21 +- .../org/hl7/fhir/instance/model/Period.java | 12 +- .../org/hl7/fhir/instance/model/Person.java | 20 +- .../fhir/instance/model/PositiveIntType.java | 2 +- .../hl7/fhir/instance/model/Practitioner.java | 20 +- .../hl7/fhir/instance/model/Procedure.java | 16 +- .../fhir/instance/model/ProcedureRequest.java | 16 +- .../fhir/instance/model/ProcessRequest.java | 19 +- .../fhir/instance/model/ProcessResponse.java | 19 +- .../hl7/fhir/instance/model/Provenance.java | 18 +- .../org/hl7/fhir/instance/model/Quantity.java | 16 +- .../fhir/instance/model/Questionnaire.java | 19 +- .../instance/model/QuestionnaireResponse.java | 18 +- .../org/hl7/fhir/instance/model/Range.java | 11 +- .../org/hl7/fhir/instance/model/Ratio.java | 11 +- .../hl7/fhir/instance/model/Reference.java | 15 +- .../fhir/instance/model/ReferralRequest.java | 16 +- .../fhir/instance/model/RelatedPerson.java | 18 +- .../org/hl7/fhir/instance/model/Resource.java | 14 +- .../fhir/instance/model/RiskAssessment.java | 21 +- .../hl7/fhir/instance/model/SampledData.java | 15 +- .../org/hl7/fhir/instance/model/Schedule.java | 15 +- .../fhir/instance/model/SearchParameter.java | 23 +- .../hl7/fhir/instance/model/Signature.java | 15 +- .../fhir/instance/model/SimpleQuantity.java | 35 +- .../org/hl7/fhir/instance/model/Slot.java | 16 +- .../org/hl7/fhir/instance/model/Specimen.java | 18 +- .../hl7/fhir/instance/model/StringType.java | 3 +- .../instance/model/StructureDefinition.java | 21 +- .../hl7/fhir/instance/model/Subscription.java | 18 +- .../hl7/fhir/instance/model/Substance.java | 18 +- .../fhir/instance/model/SupplyDelivery.java | 16 +- .../fhir/instance/model/SupplyRequest.java | 17 +- .../hl7/fhir/instance/model/TestScript.java | 21 +- .../org/hl7/fhir/instance/model/TimeType.java | 2 +- .../org/hl7/fhir/instance/model/Timing.java | 19 +- .../fhir/instance/model/UnsignedIntType.java | 2 +- .../org/hl7/fhir/instance/model/UriType.java | 3 +- .../org/hl7/fhir/instance/model/ValueSet.java | 21 +- .../instance/model/VisionPrescription.java | 21 +- .../instance/model/annotations/Block.java | 75 - .../instance/model/annotations/Child.java | 165 - .../model/annotations/DatatypeDef.java | 88 - .../model/annotations/Description.java | 75 - .../instance/model/annotations/Extension.java | 94 - .../model/annotations/ResourceDef.java | 89 - .../annotations/SearchParamDefinition.java | 90 - .../hl7/fhir/utilities/xhtml/XhtmlNode.java | 3 +- .../uhn/fhir/model/ModelInheritanceTest.java | 8 +- .../uhn/fhir/parser/JsonParserHl7OrgTest.java | 23 +- .../parser/MyObservationWithExtensions.java | 8 +- .../uhn/fhir/parser/MyOrganizationDstu2.java | 3 +- .../ca/uhn/fhir/parser/MyPatientHl7Org.java | 9 +- .../fhir/parser/ResourceWithExtensionsA.java | 11 +- .../model/dstu21/profile/valueset.profile.xml | 2 +- .../model/dstu21/schema/fhir-single.xsd | 2 +- .../dstu21/guidancerequest-spreadsheet.xml | 7344 +++++++++++++++++ 877 files changed, 29881 insertions(+), 4480 deletions(-) create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java create mode 100644 hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Block.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Child.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/DatatypeDef.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Description.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Extension.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/ResourceDef.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/SearchParamDefinition.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IAnyResource.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBackboneElement.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBase.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBackboneElement.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBinary.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBooleanDatatype.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBundle.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseCoding.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseConformance.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatype.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatypeElement.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDecimalDatatype.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseElement.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumFactory.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumeration.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseExtension.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseFhirEnum.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasExtensions.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasModifierExtensions.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseIntegerDatatype.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseMetaType.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseOperationOutcome.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseParameters.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseReference.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseResource.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseXhtml.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/ICompositeType.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IDomainResource.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IIdType.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/INarrative.java delete mode 100644 hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IPrimitiveType.java create mode 100644 hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Block.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Child.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/DatatypeDef.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Description.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Extension.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/ResourceDef.java delete mode 100644 hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/SearchParamDefinition.java create mode 100644 hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index e34e72261d8..e35c919b778 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -246,58 +246,58 @@ class ModelScanner { private T pullAnnotation(Class theContainer, AnnotatedElement theTarget, Class theAnnotationType) { T retVal = theTarget.getAnnotation(theAnnotationType); - if (myContext.getVersion().getVersion() != FhirVersionEnum.DSTU2_HL7ORG) { +// if (myContext.getVersion().getVersion() != FhirVersionEnum.DSTU2_HL7ORG) { return retVal; - } - - if (retVal == null) { - final Class altAnnotationClass; - /* - * Use a cache to minimize Class.forName calls, since they are slow and expensive.. - */ - if (myAnnotationForwards.containsKey(theAnnotationType) == false) { - String sourceClassName = theAnnotationType.getName(); - String candidateAltClassName = sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations"); - if (!sourceClassName.equals(candidateAltClassName)) { - Class forName; - try { - forName = Class.forName(candidateAltClassName); - ourLog.debug("Forwarding annotation request for [{}] to class [{}]", theAnnotationType, forName); - } catch (ClassNotFoundException e) { - forName = null; - } - altAnnotationClass = (Class) forName; - } else { - altAnnotationClass = null; - } - myAnnotationForwards.put(theAnnotationType, altAnnotationClass); - } else { - altAnnotationClass = myAnnotationForwards.get(theAnnotationType); - } - - if (altAnnotationClass == null) { - return null; - } - - final Annotation altAnnotation; - altAnnotation = theTarget.getAnnotation(altAnnotationClass); - if (altAnnotation == null) { - return null; - } - - InvocationHandler h = new InvocationHandler() { - - @Override - public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable { - Method altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes()); - return altMethod.invoke(altAnnotation, theArgs); - } - }; - retVal = (T) Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class[] { theAnnotationType }, h); - - } - - return retVal; +// } +// +// if (retVal == null) { +// final Class altAnnotationClass; +// /* +// * Use a cache to minimize Class.forName calls, since they are slow and expensive.. +// */ +// if (myAnnotationForwards.containsKey(theAnnotationType) == false) { +// String sourceClassName = theAnnotationType.getName(); +// String candidateAltClassName = sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations"); +// if (!sourceClassName.equals(candidateAltClassName)) { +// Class forName; +// try { +// forName = Class.forName(candidateAltClassName); +// ourLog.debug("Forwarding annotation request for [{}] to class [{}]", theAnnotationType, forName); +// } catch (ClassNotFoundException e) { +// forName = null; +// } +// altAnnotationClass = (Class) forName; +// } else { +// altAnnotationClass = null; +// } +// myAnnotationForwards.put(theAnnotationType, altAnnotationClass); +// } else { +// altAnnotationClass = myAnnotationForwards.get(theAnnotationType); +// } +// +// if (altAnnotationClass == null) { +// return null; +// } +// +// final Annotation altAnnotation; +// altAnnotation = theTarget.getAnnotation(altAnnotationClass); +// if (altAnnotation == null) { +// return null; +// } +// +// InvocationHandler h = new InvocationHandler() { +// +// @Override +// public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable { +// Method altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes()); +// return altMethod.invoke(altAnnotation, theArgs); +// } +// }; +// retVal = (T) Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class[] { theAnnotationType }, h); +// +// } +// +// return retVal; } private void scan(Class theClass) throws ConfigurationException { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java index 619c87a16bb..ee4a3999dd2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java @@ -74,7 +74,14 @@ public class RuntimePrimitiveDatatypeDefinition extends BaseRuntimeElementDefini if (myProfileOfType != null) { myProfileOf = theClassToElementDefinitions.get(myProfileOfType); if (myProfileOf == null) { - throw new ConfigurationException("Unknown profileOf value: " + myProfileOfType + " in type " + getImplementingClass().getName()); + StringBuilder b = new StringBuilder(); + b.append("Unknown profileOf value: "); + b.append(myProfileOfType); + b.append(" in type "); + b.append(getImplementingClass().getName()); + b.append(" - Valid types: "); + b.append(theClassToElementDefinitions.keySet()); + throw new ConfigurationException(b.toString()); } } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java index b03cecb7ce8..eadf9a77d24 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java @@ -25,6 +25,7 @@ import java.util.Date; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.FhirContext; @@ -59,4 +60,6 @@ public interface IFhirVersion { IPrimitiveType getLastUpdated(IBaseResource theResource); + IIdType newIdType(); + } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java index c912e957cc7..b4d3a6d7ba3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java @@ -40,15 +40,6 @@ import ca.uhn.fhir.model.primitive.IdDt; *

*/ public interface IResource extends ICompositeElement, org.hl7.fhir.instance.model.api.IBaseResource { - /** - * Include constant for * (return all includes) - */ - public static final Include INCLUDE_ALL = new Include("*", false).toLocked(); - - /** - * Include set containing only {@link #INCLUDE_ALL} - */ - public static final Set WILDCARD_ALL_SET = Collections.unmodifiableSet(new HashSet(Arrays.asList(INCLUDE_ALL))); /** * Returns the contained resource list for this resource. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java index a9e65b40cc0..3446cb699c7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java @@ -675,4 +675,25 @@ public class IdDt extends UriDt implements IPrimitiveDatatype, IIdType { return theIdPart.toString(); } + @Override + public IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart) { + if (isNotBlank(theVersionIdPart)) { + Validate.notBlank(theResourceType, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + Validate.notBlank(theIdPart, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + } + if (isNotBlank(theBaseUrl) && isNotBlank(theIdPart)) { + Validate.notBlank(theResourceType, "If theBaseUrl is populated and theIdPart is populated, theResourceType must be populated"); + } + + setValue(null); + + myBaseUrl = theBaseUrl; + myResourceType = theResourceType; + myUnqualifiedId = theIdPart; + myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionIdPart, null); + myHaveComponentParts = true; + + return this; + } + } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java index 1145d3d41a6..d499f27fbb1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java @@ -531,7 +531,7 @@ public class JsonParser extends BaseParser implements IParser { BaseRuntimeChildDefinition nextChild = nextChildElem.getDef(); if (nextChild instanceof RuntimeChildNarrativeDefinition) { INarrativeGenerator gen = myContext.getNarrativeGenerator(); - if (gen != null) { + if (gen != null && theResource instanceof IResource) { BaseNarrativeDt narr = ((IResource) theResource).getText(); if (narr.getDiv().isEmpty()) { gen.generateNarrative(theResDef.getResourceProfile(), theResource, narr); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java index 7379e30da6f..9383bdc93b2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java @@ -1798,7 +1798,7 @@ public class GenericClient extends BaseClient implements IGenericClient { } } - if (myReturnBundleType == null && myContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU2_HL7ORG)) { + if (myReturnBundleType == null && myContext.getVersion().getVersion().isRi()) { throw new IllegalArgumentException("When using the client with HL7.org structures, you must specify " + "the bundle return type for the client by adding \".returnBundle(org.hl7.fhir.instance.model.Bundle.class)\" to your search method call before the \".execute()\" method"); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java index 37316520fa4..ee5e66dba83 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; @@ -267,12 +268,14 @@ abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBinding 0) { String locationHeader = locationHeaders.get(0); - BaseOutcomeReturningMethodBinding.parseContentLocation(retVal, theResourceName, locationHeader); + BaseOutcomeReturningMethodBinding.parseContentLocation(theContext, retVal, theResourceName, locationHeader); } if (theResponseStatusCode != Constants.STATUS_HTTP_204_NO_CONTENT) { EncodingEnum ct = EncodingEnum.forContentType(theResponseMimeType); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java index cf9bf56e18a..53b3b562a61 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java @@ -43,6 +43,7 @@ import ca.uhn.fhir.context.RuntimeChildPrimitiveDatatypeDefinition; import ca.uhn.fhir.context.RuntimePrimitiveDatatypeDefinition; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.i18n.HapiLocalizer; +import ca.uhn.fhir.model.api.IDatatype; import ca.uhn.fhir.rest.annotation.OperationParam; import ca.uhn.fhir.rest.api.RequestTypeEnum; import ca.uhn.fhir.rest.api.ValidationModeEnum; @@ -66,7 +67,7 @@ public class OperationParameter implements IParameter { private final String myOperationName; private Class myParameterType; private String myParamType; - private FhirContext myContext; + private final FhirContext myContext; private boolean myAllowGet; public OperationParameter(FhirContext theCtx, String theOperationName, OperationParam theOperationParam) { @@ -83,6 +84,10 @@ public class OperationParameter implements IParameter { + protected FhirContext getContext() { + return myContext; + } + public int getMax() { return myMax; } @@ -102,6 +107,12 @@ public class OperationParameter implements IParameter { @SuppressWarnings("unchecked") @Override public void initializeTypes(Method theMethod, Class> theOuterCollectionType, Class> theInnerCollectionType, Class theParameterType) { + if (getContext().getVersion().getVersion().isRi()) { + if (IDatatype.class.isAssignableFrom(theParameterType)) { + throw new ConfigurationException("Incorrect use of type " + theParameterType.getSimpleName() + " as parameter type for method when context is for version " + getContext().getVersion().getVersion().name() + " in method: " + theMethod.toString()); + } + } + myParameterType = theParameterType; if (theInnerCollectionType != null) { myInnerCollectionType = CollectionBinder.getInstantiableCollectionType(theInnerCollectionType, myName); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java index ff60bbe59f4..5d074f8fbe5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java @@ -31,6 +31,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.hl7.fhir.instance.model.api.IIdType; + import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.api.RequestTypeEnum; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; @@ -43,7 +45,7 @@ public abstract class RequestDetails { private String myCompartmentName; private String myCompleteUrl; private String myFhirServerBase; - private IdDt myId; + private IIdType myId; private String myOperation; private Map myParameters; private String myRequestPath; @@ -72,7 +74,7 @@ public abstract class RequestDetails { return myFhirServerBase; } - public IdDt getId() { + public IIdType getId() { return myId; } @@ -132,7 +134,7 @@ public abstract class RequestDetails { myFhirServerBase = theFhirServerBase; } - public void setId(IdDt theId) { + public void setId(IIdType theId) { myId = theId; } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java index d463e9c7dc6..1e8578cfef8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java @@ -1,6 +1,5 @@ package ca.uhn.fhir.rest.method; -import static org.apache.commons.lang3.StringUtils.isBlank; /* * #%L * HAPI FHIR - Core Library @@ -26,6 +25,8 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.Set; +import org.hl7.fhir.instance.model.api.IIdType; + import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.primitive.IdDt; @@ -59,9 +60,9 @@ public class UpdateMethodBinding extends BaseOutcomeReturningMethodBindingWithRe * Content-Location header, but we allow it in the PUT URL as well.. */ String locationHeader = theRequest.getHeader(Constants.HEADER_CONTENT_LOCATION); - IdDt id = theRequest.getId(); + IIdType id = theRequest.getId(); if (isNotBlank(locationHeader)) { - id = new IdDt(locationHeader); + id.setValue(locationHeader); if (isNotBlank(id.getResourceType())) { if (!getResourceName().equals(id.getResourceType())) { throw new InvalidRequestException("Attempting to update '" + getResourceName() + "' but content-location header specifies different resource type '" + id.getResourceType() + "' - header value: " + locationHeader); @@ -85,7 +86,7 @@ public class UpdateMethodBinding extends BaseOutcomeReturningMethodBindingWithRe if (isNotBlank(locationHeader)) { MethodOutcome mo = new MethodOutcome(); - parseContentLocation(mo, getResourceName(), locationHeader); + parseContentLocation(getContext(), mo, getResourceName(), locationHeader); if (mo.getId() == null || mo.getId().isEmpty()) { throw new InvalidRequestException("Invalid Content-Location header for resource " + getResourceName() + ": " + locationHeader); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java index 3e2fd30ac04..8bb2dccee1f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java @@ -50,12 +50,12 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.ProvidedResourceScanner; import ca.uhn.fhir.context.RuntimeResourceDefinition; -import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.annotation.Destroy; import ca.uhn.fhir.rest.annotation.IdParam; @@ -64,7 +64,6 @@ import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.RequestTypeEnum; import ca.uhn.fhir.rest.method.BaseMethodBinding; import ca.uhn.fhir.rest.method.ConformanceMethodBinding; -import ca.uhn.fhir.rest.method.PageMethodBinding; import ca.uhn.fhir.rest.method.ParseAction; import ca.uhn.fhir.rest.method.RequestDetails; import ca.uhn.fhir.rest.server.exceptions.AuthenticationException; @@ -565,13 +564,14 @@ public class RestfulServer extends HttpServlet implements IRestfulServer params = new HashMap(theRequest.getParameterMap()); requestDetails.setParameters(params); - IdDt id; + IIdType id; populateRequestDetailsFromRequestPath(requestDetails, requestPath); if (theRequestType == RequestTypeEnum.PUT) { String contentLocation = theRequest.getHeader(Constants.HEADER_CONTENT_LOCATION); if (contentLocation != null) { - id = new IdDt(contentLocation); + id = myFhirContext.getVersion().newIdType(); + id.setValue(contentLocation); requestDetails.setId(id); } } @@ -876,7 +876,7 @@ public class RestfulServer extends HttpServlet implements IRestfulServer* (return all includes) + */ + public static final Include INCLUDE_ALL = new Include("*", false).toLocked(); + + /** + * Include set containing only {@link #INCLUDE_ALL} + */ + public static final Set WILDCARD_ALL_SET = Collections.unmodifiableSet(new HashSet(Arrays.asList(INCLUDE_ALL))); + IIdType getIdElement(); IBaseResource setId(String theId); diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java index 91b5a7d456f..7f47927a887 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java @@ -135,4 +135,20 @@ public interface IIdType { IIdType withVersion(String theVersion); + /** + * Sets the value of this ID by combining all of the individual parts. + *

+ * Required parameters: The following rules apply to the parameters of this method (in this case, populated means + * a non-empty string and not populated means null or an empty string) + *

+ *
    + *
  • All values may be not populated
    • + *
  • If theVersionIdPart is populated, theResourceType and theIdPart must be populated
    • + *
  • If theBaseUrl is populated and theIdPart is populated, theResourceType must be populated
    • + *
+ * + * @return Returns a reference to this for easy method chaining + */ + IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart); + } 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 5b491c2df15..b10c70af069 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 @@ -54,6 +54,7 @@ import org.apache.commons.lang3.StringUtils; 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.StringType; import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseCoding; @@ -1272,9 +1273,15 @@ public abstract class BaseHapiFhirDao implements IDao { } } + res.getMeta().getTag().clear(); + res.getMeta().getProfile().clear(); + res.getMeta().getSecurity().clear(); + res.getMeta().setLastUpdated(null); + res.getMeta().setVersionId(null); + populateResourceId(res, theEntity); - res.getMeta().setLastUpdated(theEntity.getUpdated().getValue()); + res.getMeta().setLastUpdated(theEntity.getUpdatedDate()); IDao.RESOURCE_PID.put(res, theEntity.getId()); Collection tags = theEntity.getTags(); @@ -1726,7 +1733,7 @@ public abstract class BaseHapiFhirDao implements IDao { List childElements = getContext().newTerser().getAllPopulatedChildElementsOfType(theResource, IPrimitiveType.class); for (@SuppressWarnings("rawtypes") IPrimitiveType nextType : childElements) { - if (nextType instanceof StringDt) { + if (nextType instanceof StringDt || nextType.getClass().equals(StringType.class)) { String nextValue = nextType.getValueAsString(); if (isNotBlank(nextValue)) { retVal.append(nextValue.replace("\n", " ").replace("\r", " ")); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu2.java index 3ff761d6103..bfe8a5db673 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu2.java @@ -24,11 +24,12 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; + import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu2.resource.Encounter; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.StringParam; @@ -37,7 +38,7 @@ import ca.uhn.fhir.rest.server.IBundleProvider; public class FhirResourceDaoEncounterDstu2 extends FhirResourceDaoDstu2implements IFhirResourceDaoEncounter { @Override - public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) { + public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort) { SearchParameterMap paramMap = new SearchParameterMap(); if (theCount != null) { paramMap.setCount(theCount.getValue()); @@ -56,7 +57,7 @@ public class FhirResourceDaoEncounterDstu2 extends FhirResourceDaoDstu2 theCount, DateRangeParam theLastUpdated, SortSpec theSort) { return encounterInstanceEverything(theServletRequest, null, theCount, theLastUpdated, theSort); } 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/FhirResourceDaoEncounterDstu21.java index 9953f0e4ccd..dc90eb38aad 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/FhirResourceDaoEncounterDstu21.java @@ -25,11 +25,11 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; import org.hl7.fhir.dstu21.model.Encounter; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.StringParam; @@ -38,7 +38,7 @@ import ca.uhn.fhir.rest.server.IBundleProvider; public class FhirResourceDaoEncounterDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoEncounter { @Override - public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) { + public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort) { SearchParameterMap paramMap = new SearchParameterMap(); if (theCount != null) { paramMap.setCount(theCount.getValue()); @@ -57,7 +57,7 @@ public class FhirResourceDaoEncounterDstu21 extends FhirResourceDaoDstu21 theCount, DateRangeParam theLastUpdated, SortSpec theSort) { return encounterInstanceEverything(theServletRequest, null, theCount, theLastUpdated, theSort); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu2.java index ec78f8ac67d..711cd5eebb8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu2.java @@ -25,11 +25,11 @@ import java.util.Collections; import javax.servlet.http.HttpServletRequest; import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu2.resource.Patient; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; @@ -41,7 +41,7 @@ import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetai public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2implements IFhirResourceDaoPatient { - private IBundleProvider doEverythingOperation(IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + private IBundleProvider doEverythingOperation(IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { SearchParameterMap paramMap = new SearchParameterMap(); if (theCount != null) { paramMap.setCount(theCount.getValue()); @@ -66,7 +66,7 @@ public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2im } @Override - public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { // Notify interceptors ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName()); notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_INSTANCE, requestDetails); @@ -75,7 +75,7 @@ public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2im } @Override - public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { // Notify interceptors ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName()); notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_TYPE, requestDetails); 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/FhirResourceDaoPatientDstu21.java index 80fceab0c61..1bc01c21a1b 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/FhirResourceDaoPatientDstu21.java @@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletRequest; import org.hl7.fhir.dstu21.model.Patient; import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; @@ -41,7 +41,7 @@ import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetai public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21implements IFhirResourceDaoPatient { - private IBundleProvider doEverythingOperation(IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + private IBundleProvider doEverythingOperation(IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { SearchParameterMap paramMap = new SearchParameterMap(); if (theCount != null) { paramMap.setCount(theCount.getValue()); @@ -66,7 +66,7 @@ public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21 } @Override - public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { // Notify interceptors ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName()); notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_INSTANCE, requestDetails); @@ -75,7 +75,7 @@ public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21 } @Override - public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { + public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) { // Notify interceptors ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName()); notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_TYPE, requestDetails); 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/FhirResourceDaoSubscriptionDstu21.java index 8e3c8d41236..8609ec09dcf 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/FhirResourceDaoSubscriptionDstu21.java @@ -32,6 +32,7 @@ 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.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.beans.factory.annotation.Autowired; @@ -52,8 +53,6 @@ import ca.uhn.fhir.jpa.dao.data.ISubscriptionTableDao; import ca.uhn.fhir.jpa.entity.ResourceTable; import ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource; import ca.uhn.fhir.jpa.entity.SubscriptionTable; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum; import ca.uhn.fhir.model.primitive.IdDt; @@ -175,9 +174,10 @@ public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21 flags = new ArrayList(); Date mostRecentMatch = null; - for (IBaseResource next : results.getResources(0, results.size())) { + for (IBaseResource nextBase : results.getResources(0, results.size())) { + IAnyResource next = (IAnyResource)nextBase; - Date updated = ResourceMetadataKeyEnum.UPDATED.get((IResource) next).getValue(); + Date updated = next.getMeta().getLastUpdated(); if (mostRecentMatch == null) { mostRecentMatch = updated; } else { @@ -189,7 +189,7 @@ public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21 0) { ourLog.info("Updated subscription status for subscription {} to {}", resourceId, resource.getStatus()); } else { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoEncounter.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoEncounter.java index 176d1069b14..13de6db47c1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoEncounter.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoEncounter.java @@ -23,17 +23,17 @@ import javax.servlet.http.HttpServletRequest; */ import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.server.IBundleProvider; public interface IFhirResourceDaoEncounter extends IFhirResourceDao { - IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdate, SortSpec theSort); + IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdate, SortSpec theSort); - IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec); + IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec); } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoPatient.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoPatient.java index a34d56d2251..0b2afb59556 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoPatient.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoPatient.java @@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletRequest; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; -import ca.uhn.fhir.model.primitive.UnsignedIntDt; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.StringAndListParam; @@ -33,8 +33,8 @@ import ca.uhn.fhir.rest.server.IBundleProvider; public interface IFhirResourceDaoPatient extends IFhirResourceDao { - IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdate, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative); + IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType theCount, DateRangeParam theLastUpdate, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative); - IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec, StringAndListParam theContent, StringAndListParam theNarrative); + IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec, StringAndListParam theContent, StringAndListParam theNarrative); } 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/SearchParamExtractorDstu21.java index 5fbb9cbebaf..3c99b5f3a9c 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/SearchParamExtractorDstu21.java @@ -207,7 +207,7 @@ public class SearchParamExtractorDstu21 extends BaseSearchParamExtractor impleme continue; } - if (new UriType(BaseHapiFhirDao.UCUM_NS).equals(nextValue.getSystemElement())) { + if (BaseHapiFhirDao.UCUM_NS.equals(nextValue.getSystem())) { if (isNotBlank(nextValue.getCode())) { Unit unit = Unit.valueOf(nextValue.getCode()); @@ -441,12 +441,12 @@ public class SearchParamExtractorDstu21 extends BaseSearchParamExtractor impleme List codes = new ArrayList(); String needContactPointSystem = null; - if (nextPath.endsWith("(system=phone)")) { - nextPath = nextPath.substring(0, nextPath.length() - "(system=phone)".length()); + if (nextPath.endsWith(".where(system='phone')")) { + nextPath = nextPath.substring(0, nextPath.length() - ".where(system='phone')".length()); needContactPointSystem = "phone"; } - if (nextPath.endsWith("(system=email)")) { - nextPath = nextPath.substring(0, nextPath.length() - "(system=email)".length()); + if (nextPath.endsWith(".where(system='email')")) { + nextPath = nextPath.substring(0, nextPath.length() - ".where(system='email')".length()); needContactPointSystem = "email"; } 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/BaseJpaResourceProviderEncounterDstu21.java index ac8d6e4470c..933c811f12a 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/BaseJpaResourceProviderEncounterDstu21.java @@ -1,6 +1,8 @@ package ca.uhn.fhir.jpa.provider; import org.hl7.fhir.dstu21.model.Encounter; +import org.hl7.fhir.dstu21.model.IdType; +import org.hl7.fhir.dstu21.model.UnsignedIntType; /* * #%L @@ -44,11 +46,11 @@ public class BaseJpaResourceProviderEncounterDstu21 extends JpaResourceProviderD javax.servlet.http.HttpServletRequest theServletRequest, @IdParam - ca.uhn.fhir.model.primitive.IdDt theId, + IdType theId, @Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") @OperationParam(name = Constants.PARAM_COUNT) - ca.uhn.fhir.model.primitive.UnsignedIntDt theCount, + UnsignedIntType theCount, @Description(shortDefinition="Only return resources which were last updated as specified by the given range") @OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) @@ -77,7 +79,7 @@ public class BaseJpaResourceProviderEncounterDstu21 extends JpaResourceProviderD @Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") @OperationParam(name = Constants.PARAM_COUNT) - ca.uhn.fhir.model.primitive.UnsignedIntDt theCount, + UnsignedIntType theCount, @Description(shortDefinition="Only return resources which were last updated as specified by the given range") @OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) 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/BaseJpaResourceProviderPatientDstu21.java index f27119eec7e..e534376804c 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/BaseJpaResourceProviderPatientDstu21.java @@ -4,7 +4,10 @@ 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; /* * #%L @@ -28,7 +31,6 @@ import org.hl7.fhir.dstu21.model.Patient; import ca.uhn.fhir.jpa.dao.IFhirResourceDaoPatient; import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Operation; import ca.uhn.fhir.rest.annotation.OperationParam; @@ -52,11 +54,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst javax.servlet.http.HttpServletRequest theServletRequest, @IdParam - ca.uhn.fhir.model.primitive.IdDt theId, + IdType theId, @Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") @OperationParam(name = Constants.PARAM_COUNT) - ca.uhn.fhir.model.primitive.UnsignedIntDt theCount, + UnsignedIntType theCount, @Description(shortDefinition="Only return resources which were last updated as specified by the given range") @OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) @@ -64,11 +66,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst @Description(shortDefinition="Filter the resources to return only resources matching the given _content filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)") @OperationParam(name = Constants.PARAM_CONTENT, min=0, max=OperationParam.MAX_UNLIMITED) - List theContent, + List theContent, @Description(shortDefinition="Filter the resources to return only resources matching the given _text filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)") @OperationParam(name = Constants.PARAM_TEXT, min=0, max=OperationParam.MAX_UNLIMITED) - List theNarrative, + List theNarrative, @Sort SortSpec theSortSpec @@ -94,7 +96,7 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst @Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") @OperationParam(name = Constants.PARAM_COUNT) - ca.uhn.fhir.model.primitive.UnsignedIntDt theCount, + UnsignedIntType theCount, @Description(shortDefinition="Only return resources which were last updated as specified by the given range") @OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) @@ -102,11 +104,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst @Description(shortDefinition="Filter the resources to return only resources matching the given _content filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)") @OperationParam(name = Constants.PARAM_CONTENT, min=0, max=OperationParam.MAX_UNLIMITED) - List theContent, + List theContent, @Description(shortDefinition="Filter the resources to return only resources matching the given _text filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)") @OperationParam(name = Constants.PARAM_TEXT, min=0, max=OperationParam.MAX_UNLIMITED) - List theNarrative, + List theNarrative, @Sort SortSpec theSortSpec @@ -122,10 +124,10 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst } - private StringAndListParam toStringAndList(List theNarrative) { + private StringAndListParam toStringAndList(List theNarrative) { StringAndListParam retVal = new StringAndListParam(); if (theNarrative != null) { - for (StringDt next : theNarrative) { + for (StringType next : theNarrative) { if (isNotBlank(next.getValue())) { retVal.addAnd(new StringOrListParam().addOr(new StringParam(next.getValue()))); } 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/JpaResourceProviderDstu21.java index bfab5c216a4..1c7f08f68dd 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/JpaResourceProviderDstu21.java @@ -22,12 +22,12 @@ 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.instance.model.api.IAnyResource; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; -import ca.uhn.fhir.model.dstu2.composite.MetaDt; -import ca.uhn.fhir.model.dstu2.resource.Parameters; -import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.annotation.ConditionalUrlParam; import ca.uhn.fhir.rest.annotation.Create; import ca.uhn.fhir.rest.annotation.Delete; @@ -71,7 +71,7 @@ public class JpaResourceProviderDstu21 extends BaseJpaRe } @Delete() - public MethodOutcome delete(HttpServletRequest theRequest, @IdParam IdDt theResource, @ConditionalUrlParam(supportsMultiple=true) String theConditional) { + public MethodOutcome delete(HttpServletRequest theRequest, @IdParam IdType theResource, @ConditionalUrlParam(supportsMultiple=true) String theConditional) { startRequest(theRequest); try { if (theConditional != null) { @@ -86,49 +86,49 @@ public class JpaResourceProviderDstu21 extends BaseJpaRe //@formatter:off @Operation(name=OPERATION_NAME_META, idempotent=true, returnParameters= { - @OperationParam(name="return", type=MetaDt.class) + @OperationParam(name="return", type=Meta.class) }) //@formatter:on public Parameters meta() { Parameters parameters = new Parameters(); - MetaDt metaGetOperation = getDao().metaGetOperation(MetaDt.class); + Meta metaGetOperation = getDao().metaGetOperation(Meta.class); parameters.addParameter().setName("return").setValue(metaGetOperation); return parameters; } //@formatter:off @Operation(name=OPERATION_NAME_META, idempotent=true, returnParameters= { - @OperationParam(name="return", type=MetaDt.class) + @OperationParam(name="return", type=Meta.class) }) //@formatter:on - public Parameters meta(@IdParam IdDt theId) { + public Parameters meta(@IdParam IdType theId) { Parameters parameters = new Parameters(); - MetaDt metaGetOperation = getDao().metaGetOperation(MetaDt.class, theId); + Meta metaGetOperation = getDao().metaGetOperation(Meta.class, theId); parameters.addParameter().setName("return").setValue(metaGetOperation); return parameters; } //@formatter:off @Operation(name=OPERATION_NAME_META_ADD, idempotent=true, returnParameters= { - @OperationParam(name="return", type=MetaDt.class) + @OperationParam(name="return", type=Meta.class) }) //@formatter:on - public Parameters metaAdd(@IdParam IdDt theId, @OperationParam(name = "meta") MetaDt theMeta) { + public Parameters metaAdd(@IdParam IdType theId, @OperationParam(name = "meta") Meta theMeta) { if (theMeta == null) { throw new InvalidRequestException("Input contains no parameter with name 'meta'"); } Parameters parameters = new Parameters(); - MetaDt metaAddOperation = getDao().metaAddOperation(theId, theMeta); + Meta metaAddOperation = getDao().metaAddOperation(theId, theMeta); parameters.addParameter().setName("return").setValue(metaAddOperation); return parameters; } //@formatter:off @Operation(name=OPERATION_NAME_META_DELETE, idempotent=true, returnParameters= { - @OperationParam(name="return", type=MetaDt.class) + @OperationParam(name="return", type=Meta.class) }) //@formatter:on - public Parameters metaDelete(@IdParam IdDt theId, @OperationParam(name = "meta") MetaDt theMeta) { + public Parameters metaDelete(@IdParam IdType theId, @OperationParam(name = "meta") Meta theMeta) { if (theMeta == null) { throw new InvalidRequestException("Input contains no parameter with name 'meta'"); } @@ -138,7 +138,7 @@ public class JpaResourceProviderDstu21 extends BaseJpaRe } @Update - public MethodOutcome update(HttpServletRequest theRequest, @ResourceParam T theResource, @IdParam IdDt theId, @ConditionalUrlParam String theConditional) { + public MethodOutcome update(HttpServletRequest theRequest, @ResourceParam T theResource, @IdParam IdType theId, @ConditionalUrlParam String theConditional) { startRequest(theRequest); try { if (theConditional != null) { @@ -159,7 +159,7 @@ public class JpaResourceProviderDstu21 extends BaseJpaRe } @Validate - public MethodOutcome validate(@ResourceParam T theResource, @IdParam IdDt theId, @ResourceParam String theRawResource, @ResourceParam EncodingEnum theEncoding, @Validate.Mode ValidationModeEnum theMode, + public MethodOutcome validate(@ResourceParam T theResource, @IdParam IdType theId, @ResourceParam String theRawResource, @ResourceParam EncodingEnum theEncoding, @Validate.Mode ValidationModeEnum theMode, @Validate.Profile String theProfile) { return getDao().validate(theResource, theId, theRawResource, theEncoding, theMode, theProfile); } 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 83906d892fd..66da8173438 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 @@ -7,6 +7,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.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.AfterClass; @@ -35,6 +36,16 @@ public class BaseJpaTest { return retVal; } + protected List toUnqualifiedVersionlessIds(org.hl7.fhir.dstu21.model.Bundle theFound) { + List retVal = new ArrayList(); + for (BundleEntryComponent next : theFound.getEntry()) { + // if (next.getResource()!= null) { + retVal.add(next.getResource().getIdElement().toUnqualifiedVersionless()); + // } + } + return retVal; + } + protected List toUnqualifiedVersionlessIds(IBundleProvider theFound) { List retVal = new ArrayList(); int size = theFound.size(); @@ -45,6 +56,25 @@ public class BaseJpaTest { } return retVal; } + + protected String[] toValues(IIdType... theValues) { + ArrayList retVal = new ArrayList(); + for (IIdType next : theValues) { + retVal.add(next.getValue()); + } + return retVal.toArray(new String[retVal.size()]); + } + + protected List toUnqualifiedVersionlessIdValues(IBundleProvider theFound) { + List retVal = new ArrayList(); + int size = theFound.size(); + ourLog.info("Found {} results", size); + List resources = theFound.getResources(0, size); + for (IBaseResource next : resources) { + retVal.add(next.getIdElement().toUnqualifiedVersionless().getValue()); + } + return retVal; + } protected List toUnqualifiedVersionlessIds(List theFound) { List retVal = new ArrayList(); 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/dstu21/FhirResourceDaoDstu21SearchFtTest.java index 1e14e25a8b6..df7174038a5 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/dstu21/FhirResourceDaoDstu21SearchFtTest.java @@ -57,16 +57,16 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true)); - assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1, id2)); + assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1, id2))); map = new SearchParameterMap(); map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true)); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty()); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty()); map = new SearchParameterMap(); map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true)); map.add(Constants.PARAM_CONTENT, new StringParam("obs1")); - assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1)); + assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1))); } @@ -89,7 +89,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Observation.SP_VALUE_STRING, new StringParam("sure").setContains(true)); - assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1, id2)); + assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1, id2))); } @@ -215,11 +215,11 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_TEXT, new StringParam("DIVAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); /* * Reindex @@ -233,19 +233,19 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty()); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty()); map = new SearchParameterMap(); map.add(Patient.SP_NAME, new StringParam("NAMEBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_TEXT, new StringParam("DIVBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); } @@ -288,7 +288,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { IIdType obsId3 = myObservationDao.create(obs3).getId().toUnqualifiedVersionless(); HttpServletRequest request; - List actual; + List actual; request = mock(HttpServletRequest.class); StringAndListParam param; @@ -296,17 +296,17 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1))); param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obstext1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, param)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, param)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1))); request = mock(HttpServletRequest.class); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId2, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId2, devId1))); /* * Add another match @@ -321,8 +321,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId4, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId4, devId1))); /* * Make one previous match no longer match @@ -337,8 +337,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId4)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId4))); } @@ -380,7 +380,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { IIdType obsId3 = myObservationDao.create(obs3).getId().toUnqualifiedVersionless(); HttpServletRequest request; - List actual; + List actual; request = mock(HttpServletRequest.class); StringAndListParam param; @@ -388,12 +388,12 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1))); request = mock(HttpServletRequest.class); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, null, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId2, devId1, ptId2, obsId3)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, null, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId2, devId1, ptId2, obsId3))); /* * Add another match @@ -408,8 +408,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId4, devId1)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId4, devId1))); /* * Make one previous match no longer match @@ -424,8 +424,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { param = new StringAndListParam(); param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); - actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); - assertThat(actual, containsInAnyOrder(ptId1, obsId4)); + actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null)); + assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId4))); } @@ -446,11 +446,11 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_TEXT, new StringParam("DIVAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); /* * Update but don't reindex @@ -464,28 +464,28 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), not(contains(pId1))); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), not(contains(toValues(pId1)))); myPatientDao.update(patient, null, true); map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty()); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty()); map = new SearchParameterMap(); map.add(Patient.SP_NAME, new StringParam("NAMEBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); map = new SearchParameterMap(); map.add(Constants.PARAM_TEXT, new StringParam("DIVBBB")); - assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1)); + assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1))); } @@ -510,18 +510,18 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test { obs.setValue(new StringType("Another fullText")); IIdType oId2 = myObservationDao.create(obs).getId().toUnqualifiedVersionless(); - List patients; + List patients; SearchParameterMap params; params = new SearchParameterMap(); params.add(Constants.PARAM_CONTENT, new StringParam("fulltext")); - patients = toUnqualifiedVersionlessIds(myPatientDao.search(params)); - assertThat(patients, containsInAnyOrder(pId1)); + patients = toUnqualifiedVersionlessIdValues(myPatientDao.search(params)); + assertThat(patients, containsInAnyOrder(toValues(pId1))); params = new SearchParameterMap(); params.add(Constants.PARAM_CONTENT, new StringParam("FULLTEXT")); - patients = toUnqualifiedVersionlessIds(myObservationDao.search(params)); - assertThat(patients, containsInAnyOrder(oId1, oId2)); + patients = toUnqualifiedVersionlessIdValues(myObservationDao.search(params)); + assertThat(patients, containsInAnyOrder(toValues(oId1, oId2))); } 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/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java index 10c77bbc9c9..9488aa66147 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/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -36,7 +35,6 @@ 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.InstantType; import org.hl7.fhir.dstu21.model.Location; import org.hl7.fhir.dstu21.model.Medication; import org.hl7.fhir.dstu21.model.MedicationOrder; @@ -69,9 +67,7 @@ import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken; import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri; import ca.uhn.fhir.jpa.entity.ResourceLink; import ca.uhn.fhir.model.api.IQueryParameterType; -import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.Include; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.rest.api.SortOrderEnum; import ca.uhn.fhir.rest.api.SortSpec; @@ -588,9 +584,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { { Map params = new HashMap(); params.put(BaseResource.SP_RES_LANGUAGE, new StringParam("en_CA")); - List patients = toList(myPatientDao.search(params)); + List patients = toList(myPatientDao.search(params)); assertEquals(1, patients.size()); - assertEquals(id1.toUnqualifiedVersionless(), patients.get(0).getId().toUnqualifiedVersionless()); + assertEquals(id1.toUnqualifiedVersionless(), patients.get(0).getIdElement().toUnqualifiedVersionless()); } { Map params = new HashMap(); @@ -1468,7 +1464,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { params.addInclude(Patient.INCLUDE_ORGANIZATION); params.addInclude(Organization.INCLUDE_PARTOF.asNonRecursive()); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(2, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); assertEquals(Organization.class, patients.get(1).getClass()); @@ -1480,7 +1476,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { params.addInclude(Patient.INCLUDE_ORGANIZATION); params.addInclude(Organization.INCLUDE_PARTOF.asRecursive()); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(3, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); assertEquals(Organization.class, patients.get(1).getClass()); @@ -1490,9 +1486,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { // * include non recursive SearchParameterMap params = new SearchParameterMap(); params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1")); - params.addInclude(IResource.INCLUDE_ALL.asNonRecursive()); + params.addInclude(IBaseResource.INCLUDE_ALL.asNonRecursive()); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(2, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); assertEquals(Organization.class, patients.get(1).getClass()); @@ -1501,9 +1497,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { // * include recursive SearchParameterMap params = new SearchParameterMap(); params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1")); - params.addInclude(IResource.INCLUDE_ALL.asRecursive()); + params.addInclude(IBaseResource.INCLUDE_ALL.asRecursive()); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(3, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); assertEquals(Organization.class, patients.get(1).getClass()); @@ -1515,7 +1511,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1")); params.addInclude(Encounter.INCLUDE_INDICATION); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(1, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); } @@ -1717,7 +1713,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test { params.add(Patient.SP_FAMILY, new StringParam("Tester_testSearchWithIncludesThatHaveTextId_P1")); params.addInclude(Patient.INCLUDE_ORGANIZATION); IBundleProvider search = myPatientDao.search(params); - List patients = toList(search); + List patients = toList(search); assertEquals(2, patients.size()); assertEquals(Patient.class, patients.get(0).getClass()); assertEquals(Organization.class, patients.get(1).getClass()); 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/dstu21/FhirResourceDaoDstu21Test.java index 408c2299a2c..e1cde136d35 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/dstu21/FhirResourceDaoDstu21Test.java @@ -110,7 +110,7 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test { ArrayList retVal = new ArrayList(); for (IBaseResource next : theSearch.getResources(0, theSearch.size())) { Patient nextPt = (Patient) next; - retVal.add(nextPt.addName().getNameAsSingleString()); + retVal.add(nextPt.getName().get(0).getNameAsSingleString()); } return retVal; } @@ -2314,17 +2314,17 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test { IIdType id2 = myEncounterDao.create(e2).getId().toUnqualifiedVersionless(); SearchParameterMap pm; - List actual; + List actual; pm = new SearchParameterMap(); pm.setSort(new SortSpec(Encounter.SP_LENGTH)); - actual = toUnqualifiedVersionlessIds(myEncounterDao.search(pm)); - assertThat(actual, contains(id1, id2, id3)); + actual = toUnqualifiedVersionlessIdValues(myEncounterDao.search(pm)); + assertThat(actual, contains(toValues(id1, id2, id3))); pm = new SearchParameterMap(); pm.setSort(new SortSpec(Encounter.SP_LENGTH, SortOrderEnum.DESC)); - actual = toUnqualifiedVersionlessIds(myEncounterDao.search(pm)); - assertThat(actual, contains(id3, id2, id1)); + actual = toUnqualifiedVersionlessIdValues(myEncounterDao.search(pm)); + assertThat(actual, contains(toValues(id3, id2, id1))); } public void testSortByQuantity() { 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/dstu21/FhirResourceDaoDstu21UpdateTest.java index 01d83a3d851..16acda945f9 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/dstu21/FhirResourceDaoDstu21UpdateTest.java @@ -27,14 +27,13 @@ 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.dstu21.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Test; import org.mockito.ArgumentCaptor; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.param.StringParam; @@ -60,7 +59,7 @@ public class FhirResourceDaoDstu21UpdateTest extends BaseJpaDstu21Test { Date now = new Date(); Patient retrieved = myPatientDao.read(outcome.getId()); - InstantType updated = retrieved.getMeta().getLastUpdatedElement(); + InstantType updated = retrieved.getMeta().getLastUpdatedElement().copy(); assertTrue(updated.before(now)); Thread.sleep(1000); @@ -99,13 +98,19 @@ public class FhirResourceDaoDstu21UpdateTest extends BaseJpaDstu21Test { IBundleProvider historyBundle = myPatientDao.history(outcome.getId(), null); assertEquals(2, historyBundle.size()); - + List history = historyBundle.getResources(0, 2); + + ourLog.info("updated : {}", updated.getValueAsString()); + ourLog.info(" * Exp : {}", ((Resource) history.get(1)).getMeta().getLastUpdatedElement().getValueAsString()); + ourLog.info("updated2: {}", updated2.getValueAsString()); + ourLog.info(" * Exp : {}", ((Resource) history.get(0)).getMeta().getLastUpdatedElement().getValueAsString()); + assertEquals("1", history.get(1).getIdElement().getVersionIdPart()); assertEquals("2", history.get(0).getIdElement().getVersionIdPart()); - assertEquals(updated.getValue(), ((IAnyResource) history.get(1)).getMeta().getLastUpdated()); + assertEquals(updated.getValueAsString(), ((Resource) history.get(1)).getMeta().getLastUpdatedElement().getValueAsString()); assertEquals("001", ((Patient) history.get(1)).getIdentifier().get(0).getValue()); - assertEquals(updated2.getValue(), ((IAnyResource) history.get(0)).getMeta().getLastUpdated()); + assertEquals(updated2.getValueAsString(), ((Resource) history.get(0)).getMeta().getLastUpdatedElement().getValueAsString()); assertEquals("002", ((Patient) history.get(0)).getIdentifier().get(0).getValue()); } 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/dstu21/FhirResourceDaoDstu21ValidateTest.java index f9fad681ef0..1877ffbd1fc 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/dstu21/FhirResourceDaoDstu21ValidateTest.java @@ -5,7 +5,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import java.io.IOException; -import java.util.Arrays; import org.apache.commons.io.IOUtils; import org.hl7.fhir.dstu21.model.Bundle; @@ -18,9 +17,9 @@ 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.instance.model.api.IBaseOperationOutcome; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; +import org.junit.Ignore; import org.junit.Test; import ca.uhn.fhir.rest.api.MethodOutcome; @@ -34,6 +33,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21ValidateTest.class); @Test + @Ignore public void testValidateResourceContainingProfileDeclarationJson() throws Exception { String methodName = "testValidateResourceContainingProfileDeclarationJson"; OperationOutcome outcome = doTestValidateResourceContainingProfileDeclaration(methodName, EncodingEnum.JSON); @@ -46,6 +46,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test { } @Test + @Ignore public void testValidateResourceContainingProfileDeclarationXml() throws Exception { String methodName = "testValidateResourceContainingProfileDeclarationXml"; OperationOutcome outcome = doTestValidateResourceContainingProfileDeclaration(methodName, EncodingEnum.XML); 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/dstu21/FhirResourceDaoValueSetDstu21Test.java index 0cf72367417..42c92aa3134 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/dstu21/FhirResourceDaoValueSetDstu21Test.java @@ -19,6 +19,7 @@ import org.hl7.fhir.dstu21.model.UriType; import org.hl7.fhir.dstu21.model.ValueSet; import org.hl7.fhir.instance.model.api.IIdType; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.springframework.transaction.annotation.Transactional; @@ -190,6 +191,7 @@ public class FhirResourceDaoValueSetDstu21Test extends BaseJpaDstu21Test { } @Test + @Ignore public void testExpandByIdentifier() { ValueSet expanded = myValueSetDao.expandByIdentifier("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", "11378"); String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); 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/dstu21/FhirSystemDaoDstu21Test.java index ba58d5154cb..1377f51ea79 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/dstu21/FhirSystemDaoDstu21Test.java @@ -301,7 +301,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { assertEquals("1", respEntry.getResponse().getEtag()); o = (Observation) myObservationDao.read(new IdType(respEntry.getResponse().getLocationElement())); - assertEquals(id.toVersionless(), o.getSubject().getReference()); + assertEquals(id.toVersionless().getValue(), o.getSubject().getReference()); assertEquals("1", o.getIdElement().getVersionIdPart()); } @@ -375,7 +375,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { assertEquals("1", respEntry.getResponse().getEtag()); o = (Observation) myObservationDao.read(new IdType(respEntry.getResponse().getLocationElement())); - assertEquals(new IdType(patientId).toUnqualifiedVersionless(), o.getSubject().getReference()); + assertEquals(new IdType(patientId).toUnqualifiedVersionless().getValue(), o.getSubject().getReference()); } @Test @@ -1033,13 +1033,13 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class); verify(myInterceptor, times(1)).incomingRequestPreHandled(eq(RestOperationTypeEnum.READ), detailsCapt.capture()); details = detailsCapt.getValue(); - assertEquals(idv1.toUnqualifiedVersionless(), details.getId()); + assertEquals(idv1.toUnqualifiedVersionless().getValue(), details.getId().getValue()); assertEquals("Patient", details.getResourceType()); detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class); verify(myInterceptor, times(1)).incomingRequestPreHandled(eq(RestOperationTypeEnum.VREAD), detailsCapt.capture()); details = detailsCapt.getValue(); - assertEquals(idv1.toUnqualified(), details.getId()); + assertEquals(idv1.toUnqualified().getValue(), details.getId().getValue()); assertEquals("Patient", details.getResourceType()); detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class); @@ -1195,7 +1195,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { nextEntry = resp.getEntry().get(1); o = myObservationDao.read(new IdType(nextEntry.getResponse().getLocation())); - assertEquals(id.toVersionless(), o.getSubject().getReference()); + assertEquals(id.toVersionless().getValue(), o.getSubject().getReference()); } @@ -1267,7 +1267,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { nextEntry = resp.getEntry().get(1); o = myObservationDao.read(new IdType(nextEntry.getResponse().getLocation())); - assertEquals(patientId.toVersionless(), o.getSubject().getReference()); + assertEquals(patientId.toVersionless().getValue(), o.getSubject().getReference()); } @@ -1308,7 +1308,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest { assertEquals(Constants.STATUS_HTTP_201_CREATED + " Created", nextEntry.getResponse().getStatus()); o = myObservationDao.read(new IdType(resp.getEntry().get(1).getResponse().getLocation())); - assertEquals(id.toVersionless(), o.getSubject().getReference()); + assertEquals(id.toVersionless().getValue(), o.getSubject().getReference()); } 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/dstu21/BaseResourceProviderDstu21Test.java new file mode 100644 index 00000000000..6bef64b68bb --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java @@ -0,0 +1,141 @@ +package ca.uhn.fhir.jpa.provider.dstu21; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +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.model.Bundle; +import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.dstu21.model.Patient; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.context.support.GenericWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; + +import ca.uhn.fhir.jpa.dao.dstu21.BaseJpaDstu21Test; +import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; +import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21; +import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; +import ca.uhn.fhir.model.api.BundleEntry; +import ca.uhn.fhir.model.primitive.IdDt; +import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; +import ca.uhn.fhir.rest.client.IGenericClient; +import ca.uhn.fhir.rest.client.ServerValidationModeEnum; +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 { + + protected static IGenericClient ourClient; + protected static CloseableHttpClient ourHttpClient; + protected static int ourPort; + private static Server ourServer; + protected static String ourServerBase; + + public BaseResourceProviderDstu21Test() { + super(); + } + + protected List toNameList(Bundle resp) { + List names = new ArrayList(); + for (BundleEntryComponent next : resp.getEntry()) { + Patient nextPt = (Patient) next.getResource(); + String nextStr = nextPt.getName().size() > 0 ? nextPt.getName().get(0).getGivenAsSingleString() + " " + nextPt.getName().get(0).getFamilyAsSingleString() : ""; + if (isNotBlank(nextStr)) { + names.add(nextStr); + } + } + return names; + } + + @AfterClass + public static void afterClass() throws Exception { + ourServer.stop(); + ourHttpClient.close(); + ourServer = null; + ourHttpClient = null; + } + + @After + public void after() { + myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.ONCE); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Before + public void before() throws Exception { + myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER); + myFhirCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000); + + if (ourServer == null) { + ourPort = RandomServerPortProvider.findFreePort(); + + RestfulServer restServer = new RestfulServer(myFhirCtx); + + ourServerBase = "http://localhost:" + ourPort + "/fhir/context"; + + restServer.setResourceProviders((List)myResourceProviders); + + restServer.getFhirContext().setNarrativeGenerator(new DefaultThymeleafNarrativeGenerator()); + + restServer.setPlainProviders(mySystemProvider); + + JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(restServer, mySystemDao, myDaoConfig); + confProvider.setImplementationDescription("THIS IS THE DESC"); + restServer.setServerConformanceProvider(confProvider); + + restServer.setPagingProvider(new FifoMemoryPagingProvider(10)); + + Server server = new Server(ourPort); + + ServletContextHandler proxyHandler = new ServletContextHandler(); + proxyHandler.setContextPath("/"); + + ServletHolder servletHolder = new ServletHolder(); + servletHolder.setServlet(restServer); + proxyHandler.addServlet(servletHolder, "/fhir/context/*"); + + GenericWebApplicationContext webApplicationContext = new GenericWebApplicationContext(); + webApplicationContext.setParent(myAppCtx); + webApplicationContext.refresh(); +// ContextLoaderListener loaderListener = new ContextLoaderListener(webApplicationContext); +// loaderListener.initWebApplicationContext(mock(ServletContext.class)); +// + proxyHandler.getServletContext().setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, webApplicationContext); + + DispatcherServlet dispatcherServlet = new DispatcherServlet(); +// dispatcherServlet.setApplicationContext(webApplicationContext); + dispatcherServlet.setContextClass(AnnotationConfigWebApplicationContext.class); + ServletHolder subsServletHolder = new ServletHolder(); + subsServletHolder.setServlet(dispatcherServlet); + proxyHandler.addServlet(subsServletHolder, "/*"); + + + server.setHandler(proxyHandler); + server.start(); + + ourClient = myFhirCtx.newRestfulGenericClient(ourServerBase); + ourClient.registerInterceptor(new LoggingInterceptor(true)); + + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS); + HttpClientBuilder builder = HttpClientBuilder.create(); + builder.setConnectionManager(connectionManager); + ourHttpClient = builder.build(); + + ourServer = server; + } + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000000..463e386d78e --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java @@ -0,0 +1,15 @@ +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/ResourceProviderDstu21Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java new file mode 100644 index 00000000000..6d8920b1c0f --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21Test.java @@ -0,0 +1,2373 @@ +package ca.uhn.fhir.jpa.provider.dstu21; + +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.containsInRelativeOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; +import static org.hamcrest.Matchers.stringContainsInOrder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketTimeoutException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +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.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.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.junit.Test; + +import ca.uhn.fhir.model.primitive.IdDt; +import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.api.MethodOutcome; +import ca.uhn.fhir.rest.api.SummaryEnum; +import ca.uhn.fhir.rest.client.IGenericClient; +import ca.uhn.fhir.rest.param.DateRangeParam; +import ca.uhn.fhir.rest.param.StringAndListParam; +import ca.uhn.fhir.rest.param.StringOrListParam; +import ca.uhn.fhir.rest.param.StringParam; +import ca.uhn.fhir.rest.server.Constants; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; +import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException; +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 { + + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu21Test.class); + + @Override + public void before() throws Exception { + super.before(); + + myDaoConfig.setAllowMultipleDelete(true); + } + + private void checkParamMissing(String paramName) throws IOException, ClientProtocolException { + HttpGet get = new HttpGet(ourServerBase + "/Observation?" + paramName + ":missing=false"); + CloseableHttpResponse resp = ourHttpClient.execute(get); + IOUtils.closeQuietly(resp.getEntity().getContent()); + assertEquals(200, resp.getStatusLine().getStatusCode()); + } + + @Test + public void testEverythingInstanceWithContentFilter() { + Patient pt1 = new Patient(); + pt1.addName().addFamily("Everything").addGiven("Arthur"); + IIdType ptId1 = myPatientDao.create(pt1).getId().toUnqualifiedVersionless(); + + Patient pt2 = new Patient(); + pt2.addName().addFamily("Everything").addGiven("Arthur"); + IIdType ptId2 = myPatientDao.create(pt2).getId().toUnqualifiedVersionless(); + + Device dev1 = new Device(); + dev1.setManufacturer("Some Manufacturer"); + IIdType devId1 = myDeviceDao.create(dev1).getId().toUnqualifiedVersionless(); + + Device dev2 = new Device(); + dev2.setManufacturer("Some Manufacturer 2"); + myDeviceDao.create(dev2).getId().toUnqualifiedVersionless(); + + Observation obs1 = new Observation(); + obs1.getText().setDivAsString("
OBSTEXT1
"); + obs1.getSubject().setReferenceElement(ptId1); + obs1.getCode().addCoding().setCode("CODE1"); + obs1.setValue(new StringType("obsvalue1")); + obs1.getDevice().setReferenceElement(devId1); + IIdType obsId1 = myObservationDao.create(obs1).getId().toUnqualifiedVersionless(); + + Observation obs2 = new Observation(); + obs2.getSubject().setReferenceElement(ptId1); + obs2.getCode().addCoding().setCode("CODE2"); + obs2.setValue(new StringType("obsvalue2")); + IIdType obsId2 = myObservationDao.create(obs2).getId().toUnqualifiedVersionless(); + + Observation obs3 = new Observation(); + obs3.getSubject().setReferenceElement(ptId2); + obs3.getCode().addCoding().setCode("CODE3"); + obs3.setValue(new StringType("obsvalue3")); + IIdType obsId3 = myObservationDao.create(obs3).getId().toUnqualifiedVersionless(); + + List actual; + StringAndListParam param; + + ourLog.info("Pt1:{} Pt2:{} Obs1:{} Obs2:{} Obs3:{}", new Object[] {ptId1.getIdPart(), ptId2.getIdPart(), obsId1.getIdPart(), obsId2.getIdPart(), obsId3.getIdPart()}); + + param = new StringAndListParam(); + param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1"))); + + //@formatter:off + Parameters response = ourClient + .operation() + .onInstance(ptId1) + .named("everything") + .withParameter(Parameters.class, Constants.PARAM_CONTENT, new StringType("obsvalue1")) + .execute(); + //@formatter:on + + actual = toUnqualifiedVersionlessIds((Bundle)response.getParameter().get(0).getResource()); + assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1)); + + } + + + @Test + public void testBundleCreate() throws Exception { + IGenericClient client = ourClient; + + String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/document-father.json")); + IIdType id = client.create().resource(resBody).execute().getId(); + + ourLog.info("Created: {}", id); + + Bundle bundle = client.read().resource(Bundle.class).withId(id).execute(); + + ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle)); + } + + @Test + public void testBundleCreateWithTypeTransaction() throws Exception { + IGenericClient client = ourClient; + + String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/document-father.json")); + resBody = resBody.replace("\"type\": \"document\"", "\"type\": \"transaction\""); + try { + client.create().resource(resBody).execute().getId(); + fail(); + } catch (UnprocessableEntityException e) { + assertThat(e.getMessage(), containsString("Unable to store a Bundle resource on this server with a Bundle.type value other than 'document' - Value was: transaction")); + } + } + + + // private void delete(String theResourceType, String theParamName, String theParamValue) { + // Bundle resources; + // do { + // IQuery forResource = ourClient.search().forResource(theResourceType); + // if (theParamName != null) { + // forResource = forResource.where(new StringClientParam(theParamName).matches().value(theParamValue)); + // } + // resources = forResource.execute(); + // for (IResource next : resources.toListOfResources()) { + // ourLog.info("Deleting resource: {}", next.getId()); + // ourClient.delete().resource(next).execute(); + // } + // } while (resources.size() > 0); + // } + // + // private void deleteToken(String theResourceType, String theParamName, String theParamSystem, String theParamValue) + // { + // Bundle resources = ourClient.search().forResource(theResourceType).where(new + // TokenClientParam(theParamName).exactly().systemAndCode(theParamSystem, theParamValue)).execute(); + // for (IResource next : resources.toListOfResources()) { + // ourLog.info("Deleting resource: {}", next.getId()); + // ourClient.delete().resource(next).execute(); + // } + // } + + @Test + public void testCodeSearch() { + Subscription subs = new Subscription(); + subs.setStatus(SubscriptionStatus.ACTIVE); + subs.getChannel().setType(SubscriptionChannelType.WEBSOCKET); + subs.setCriteria("Observation?"); + IIdType id = ourClient.create().resource(subs).execute().getId().toUnqualifiedVersionless(); + + //@formatter:off + Bundle resp = ourClient + .search() + .forResource(Subscription.class) + .where(Subscription.TYPE.exactly().code(SubscriptionChannelType.WEBSOCKET.toCode())) + .and(Subscription.STATUS.exactly().code(SubscriptionStatus.ACTIVE.toCode())) + .returnBundle(Bundle.class) + .execute(); + //@formatter:off + + assertThat(toUnqualifiedVersionlessIds(resp), contains(id)); + + //@formatter:off + resp = ourClient + .search() + .forResource(Subscription.class) + .where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelType.WEBSOCKET.getSystem(), SubscriptionChannelType.WEBSOCKET.toCode())) + .and(Subscription.STATUS.exactly().systemAndCode(SubscriptionStatus.ACTIVE.getSystem(), SubscriptionStatus.ACTIVE.toCode())) + .returnBundle(Bundle.class) + .execute(); + //@formatter:off + + assertThat(toUnqualifiedVersionlessIds(resp), contains(id)); + + //@formatter:off + resp = ourClient + .search() + .forResource(Subscription.class) + .where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelType.WEBSOCKET.getSystem(), SubscriptionChannelType.WEBSOCKET.toCode())) + .and(Subscription.STATUS.exactly().systemAndCode("foo", SubscriptionStatus.ACTIVE.toCode())) + .returnBundle(Bundle.class) + .execute(); + //@formatter:off + + assertThat(toUnqualifiedVersionlessIds(resp), empty()); + + } + + @Test + public void testCountParam() throws Exception { + // NB this does not get used- The paging provider has its own limits built in + myDaoConfig.setHardSearchLimit(100); + + List resources = new ArrayList(); + for (int i = 0; i < 100; i++) { + Organization org = new Organization(); + org.setName("rpdstu2_testCountParam_01"); + resources.add(org); + } + ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute(); + + //@formatter:on + Bundle found = ourClient + .search() + .forResource(Organization.class) + .where(Organization.NAME.matches() + .value("rpdstu2_testCountParam_01")) + .count(10) + .returnBundle(Bundle.class) + .execute(); + assertEquals(100, found.getTotal()); + assertEquals(10, found.getEntry().size()); + + found = ourClient + .search() + .forResource(Organization.class) + .where(Organization.NAME.matches().value("rpdstu2_testCountParam_01")) + .count(999) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + assertEquals(100, found.getTotal()); + assertEquals(50, found.getEntry().size()); + + } + + @Test + public void testCreateQuestionnaireResponseWithValidation() throws IOException { + ValueSet options = new ValueSet(); + options.getCodeSystem().setSystem("urn:system").addConcept().setCode("code0"); + IIdType optId = ourClient.create().resource(options).execute().getId(); + + Questionnaire q = new Questionnaire(); + q.addItem().setLinkId("link0").setRequired(false).setType(QuestionnaireItemType.CHOICE).setOptions(new Reference(optId)); + IIdType qId = ourClient.create().resource(q).execute().getId(); + + QuestionnaireResponse qa; + + // Good code + + qa = new QuestionnaireResponse(); + qa.getQuestionnaire().setReference(qId.toUnqualifiedVersionless().getValue()); + qa.addItem().setLinkId("link0").addAnswer().setValue(new Coding().setSystem("urn:system").setCode("code0")); + ourClient.create().resource(qa).execute(); + + // Bad code + + qa = new QuestionnaireResponse(); + qa.getQuestionnaire().setReference(qId.toUnqualifiedVersionless().getValue()); + qa.addItem().setLinkId("link0").addAnswer().setValue(new Coding().setSystem("urn:system").setCode("code1")); + try { + ourClient.create().resource(qa).execute(); + fail(); + } catch (UnprocessableEntityException e) { + assertThat(e.getMessage(), containsString("Question with linkId[link0]")); + } + } + + @Test + public void testUpdateResourceConditionalComplex() throws IOException { + Patient pt = new Patient(); + pt.addIdentifier().setSystem("http://general-hospital.co.uk/Identifiers").setValue("09832345234543876876"); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.addHeader(Constants.HEADER_IF_NONE_EXIST, "Patient?identifier=http://general-hospital.co.uk/Identifiers|09832345234543876876"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + + IdType id; + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id = new IdType(newIdString); + } finally { + response.close(); + } + + pt.addName().addFamily("FOO"); + resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + HttpPut put = new HttpPut(ourServerBase + "/Patient?identifier=" + ("http://general-hospital.co.uk/Identifiers|09832345234543876876".replace("|", UrlUtil.escape("|")))); + put.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + + IdType id2; + response = ourHttpClient.execute(put); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id2 = new IdType(newIdString); + } finally { + response.close(); + } + + assertEquals(id.getIdPart(), id2.getIdPart()); + assertEquals("1", id.getVersionIdPart()); + assertEquals("2", id2.getVersionIdPart()); + } + + @Test + public void testCreateResourceConditionalComplex() throws IOException { + Patient pt = new Patient(); + pt.addIdentifier().setSystem("http://general-hospital.co.uk/Identifiers").setValue("09832345234543876876"); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.addHeader(Constants.HEADER_IF_NONE_EXIST, "Patient?identifier=http://general-hospital.co.uk/Identifiers|09832345234543876876"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + + IdType id; + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id = new IdType(newIdString); + } finally { + response.close(); + } + + IdType id2; + response = ourHttpClient.execute(post); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id2 = new IdType(newIdString); + } finally { + response.close(); + } + +// //@formatter:off +// IIdType id3 = ourClient +// .update() +// .resource(pt) +// .conditionalByUrl("Patient?identifier=http://general-hospital.co.uk/Identifiers|09832345234543876876") +// .execute().getId(); +// //@formatter:on + + assertEquals(id.getValue(), id2.getValue()); + } + + @Test + public void testCreateResourceConditional() throws IOException { + String methodName = "testCreateResourceConditional"; + + Patient pt = new Patient(); + pt.addName().addFamily(methodName); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.addHeader(Constants.HEADER_IF_NONE_EXIST, "Patient?name=" + methodName); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + CloseableHttpResponse response = ourHttpClient.execute(post); + IdType id; + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id = new IdType(newIdString); + } finally { + response.close(); + } + + post = new HttpPost(ourServerBase + "/Patient"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + post.addHeader(Constants.HEADER_IF_NONE_EXIST, "Patient?name=" + methodName); + response = ourHttpClient.execute(post); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertEquals(id.getValue(), newIdString); // version should match for conditional create + } finally { + response.close(); + } + + } + + @Test + public void testCreateResourceReturnsOperationOutcomeByDefault() throws IOException { + String resource = ""; + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String respString = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(response.toString()); + ourLog.info(respString); + assertThat(respString, containsString("")); + } finally { + response.getEntity().getContent().close(); + response.close(); + } + } + + @Test + public void testCreateResourceWithNumericId() throws IOException { + String resource = ""; + + HttpPost post = new HttpPost(ourServerBase + "/Patient/2"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + assertEquals(400, response.getStatusLine().getStatusCode()); + String respString = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(respString); + assertThat(respString, containsString("")); + assertThat(respString, containsString("Can not create resource with ID[2], ID must not be supplied on a create (POST) operation")); + } finally { + response.getEntity().getContent().close(); + response.close(); + } + } + + @Test + public void testCreateWithForcedId() throws IOException { + String methodName = "testCreateWithForcedId"; + + Patient p = new Patient(); + p.addName().addFamily(methodName); + p.setId(methodName); + + IIdType optId = ourClient.update().resource(p).execute().getId(); + assertEquals(methodName, optId.getIdPart()); + assertEquals("1", optId.getVersionIdPart()); + } + + @Test + public void testDeepChaining() { + Location l1 = new Location(); + l1.getNameElement().setValue("testDeepChainingL1"); + IIdType l1id = ourClient.create().resource(l1).execute().getId(); + + Location l2 = new Location(); + l2.getNameElement().setValue("testDeepChainingL2"); + l2.getPartOf().setReferenceElement(l1id.toVersionless().toUnqualified()); + IIdType l2id = ourClient.create().resource(l2).execute().getId(); + + Encounter e1 = new Encounter(); + e1.addIdentifier().setSystem("urn:foo").setValue("testDeepChainingE1"); + e1.getStatusElement().setValue(EncounterState.INPROGRESS); + e1.getClass_Element().setValue(EncounterClass.HOME); + EncounterLocationComponent location = e1.addLocation(); + location.getLocation().setReferenceElement(l2id.toUnqualifiedVersionless()); + location.setPeriod(new Period().setStart(new Date(), TemporalPrecisionEnum.SECOND).setEnd(new Date(), TemporalPrecisionEnum.SECOND)); + IIdType e1id = ourClient.create().resource(e1).execute().getId(); + + //@formatter:off + Bundle res = ourClient.search() + .forResource(Encounter.class) + .where(Encounter.IDENTIFIER.exactly().systemAndCode("urn:foo", "testDeepChainingE1")) + .include(Encounter.INCLUDE_LOCATION.asRecursive()) + .include(Location.INCLUDE_PARTOF.asRecursive()) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + assertEquals(3, res.getEntry().size()); + assertEquals(1, genResourcesOfType(res, Encounter.class).size()); + assertEquals(e1id.toUnqualifiedVersionless(), genResourcesOfType(res, Encounter.class).get(0).getIdElement().toUnqualifiedVersionless()); + + } + + private ArrayList genResourcesOfType(Bundle theRes, Class theClass) { + ArrayList retVal = new ArrayList(); + for (BundleEntryComponent next : theRes.getEntry()) { + if (next.getResource() != null) { + if (theClass.isAssignableFrom(next.getResource().getClass())) { + retVal.add(next.getResource()); + } + } + } + return retVal; + } + + @Test + public void testDeleteConditionalMultiple() { + String methodName = "testDeleteConditionalMultiple"; + + myDaoConfig.setAllowMultipleDelete(false); + + Patient p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addFamily("FAM1"); + IIdType id1 = myPatientDao.create(p).getId().toUnqualifiedVersionless(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addFamily("FAM2"); + IIdType id2 = myPatientDao.create(p).getId().toUnqualifiedVersionless(); + + try { + //@formatter:off + ourClient + .delete() + .resourceConditionalByType(Patient.class) + .where(Patient.IDENTIFIER.exactly().code(methodName)) + .execute(); + //@formatter:on + fail(); + } catch (PreconditionFailedException e) { + assertEquals("HTTP 412 Precondition Failed: Failed to DELETE resource with match URL \"Patient?identifier=testDeleteConditionalMultiple\" because this search matched 2 resources", e.getMessage()); + } + + // Not deleted yet.. + ourClient.read().resource("Patient").withId(id1).execute(); + ourClient.read().resource("Patient").withId(id2).execute(); + + myDaoConfig.setAllowMultipleDelete(true); + + //@formatter:off + ourClient + .delete() + .resourceConditionalByType(Patient.class) + .where(Patient.IDENTIFIER.exactly().code(methodName)) + .execute(); + //@formatter:on + + try { + ourClient.read().resource("Patient").withId(id1).execute(); + fail(); + } catch (ResourceGoneException e) { + // good + } + try { + ourClient.read().resource("Patient").withId(id2).execute(); + fail(); + } catch (ResourceGoneException e) { + // good + } + } + + @Test + public void testDeleteInvalidReference() throws IOException { + HttpDelete delete = new HttpDelete(ourServerBase + "/Patient"); + CloseableHttpResponse response = ourHttpClient.execute(delete); + try { + String responseString = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(responseString); + assertEquals(400, response.getStatusLine().getStatusCode()); + assertThat(responseString, containsString("Can not perform delete, no ID provided")); + } finally { + response.close(); + } + } + + @Test + public void testDeleteResourceConditional1() throws IOException { + String methodName = "testDeleteResourceConditional1"; + + Patient pt = new Patient(); + pt.addName().addFamily(methodName); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + CloseableHttpResponse response = ourHttpClient.execute(post); + IdType id; + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id = new IdType(newIdString); + } finally { + response.close(); + } + + HttpDelete delete = new HttpDelete(ourServerBase + "/Patient?name=" + methodName); + response = ourHttpClient.execute(delete); + try { + assertEquals(204, response.getStatusLine().getStatusCode()); + } finally { + response.close(); + } + + HttpGet read = new HttpGet(ourServerBase + "/Patient/" + id.getIdPart()); + response = ourHttpClient.execute(read); + try { + ourLog.info(response.toString()); + assertEquals(Constants.STATUS_HTTP_410_GONE, response.getStatusLine().getStatusCode()); + } finally { + response.close(); + } + + } + + /** + * Based on email from Rene Spronk + */ + @Test + public void testDeleteResourceConditional2() throws IOException, Exception { + String methodName = "testDeleteResourceConditional2"; + + Patient pt = new Patient(); + pt.addName().addFamily(methodName); + pt.addIdentifier().setSystem("http://ghh.org/patient").setValue(methodName); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPost post = new HttpPost(ourServerBase + "/Patient"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + CloseableHttpResponse response = ourHttpClient.execute(post); + IdType id; + try { + assertEquals(201, response.getStatusLine().getStatusCode()); + String newIdString = response.getFirstHeader(Constants.HEADER_LOCATION_LC).getValue(); + assertThat(newIdString, startsWith(ourServerBase + "/Patient/")); + id = new IdType(newIdString); + } finally { + response.close(); + } + + /* + * Try it with a raw socket call. The Apache client won't let us use the unescaped "|" in the URL but we want to + * make sure that works too.. + */ + Socket sock = new Socket(); + sock.setSoTimeout(3000); + try { + sock.connect(new InetSocketAddress("localhost", ourPort)); + sock.getOutputStream().write(("DELETE /fhir/context/Patient?identifier=http://ghh.org/patient|" + methodName + " HTTP/1.1\n").getBytes("UTF-8")); + sock.getOutputStream().write("Host: localhost\n".getBytes("UTF-8")); + sock.getOutputStream().write("\n".getBytes("UTF-8")); + + BufferedReader socketInput = new BufferedReader(new InputStreamReader(sock.getInputStream())); + + // String response = ""; + StringBuilder b = new StringBuilder(); + char[] buf = new char[1000]; + while (socketInput.read(buf) != -1) { + b.append(buf); + } + String resp = b.toString(); + + ourLog.info("Resp: {}", resp); + } catch (SocketTimeoutException e) { + e.printStackTrace(); + } finally { + sock.close(); + } + + Thread.sleep(1000); + + HttpGet read = new HttpGet(ourServerBase + "/Patient/" + id.getIdPart()); + response = ourHttpClient.execute(read); + try { + ourLog.info(response.toString()); + assertEquals(Constants.STATUS_HTTP_410_GONE, response.getStatusLine().getStatusCode()); + } finally { + response.close(); + } + + } + + /** + * See issue #52 + */ + @Test + public void testDiagnosticOrderResources() throws Exception { + IGenericClient client = ourClient; + + int initialSize = client.search().forResource(DiagnosticOrder.class).execute().size(); + + DiagnosticOrder res = new DiagnosticOrder(); + res.addIdentifier().setSystem("urn:foo").setValue("123"); + + client.create().resource(res).execute(); + + int newSize = client.search().forResource(DiagnosticOrder.class).execute().size(); + + assertEquals(1, newSize - initialSize); + + } + + /** + * See issue #52 + */ + @Test + public void testDocumentManifestResources() throws Exception { + myFhirCtx.getResourceDefinition(Practitioner.class); + myFhirCtx.getResourceDefinition(ca.uhn.fhir.model.dstu.resource.DocumentManifest.class); + + IGenericClient client = ourClient; + + int initialSize = client.search().forResource(DocumentManifest.class).returnBundle(Bundle.class).execute().getEntry().size(); + + String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/documentmanifest.json")); + client.create().resource(resBody).execute(); + + int newSize = client.search().forResource(DocumentManifest.class).returnBundle(Bundle.class).execute().getEntry().size(); + + assertEquals(1, newSize - initialSize); + + } + + /** + * See issue #52 + */ + @Test + public void testDocumentReferenceResources() throws Exception { + IGenericClient client = ourClient; + + int initialSize = client.search().forResource(DocumentReference.class).returnBundle(Bundle.class).execute().getEntry().size(); + + String resBody = IOUtils.toString(ResourceProviderDstu21Test.class.getResource("/documentreference.json")); + client.create().resource(resBody).execute(); + + int newSize = client.search().forResource(DocumentReference.class).returnBundle(Bundle.class).execute().getEntry().size(); + + assertEquals(1, newSize - initialSize); + + } + + @Test + public void testEverythingEncounterInstance() throws Exception { + String methodName = "testEverythingEncounterInstance"; + + Organization org1parent = new Organization(); + org1parent.setId("org1parent"); + org1parent.setName(methodName + "1parent"); + IIdType orgId1parent = ourClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless(); + + Organization org1 = new Organization(); + org1.setName(methodName + "1"); + org1.getPartOf().setReferenceElement(orgId1parent); + IIdType orgId1 = ourClient.create().resource(org1).execute().getId().toUnqualifiedVersionless(); + + Patient p = new Patient(); + p.addName().addFamily(methodName); + p.getManagingOrganization().setReferenceElement(orgId1); + IIdType patientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless(); + + Organization org2 = new Organization(); + org2.setName(methodName + "1"); + IIdType orgId2 = ourClient.create().resource(org2).execute().getId().toUnqualifiedVersionless(); + + Device dev = new Device(); + dev.setModel(methodName); + dev.getOwner().setReferenceElement(orgId2); + IIdType devId = ourClient.create().resource(dev).execute().getId().toUnqualifiedVersionless(); + + Location locParent = new Location(); + locParent.setName(methodName+"Parent"); + IIdType locPId = ourClient.create().resource(locParent).execute().getId().toUnqualifiedVersionless(); + + Location locChild = new Location(); + locChild.setName(methodName); + locChild.getPartOf().setReferenceElement(locPId); + IIdType locCId = ourClient.create().resource(locChild).execute().getId().toUnqualifiedVersionless(); + + Encounter encU = new Encounter(); + encU.getPatient().setReferenceElement(patientId); + encU.addLocation().getLocation().setReferenceElement(locCId); + IIdType encUId = ourClient.create().resource(encU).execute().getId().toUnqualifiedVersionless(); + + Encounter enc = new Encounter(); + enc.getPatient().setReferenceElement(patientId); + enc.addLocation().getLocation().setReferenceElement(locCId); + IIdType encId = ourClient.create().resource(enc).execute().getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.getSubject().setReferenceElement(patientId); + obs.getDevice().setReferenceElement(devId); + obs.getEncounter().setReferenceElement(encId); + IIdType obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless(); + + ourLog.info("IDs: EncU:" + encUId.getIdPart() + " Enc:" + encId.getIdPart() + " " + patientId.toUnqualifiedVersionless()); + + Parameters output = ourClient.operation().onInstance(encId).named("everything").withNoParameters(Parameters.class).execute(); + Bundle b = (Bundle) output.getParameter().get(0).getResource(); + List ids = toUnqualifiedVersionlessIds(b); + assertThat(ids, containsInAnyOrder(patientId, encId, orgId1, orgId2, orgId1parent, locPId, locCId, obsId, devId)); + assertThat(ids, not(containsInRelativeOrder(encUId))); + + ourLog.info(ids.toString()); + } + + @Test + public void testEverythingEncounterType() throws Exception { + String methodName = "testEverythingEncounterInstance"; + + Organization org1parent = new Organization(); + org1parent.setId("org1parent"); + org1parent.setName(methodName + "1parent"); + IIdType orgId1parent = ourClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless(); + + Organization org1 = new Organization(); + org1.setName(methodName + "1"); + org1.getPartOf().setReferenceElement(orgId1parent); + IIdType orgId1 = ourClient.create().resource(org1).execute().getId().toUnqualifiedVersionless(); + + Patient p = new Patient(); + p.addName().addFamily(methodName); + p.getManagingOrganization().setReferenceElement(orgId1); + IIdType patientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless(); + + Organization org2 = new Organization(); + org2.setName(methodName + "1"); + IIdType orgId2 = ourClient.create().resource(org2).execute().getId().toUnqualifiedVersionless(); + + Device dev = new Device(); + dev.setModel(methodName); + dev.getOwner().setReferenceElement(orgId2); + IIdType devId = ourClient.create().resource(dev).execute().getId().toUnqualifiedVersionless(); + + Location locParent = new Location(); + locParent.setName(methodName+"Parent"); + IIdType locPId = ourClient.create().resource(locParent).execute().getId().toUnqualifiedVersionless(); + + Location locChild = new Location(); + locChild.setName(methodName); + locChild.getPartOf().setReferenceElement(locPId); + IIdType locCId = ourClient.create().resource(locChild).execute().getId().toUnqualifiedVersionless(); + + Encounter encU = new Encounter(); + encU.addIdentifier().setValue(methodName); + IIdType encUId = ourClient.create().resource(encU).execute().getId().toUnqualifiedVersionless(); + + Encounter enc = new Encounter(); + enc.getPatient().setReferenceElement(patientId); + enc.addLocation().getLocation().setReferenceElement(locCId); + IIdType encId = ourClient.create().resource(enc).execute().getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.getSubject().setReferenceElement(patientId); + obs.getDevice().setReferenceElement(devId); + obs.getEncounter().setReferenceElement(encId); + IIdType obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless(); + + Parameters output = ourClient.operation().onType(Encounter.class).named("everything").withNoParameters(Parameters.class).execute(); + Bundle b = (Bundle) output.getParameter().get(0).getResource(); + List ids = toUnqualifiedVersionlessIds(b); + assertThat(ids, containsInAnyOrder(patientId, encUId, encId, orgId1, orgId2, orgId1parent, locPId, locCId, obsId, devId)); + + ourLog.info(ids.toString()); + } + + /** + * See #147 + */ + @Test + public void testEverythingPatientDoesntRepeatPatient() throws Exception { + Bundle b; + b = myFhirCtx.newJsonParser().parseResource(Bundle.class, new InputStreamReader(ResourceProviderDstu21Test.class.getResourceAsStream("/bug147-bundle.json"))); + + Bundle resp = ourClient.transaction().withBundle(b).execute(); + List ids = new ArrayList(); + for (BundleEntryComponent next : resp.getEntry()) { + IdType toAdd = new IdType(next.getResponse().getLocation()).toUnqualifiedVersionless(); + ids.add(toAdd); + } + ourLog.info("Created: " + ids.toString()); + + IdType patientId = new IdType(resp.getEntry().get(0).getResponse().getLocation()); + assertEquals("Patient", patientId.getResourceType()); + + { + Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute(); + b = (Bundle) output.getParameter().get(0).getResource(); + + ids = new ArrayList(); + boolean dupes = false; + for (BundleEntryComponent next : b.getEntry()) { + IdType toAdd = next.getResource().getIdElement().toUnqualifiedVersionless(); + dupes = dupes | ids.contains(toAdd); + ids.add(toAdd); + } + ourLog.info("$everything: " + ids.toString()); + + assertFalse(ids.toString(), dupes); + } + + /* + * Now try with a size specified + */ + { + Parameters input = new Parameters(); + input.addParameter().setName(Constants.PARAM_COUNT).setValue(new UnsignedIntType(100)); + Parameters output = ourClient.operation().onInstance(patientId).named("everything").withParameters(input).execute(); + b = (Bundle) output.getParameter().get(0).getResource(); + + ids = new ArrayList(); + boolean dupes = false; + for (BundleEntryComponent next : b.getEntry()) { + IdType toAdd = next.getResource().getIdElement().toUnqualifiedVersionless(); + dupes = dupes | ids.contains(toAdd); + ids.add(toAdd); + } + ourLog.info("$everything: " + ids.toString()); + + assertFalse(ids.toString(), dupes); + assertThat(ids.toString(), containsString("Condition")); + assertThat(ids.size(), greaterThan(10)); + } + } + + /** + * Test for #226 + */ + @Test + public void testEverythingPatientIncludesBackReferences() throws Exception { + String methodName = "testEverythingIncludesBackReferences"; + + Medication med = new Medication(); + med.getCode().setText(methodName); + IIdType medId = myMedicationDao.create(med).getId().toUnqualifiedVersionless(); + + Patient pat = new Patient(); + pat.addAddress().addLine(methodName); + IIdType patId = myPatientDao.create(pat).getId().toUnqualifiedVersionless(); + + MedicationOrder mo = new MedicationOrder(); + mo.getPatient().setReferenceElement(patId); + mo.setMedication(new Reference(medId)); + IIdType moId = myMedicationOrderDao.create(mo).getId().toUnqualifiedVersionless(); + + Parameters output = ourClient.operation().onInstance(patId).named("everything").withNoParameters(Parameters.class).execute(); + Bundle b = (Bundle) output.getParameter().get(0).getResource(); + List ids = toUnqualifiedVersionlessIds(b); + ourLog.info(ids.toString()); + assertThat(ids, containsInAnyOrder(patId, medId, moId)); + } + + /** + * See #148 + */ + @Test + public void testEverythingPatientIncludesCondition() throws Exception { + Bundle b = new Bundle(); + Patient p = new Patient(); + p.setId("1"); + b.addEntry().setResource(p).getRequest().setMethod(HTTPVerb.POST); + + Condition c = new Condition(); + c.getPatient().setReference("Patient/1"); + b.addEntry().setResource(c).getRequest().setMethod(HTTPVerb.POST); + + Bundle resp = ourClient.transaction().withBundle(b).execute(); + + ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(resp)); + + IdType patientId = new IdType(resp.getEntry().get(0).getResponse().getLocation()); + assertEquals("Patient", patientId.getResourceType()); + + Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute(); + b = (Bundle) output.getParameter().get(0).getResource(); + + List ids = new ArrayList(); + for (BundleEntryComponent next : b.getEntry()) { + IdType toAdd = next.getResource().getIdElement().toUnqualifiedVersionless(); + ids.add(toAdd); + } + + assertThat(ids.toString(), containsString("Patient/")); + assertThat(ids.toString(), containsString("Condition/")); + + } + + + + @Test + public void testEverythingPatientOperation() throws Exception { + String methodName = "testEverythingOperation"; + + Organization org1parent = new Organization(); + org1parent.setId("org1parent"); + org1parent.setName(methodName + "1parent"); + IIdType orgId1parent = ourClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless(); + + Organization org1 = new Organization(); + org1.setName(methodName + "1"); + org1.getPartOf().setReferenceElement(orgId1parent); + IIdType orgId1 = ourClient.create().resource(org1).execute().getId().toUnqualifiedVersionless(); + + Patient p = new Patient(); + p.addName().addFamily(methodName); + p.getManagingOrganization().setReferenceElement(orgId1); + IIdType patientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless(); + + Organization org2 = new Organization(); + org2.setName(methodName + "1"); + IIdType orgId2 = ourClient.create().resource(org2).execute().getId().toUnqualifiedVersionless(); + + Device dev = new Device(); + dev.setModel(methodName); + dev.getOwner().setReferenceElement(orgId2); + IIdType devId = ourClient.create().resource(dev).execute().getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.getSubject().setReferenceElement(patientId); + obs.getDevice().setReferenceElement(devId); + IIdType obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless(); + + Encounter enc = new Encounter(); + enc.getPatient().setReferenceElement(patientId); + IIdType encId = ourClient.create().resource(enc).execute().getId().toUnqualifiedVersionless(); + + Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute(); + Bundle b = (Bundle) output.getParameter().get(0).getResource(); + List ids = toUnqualifiedVersionlessIds(b); + assertThat(ids, containsInAnyOrder(patientId, devId, obsId, encId, orgId1, orgId2, orgId1parent)); + + ourLog.info(ids.toString()); + } + + @Test + public void testEverythingPatientType() throws Exception { + String methodName = "testEverythingPatientType"; + + Organization o1 = new Organization(); + o1.setName(methodName+"1"); + IIdType o1Id = ourClient.create().resource(o1).execute().getId().toUnqualifiedVersionless(); + Organization o2 = new Organization(); + o2.setName(methodName+"2"); + IIdType o2Id = ourClient.create().resource(o2).execute().getId().toUnqualifiedVersionless(); + + Patient p1 = new Patient(); + p1.addName().addFamily(methodName+"1"); + p1.getManagingOrganization().setReferenceElement(o1Id); + IIdType p1Id = ourClient.create().resource(p1).execute().getId().toUnqualifiedVersionless(); + Patient p2 = new Patient(); + p2.addName().addFamily(methodName+"2"); + p2.getManagingOrganization().setReferenceElement(o2Id); + IIdType p2Id = ourClient.create().resource(p2).execute().getId().toUnqualifiedVersionless(); + + Condition c1 = new Condition(); + c1.getPatient().setReferenceElement(p1Id); + IIdType c1Id = ourClient.create().resource(c1).execute().getId().toUnqualifiedVersionless(); + Condition c2 = new Condition(); + c2.getPatient().setReferenceElement(p2Id); + IIdType c2Id = ourClient.create().resource(c2).execute().getId().toUnqualifiedVersionless(); + + Condition c3 = new Condition(); + c3.addIdentifier().setValue(methodName+"3"); + IIdType c3Id = ourClient.create().resource(c3).execute().getId().toUnqualifiedVersionless(); + + Parameters output = ourClient.operation().onType(Patient.class).named("everything").withNoParameters(Parameters.class).execute(); + Bundle b = (Bundle) output.getParameter().get(0).getResource(); + List ids = toUnqualifiedVersionlessIds(b); + + assertThat(ids, containsInAnyOrder(o1Id, o2Id, p1Id, p2Id, c1Id, c2Id)); + assertThat(ids, not(containsInRelativeOrder(c3Id))); + } + + // retest + @Test + public void testEverythingPatientWithLastUpdatedAndSort() throws Exception { + String methodName = "testEverythingWithLastUpdatedAndSort"; + + Organization org = new Organization(); + org.setName(methodName); + IIdType oId = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless(); + + long time1 = System.currentTimeMillis(); + Thread.sleep(10); + + Patient p = new Patient(); + p.addName().addFamily(methodName); + p.getManagingOrganization().setReferenceElement(oId); + IIdType pId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless(); + + long time2 = System.currentTimeMillis(); + Thread.sleep(10); + + Condition c = new Condition(); + c.getCode().setText(methodName); + c.getPatient().setReferenceElement(pId); + IIdType cId = ourClient.create().resource(c).execute().getId().toUnqualifiedVersionless(); + + Thread.sleep(10); + long time3 = System.currentTimeMillis(); + + // %3E=> %3C=< + + HttpGet get = new HttpGet(ourServerBase + "/Patient/" + pId.getIdPart() + "/$everything?_lastUpdated=%3E" + new InstantType(new Date(time1)).getValueAsString()); + CloseableHttpResponse response = ourHttpClient.execute(get); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String output = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(output); + List ids = toUnqualifiedVersionlessIds(myFhirCtx.newXmlParser().parseResource(Bundle.class, output)); + ourLog.info(ids.toString()); + assertThat(ids, containsInAnyOrder(pId, cId)); + } finally { + response.close(); + } + + get = new HttpGet(ourServerBase + "/Patient/" + pId.getIdPart() + "/$everything?_lastUpdated=%3E" + new InstantType(new Date(time2)).getValueAsString() + "&_lastUpdated=%3C" + new InstantType(new Date(time3)).getValueAsString()); + response = ourHttpClient.execute(get); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String output = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(output); + List ids = toUnqualifiedVersionlessIds(myFhirCtx.newXmlParser().parseResource(Bundle.class, output)); + ourLog.info(ids.toString()); + assertThat(ids, containsInAnyOrder(cId)); + } finally { + response.close(); + } + + get = new HttpGet(ourServerBase + "/Patient/" + pId.getIdPart() + "/$everything?_lastUpdated=%3E" + new InstantType(new Date(time1)).getValueAsString() + "&_sort=_lastUpdated"); + response = ourHttpClient.execute(get); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String output = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(output); + List ids = toUnqualifiedVersionlessIds(myFhirCtx.newXmlParser().parseResource(Bundle.class, output)); + ourLog.info(ids.toString()); + assertThat(ids, contains(pId, cId)); + } finally { + response.close(); + } + + get = new HttpGet(ourServerBase + "/Patient/" + pId.getIdPart() + "/$everything?_sort:desc=_lastUpdated"); + response = ourHttpClient.execute(get); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String output = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(output); + List ids = toUnqualifiedVersionlessIds(myFhirCtx.newXmlParser().parseResource(Bundle.class, output)); + ourLog.info(ids.toString()); + assertThat(ids, contains(cId, pId, oId)); + } finally { + response.close(); + } + + } + + @Test + public void testGetResourceCountsOperation() throws Exception { + String methodName = "testMetaOperations"; + + Patient pt = new Patient(); + pt.addName().addFamily(methodName); + ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless(); + + HttpGet get = new HttpGet(ourServerBase + "/$get-resource-counts"); + CloseableHttpResponse response = ourHttpClient.execute(get); + try { + assertEquals(200, response.getStatusLine().getStatusCode()); + String output = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(output); + assertThat(output, containsString("\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""; + //@formatter:on + + HttpPost post = new HttpPost(ourServerBase + "/Patient/" + id.getIdPart() + "/$meta-add"); + post.setEntity(new StringEntity(input, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + String output = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(output); + assertEquals(400, response.getStatusLine().getStatusCode()); + assertThat(output, containsString("Input contains no parameter with name 'meta'")); + } finally { + response.close(); + } + + post = new HttpPost(ourServerBase + "/Patient/" + id.getIdPart() + "/$meta-delete"); + post.setEntity(new StringEntity(input, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + response = ourHttpClient.execute(post); + try { + String output = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(output); + assertEquals(400, response.getStatusLine().getStatusCode()); + assertThat(output, containsString("Input contains no parameter with name 'meta'")); + } finally { + response.close(); + } + + } + + /** + * Test for issue #60 + */ + @Test + public void testReadAllInstancesOfType() throws Exception { + Patient pat; + + pat = new Patient(); + pat.addIdentifier().setSystem("urn:system").setValue("testReadAllInstancesOfType_01"); + ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId(); + + pat = new Patient(); + pat.addIdentifier().setSystem("urn:system").setValue("testReadAllInstancesOfType_02"); + ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId(); + + { + Bundle returned = ourClient.search().forResource(Patient.class).encodedXml().returnBundle(Bundle.class).execute(); + assertThat(returned.getEntry().size(), greaterThan(1)); + assertEquals(BundleType.SEARCHSET, returned.getType()); + } + { + Bundle returned = ourClient.search().forResource(Patient.class).encodedJson().returnBundle(Bundle.class).execute(); + assertThat(returned.getEntry().size(), greaterThan(1)); + } + } + + @Test + public void testSaveAndRetrieveExistingNarrativeJson() { + Patient p1 = new Patient(); + p1.getText().setStatus(NarrativeStatus.GENERATED); + p1.getText().getDiv().setValueAsString("
HELLO WORLD
"); + p1.addIdentifier().setSystem("urn:system").setValue("testSaveAndRetrieveExistingNarrative01"); + + IIdType newId = ourClient.create().resource(p1).encodedJson().execute().getId(); + + Patient actual = ourClient.read().resource(Patient.class).withId(newId).encodedJson().execute(); + assertEquals("
HELLO WORLD
", actual.getText().getDiv().getValueAsString()); + } + + @Test + public void testSaveAndRetrieveExistingNarrativeXml() { + Patient p1 = new Patient(); + p1.getText().setStatus(NarrativeStatus.GENERATED); + p1.getText().getDiv().setValueAsString("
HELLO WORLD
"); + p1.addIdentifier().setSystem("urn:system").setValue("testSaveAndRetrieveExistingNarrative01"); + + IIdType newId = ourClient.create().resource(p1).encodedXml().execute().getId(); + + Patient actual = ourClient.read().resource(Patient.class).withId(newId).encodedXml().execute(); + assertEquals("
HELLO WORLD
", actual.getText().getDiv().getValueAsString()); + } + + @Test + public void testSaveAndRetrieveWithContained() { + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSaveAndRetrieveWithContained01"); + + Organization o1 = new Organization(); + o1.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSaveAndRetrieveWithContained02"); + + p1.getManagingOrganization().setResource(o1); + + IIdType newId = ourClient.create().resource(p1).execute().getId(); + + Patient actual = ourClient.read(Patient.class, new UriDt(newId.getValue())); + assertEquals(1, actual.getContained().size()); + assertThat(actual.getText().getDiv().getValueAsString(), containsString("IdentifiertestSaveAndRetrieveWithContained01")); + + //@formatter:off + Bundle b = ourClient + .search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system:rpdstu2", "testSaveAndRetrieveWithContained01")) + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + assertEquals(1, b.getEntry().size()); + + } + + @Test + public void testSaveAndRetrieveWithoutNarrative() { + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("urn:system").setValue("testSearchByResourceChain01"); + + IdType newId = (IdType) ourClient.create().resource(p1).execute().getId(); + + Patient actual = ourClient.read(Patient.class, newId.getIdPart()); + assertThat(actual.getText().getDiv().getValueAsString(), containsString("IdentifiertestSearchByResourceChain01")); + } + + @Test + public void testSearchBundleDoesntIncludeTextElement() throws Exception { + HttpGet read = new HttpGet(ourServerBase + "/Patient?_format=json"); + CloseableHttpResponse response = ourHttpClient.execute(read); + try { + String text = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(text); + assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatusLine().getStatusCode()); + assertThat(text, not(containsString("\"text\",\"type\""))); + } finally { + response.close(); + } + } + + @Test + public void testSearchByIdentifier() { + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("urn:system").setValue("testSearchByIdentifier01"); + p1.addName().addFamily("testSearchByIdentifierFamily01").addGiven("testSearchByIdentifierGiven01"); + IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId(); + + Patient p2 = new Patient(); + p2.addIdentifier().setSystem("urn:system").setValue("testSearchByIdentifier02"); + p2.addName().addFamily("testSearchByIdentifierFamily01").addGiven("testSearchByIdentifierGiven02"); + ourClient.create().resource(p2).execute().getId(); + + //@formatter:off + Bundle actual = ourClient + .search() + .forResource(Patient.class) + .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", "testSearchByIdentifier01")) + .encodedJson() + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + assertEquals(1, actual.getEntry().size()); + assertEquals(ourServerBase + "/Patient/" + p1Id.getIdPart(), actual.getEntry().get(0).getFullUrl()); + assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart()); + assertEquals(SearchEntryMode.MATCH, actual.getEntry().get(0).getSearch().getModeElement().getValue()); + } + + @Test + public void testSearchByIdentifierWithoutSystem() { + + Patient p1 = new Patient(); + p1.addIdentifier().setValue("testSearchByIdentifierWithoutSystem01"); + IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId(); + + //@formatter:off + Bundle actual = ourClient + .search() + .forResource(Patient.class) + .where(Patient.IDENTIFIER.exactly().systemAndCode(null, "testSearchByIdentifierWithoutSystem01")) + .encodedJson() + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + assertEquals(1, actual.getEntry().size()); + assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart()); + + } + + @Test + public void testSearchByIdOr() { + IIdType id1; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("001"); + id1 = myPatientDao.create(patient).getId().toUnqualifiedVersionless(); + } + IIdType id2; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("001"); + id2 = myPatientDao.create(patient).getId().toUnqualifiedVersionless(); + } + + //@formatter:off + Bundle found = ourClient + .search() + .forResource(Patient.class) + .where(BaseResource.RES_ID.matches().values(id1.getIdPart(), id2.getIdPart())) + .and(BaseResource.RES_ID.matches().value(id1.getIdPart())) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1)); + } + + @Test + public void testSearchByResourceChain() { + + Organization o1 = new Organization(); + o1.setName("testSearchByResourceChainName01"); + IdType o1id = (IdType) ourClient.create().resource(o1).execute().getId(); + + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("urn:system").setValue("testSearchByResourceChain01"); + p1.addName().addFamily("testSearchByResourceChainFamily01").addGiven("testSearchByResourceChainGiven01"); + p1.setManagingOrganization(new Reference(o1id)); + IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId(); + + //@formatter:off + Bundle actual = ourClient.search() + .forResource(Patient.class) + .where(Patient.ORGANIZATION.hasId(o1id.getIdPart())) + .encodedJson().prettyPrint().returnBundle(Bundle.class).execute(); + //@formatter:on + assertEquals(1, actual.getEntry().size()); + assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart()); + + //@formatter:off + actual = ourClient.search() + .forResource(Patient.class) + .where(Patient.ORGANIZATION.hasId(o1id.getValue())) + .encodedJson().prettyPrint().returnBundle(Bundle.class).execute(); + //@formatter:on + assertEquals(1, actual.getEntry().size()); + assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart()); + + } + + @Test + public void testSearchLastUpdatedParamRp() throws InterruptedException { + String methodName = "testSearchLastUpdatedParamRp"; + + int sleep = 100; + Thread.sleep(sleep); + + DateTimeType beforeAny = new DateTimeType(new Date(), TemporalPrecisionEnum.MILLI); + IIdType id1a; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("001"); + patient.addName().addFamily(methodName).addGiven("Joe"); + id1a = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless(); + } + IIdType id1b; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("002"); + patient.addName().addFamily(methodName + "XXXX").addGiven("Joe"); + id1b = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless(); + } + + Thread.sleep(1100); + DateTimeType beforeR2 = new DateTimeType(new Date(), TemporalPrecisionEnum.MILLI); + Thread.sleep(1100); + + IIdType id2; + { + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:system").setValue("002"); + patient.addName().addFamily(methodName).addGiven("John"); + id2 = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless(); + } + + { + //@formatter:off + Bundle found = ourClient.search() + .forResource(Patient.class) + .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp")) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + List patients = toUnqualifiedVersionlessIds(found); + assertThat(patients, hasItems(id1a, id1b, id2)); + } + { + //@formatter:off + Bundle found = ourClient.search() + .forResource(Patient.class) + .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp")) + .lastUpdated(new DateRangeParam(beforeAny, null)) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + List patients = toUnqualifiedVersionlessIds(found); + assertThat(patients, hasItems(id1a, id1b, id2)); + } + { + //@formatter:off + Bundle found = ourClient.search() + .forResource(Patient.class) + .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp")) + .lastUpdated(new DateRangeParam(beforeR2, null)) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + List patients = toUnqualifiedVersionlessIds(found); + assertThat(patients, hasItems(id2)); + assertThat(patients, not(hasItems(id1a, id1b))); + } + { + //@formatter:off + Bundle found = ourClient.search() + .forResource(Patient.class) + .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp")) + .lastUpdated(new DateRangeParam(beforeAny, beforeR2)) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + List patients = toUnqualifiedVersionlessIds(found); + assertThat(patients.toString(), patients, not(hasItems(id2))); + assertThat(patients.toString(), patients, (hasItems(id1a, id1b))); + } + { + //@formatter:off + Bundle found = ourClient.search() + .forResource(Patient.class) + .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp")) + .lastUpdated(new DateRangeParam(null, beforeR2)) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + List patients = toUnqualifiedVersionlessIds(found); + assertThat(patients, (hasItems(id1a, id1b))); + assertThat(patients, not(hasItems(id2))); + } + } + + private void testSearchReturnsResults(String search) throws IOException, ClientProtocolException { + int matches; + HttpGet get = new HttpGet(ourServerBase + search); + CloseableHttpResponse response = ourHttpClient.execute(get); + String resp = IOUtils.toString(response.getEntity().getContent()); + IOUtils.closeQuietly(response.getEntity().getContent()); + ourLog.info(resp); + Bundle bundle = myFhirCtx.newXmlParser().parseResource(Bundle.class, resp); + matches = bundle.getTotal(); + + assertThat(matches, greaterThan(0)); + } + + @Test + public void testSearchReturnsSearchDate() throws Exception { + Date before = new Date(); + Thread.sleep(1); + + //@formatter:off + Bundle found = ourClient + .search() + .forResource(Patient.class) + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + Thread.sleep(1); + Date after = new Date(); + + InstantType updated = found.getMeta().getLastUpdatedElement(); + assertNotNull(updated); + Date value = updated.getValue(); + assertNotNull(value); + ourLog.info(value.getTime() + ""); + ourLog.info(before.getTime() + ""); + assertTrue(value.after(before)); + assertTrue(value.before(after)); + } + + @Test + public void testSearchWithInclude() throws Exception { + Organization org = new Organization(); + org.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSearchWithInclude01"); + IdType orgId = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId(); + + Patient pat = new Patient(); + pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSearchWithInclude02"); + pat.getManagingOrganization().setReferenceElement(orgId); + ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId(); + + //@formatter:off + Bundle found = ourClient + .search() + .forResource(Patient.class) + .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("urn:system:rpdstu2","testSearchWithInclude02")) + .include(Patient.INCLUDE_ORGANIZATION) + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + assertEquals(2, found.getEntry().size()); + assertEquals(Patient.class, found.getEntry().get(0).getResource().getClass()); + assertEquals(SearchEntryMode.MATCH, found.getEntry().get(0).getSearch().getMode()); + assertEquals(Organization.class, found.getEntry().get(1).getResource().getClass()); + assertEquals(SearchEntryMode.INCLUDE, found.getEntry().get(1).getSearch().getMode()); + } + + @Test(expected = InvalidRequestException.class) + public void testSearchWithInvalidSort() throws Exception { + Observation o = new Observation(); + o.getCode().setText("testSearchWithInvalidSort"); + myObservationDao.create(o); + //@formatter:off + ourClient + .search() + .forResource(Observation.class) + .sort().ascending(Observation.CODE_VALUE_QUANTITY) // composite sort not supported yet + .prettyPrint() + .execute(); + //@formatter:on + } + + @Test + public void testSearchWithMissing() throws Exception { + ourLog.info("Starting testSearchWithMissing"); + + String methodName = "testSearchWithMissing"; + + Organization org = new Organization(); + IIdType deletedIdMissingTrue = (IdType) ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless(); + ourClient.delete().resourceById(deletedIdMissingTrue).execute(); + + org = new Organization(); + org.setName("Help I'm a Bug"); + IIdType deletedIdMissingFalse = (IdType) ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless(); + ourClient.delete().resourceById(deletedIdMissingFalse).execute(); + + List resources = new ArrayList(); + for (int i = 0; i < 20; i++) { + org = new Organization(); + org.setName(methodName + "_0" + i); + resources.add(org); + } + ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute(); + + org = new Organization(); + org.addIdentifier().setSystem("urn:system:rpdstu2").setValue(methodName + "01"); + org.setName(methodName + "name"); + IIdType orgNotMissing = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless(); + + org = new Organization(); + org.addIdentifier().setSystem("urn:system:rpdstu2").setValue(methodName + "01"); + IIdType orgMissing = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless(); + + { + //@formatter:off + Bundle found = ourClient + .search() + .forResource(Organization.class) + .where(Organization.NAME.isMissing(false)) + .limitTo(100) + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + List list = toUnqualifiedVersionlessIds(found); + ourLog.info(methodName + ": " + list.toString()); + ourLog.info("Wanted " + orgNotMissing + " and not " + deletedIdMissingFalse + " but got " + list.size() + ": " + list); + assertThat("Wanted " + orgNotMissing + " but got " + list.size() + ": " + list, list, containsInRelativeOrder(orgNotMissing)); + assertThat(list, not(containsInRelativeOrder(deletedIdMissingFalse))); + assertThat(list, not(containsInRelativeOrder(orgMissing))); + } + + //@formatter:off + Bundle found = ourClient + .search() + .forResource(Organization.class) + .where(Organization.NAME.isMissing(true)) + .count(100) + .prettyPrint() + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + List list = toUnqualifiedVersionlessIds(found); + ourLog.info(methodName + " found: " + list.toString() + " - Wanted " + orgMissing + " but not " + orgNotMissing); + assertThat(list, not(containsInRelativeOrder(orgNotMissing))); + assertThat(list, not(containsInRelativeOrder(deletedIdMissingTrue))); + assertThat("Wanted " + orgMissing + " but found: " + list, list, containsInRelativeOrder(orgMissing)); + } + + @Test + public void testSearchWithMissing2() throws Exception { + checkParamMissing(Observation.SP_CODE); + checkParamMissing(Observation.SP_CATEGORY); + checkParamMissing(Observation.SP_VALUE_STRING); + checkParamMissing(Observation.SP_ENCOUNTER); + checkParamMissing(Observation.SP_DATE); + } + + @Test + public void testSearchWithTextInexactMatch() throws Exception { + Observation obs = new Observation(); + obs.getCode().setText("THIS_IS_THE_TEXT"); + obs.getCode().addCoding().setSystem("SYSTEM").setCode("CODE").setDisplay("THIS_IS_THE_DISPLAY"); + ourClient.create().resource(obs).execute(); + + testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_TEXT"); + testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_"); + testSearchReturnsResults("/Observation?code%3Atext=this_is_the_"); + testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_DISPLAY"); + testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_disp"); + } + + /** + * See #198 + */ + @Test + public void testSortFromResourceProvider() { + Patient p; + String methodName = "testSortFromResourceProvider"; + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Daniel").addFamily("Adams"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Aaron").addFamily("Alexis"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Carol").addFamily("Allen"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Ruth").addFamily("Black"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Brian").addFamily("Brooks"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Susan").addFamily("Clark"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Amy").addFamily("Clark"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Anthony").addFamily("Coleman"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Steven").addFamily("Coleman"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Lisa").addFamily("Coleman"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Ruth").addFamily("Cook"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Betty").addFamily("Davis"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Joshua").addFamily("Diaz"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Brian").addFamily("Gracia"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Stephan").addFamily("Graham"); + ourClient.create().resource(p).execute(); + + p = new Patient(); + p.addIdentifier().setSystem("urn:system").setValue(methodName); + p.addName().addGiven("Sarah").addFamily("Graham"); + ourClient.create().resource(p).execute(); + + //@formatter:off + Bundle resp = ourClient + .search() + .forResource(Patient.class) + .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", methodName)) + .sort().ascending(Patient.FAMILY) + .sort().ascending(Patient.GIVEN) + .limitTo(100) + .returnBundle(Bundle.class) + .execute(); + //@formatter:on + + List names = toNameList(resp); + + ourLog.info(StringUtils.join(names, '\n')); + + //@formatter:off + assertThat(names, contains( // this matches in order only + "Daniel Adams", + "Aaron Alexis", + "Carol Allen", + "Ruth Black", + "Brian Brooks", + "Amy Clark", + "Susan Clark", + "Anthony Coleman", + "Lisa Coleman", + "Steven Coleman", + "Ruth Cook", + "Betty Davis", + "Joshua Diaz", + "Brian Gracia", + "Sarah Graham", + "Stephan Graham")); + //@formatter:om + + } + + /** + * Test for issue #60 + */ + @Test + public void testStoreUtf8Characters() throws Exception { + Organization org = new Organization(); + org.setName("測試醫院"); + org.addIdentifier().setSystem("urn:system").setValue("testStoreUtf8Characters_01"); + IdType orgId = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId(); + + // Read back directly from the DAO + { + Organization returned = myOrganizationDao.read(orgId); + String val = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(returned); + ourLog.info(val); + assertThat(val, containsString("")); + } + // Read back through the HTTP API + { + Organization returned = ourClient.read(Organization.class, orgId.getIdPart()); + String val = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(returned); + ourLog.info(val); + assertThat(val, containsString("")); + } + } + + @Test + public void testTransaction() throws Exception { + String contents = loadClasspath("/update.xml"); + HttpPost post = new HttpPost(ourServerBase); + post.setEntity(new StringEntity(contents, ContentType.create("application/xml+fhir", "UTF-8"))); + CloseableHttpResponse resp = ourHttpClient.execute(post); + try { + assertEquals(200, resp.getStatusLine().getStatusCode()); + String output= IOUtils.toString(resp.getEntity().getContent()); + ourLog.info(output); + } finally { + resp.close(); + } + } + + @Test + public void testTryToCreateResourceWithReferenceThatDoesntExist() { + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("urn:system").setValue("testTryToCreateResourceWithReferenceThatDoesntExist01"); + p1.addName().addFamily("testTryToCreateResourceWithReferenceThatDoesntExistFamily01").addGiven("testTryToCreateResourceWithReferenceThatDoesntExistGiven01"); + p1.setManagingOrganization(new Reference("Organization/99999999999")); + + try { + ourClient.create().resource(p1).execute().getId(); + fail(); + } catch (InvalidRequestException e) { + assertThat(e.getMessage(), containsString("Organization/99999999999")); + } + + } + + @Test + public void testUpdateInvalidReference() throws IOException, Exception { + String methodName = "testUpdateInvalidReference"; + + Patient pt = new Patient(); + pt.addName().addFamily(methodName); + String resource = myFhirCtx.newXmlParser().encodeResourceToString(pt); + + HttpPut post = new HttpPut(ourServerBase + "/Patient"); + post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8"))); + CloseableHttpResponse response = ourHttpClient.execute(post); + try { + String responseString = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(responseString); + assertThat(responseString, containsString("Can not update a resource with no ID")); + assertThat(responseString, containsString("", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + )); + //@formatter:on + } finally { + IOUtils.closeQuietly(response.getEntity().getContent()); + response.close(); + } + + /* + * Filter with display name + */ + + get = new HttpGet(ourServerBase + "/ValueSet/" + vsid.getIdPart() + "/$expand?filter=systolic"); + response = ourHttpClient.execute(get); + try { + String resp = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(resp); + assertEquals(200, response.getStatusLine().getStatusCode()); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "")); + //@formatter:on + } finally { + IOUtils.closeQuietly(response.getEntity().getContent()); + response.close(); + } + + /* + * Filter with code + */ + + get = new HttpGet(ourServerBase + "/ValueSet/" + vsid.getIdPart() + "/$expand?filter=11378"); + response = ourHttpClient.execute(get); + try { + String resp = IOUtils.toString(response.getEntity().getContent()); + ourLog.info(resp); + assertEquals(200, response.getStatusLine().getStatusCode()); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "" + )); + //@formatter:on + } finally { + IOUtils.closeQuietly(response.getEntity().getContent()); + response.close(); + } + + } + +} 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/dstu21/ResourceProviderDstu21ValueSetTest.java new file mode 100644 index 00000000000..a2469c8c69d --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java @@ -0,0 +1,376 @@ +package ca.uhn.fhir.jpa.provider.dstu21; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.stringContainsInOrder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +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.instance.model.api.IIdType; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.springframework.transaction.annotation.Transactional; + +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; + +public class ResourceProviderDstu21ValueSetTest extends BaseResourceProviderDstu21Test { + + private IIdType myExtensionalVsId; + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu21ValueSetTest.class); + + @Before + @Transactional + public void before02() throws IOException { + ValueSet upload = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml"); + upload.setId(""); + myExtensionalVsId = myValueSetDao.create(upload).getId().toUnqualifiedVersionless(); + } + + @Test + public void testValidateCodeOperationByCodeAndSystemInstance() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onInstance(myExtensionalVsId) + .named("validate-code") + .withParameter(Parameters.class, "code", new CodeType("8495-4")) + .andParameter("system", new UriType("http://loinc.org")) + .execute(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam); + ourLog.info(resp); + + assertEquals(new BooleanType(true), respParam.getParameter().get(0).getValue()); + } + + @Test + public void testValidateCodeOperationByCodeAndSystemType() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("validate-code") + .withParameter(Parameters.class, "code", new CodeType("8450-9")) + .andParameter("system", new UriType("http://loinc.org")) + .execute(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam); + ourLog.info(resp); + + assertEquals(new BooleanType(true), respParam.getParameter().get(0).getValue()); + } + + @Test + public void testLookupOperationByCodeAndSystem() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "code", new CodeType("8450-9")) + .andParameter("system", new UriType("http://loinc.org")) + .execute(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam); + ourLog.info(resp); + + assertEquals("name", respParam.getParameter().get(0).getName()); + assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue()); + assertEquals("display", respParam.getParameter().get(1).getName()); + assertEquals(new StringType("Systolic blood pressure--expiration"), respParam.getParameter().get(1).getValue()); + assertEquals("abstract", respParam.getParameter().get(2).getName()); + assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue()); + } + + @Test + @Ignore + public void testLookupOperationForBuiltInCode() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "code", new CodeType("M")) + .andParameter("system", new UriType("http://hl7.org/fhir/v3/MaritalStatus")) + .execute(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam); + ourLog.info(resp); + + assertEquals("name", respParam.getParameter().get(0).getName()); + assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue()); + assertEquals("display", respParam.getParameter().get(1).getName()); + assertEquals(new StringType("Married"), respParam.getParameter().get(1).getValue()); + assertEquals("abstract", respParam.getParameter().get(2).getName()); + assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue()); + } + + @Test + public void testLookupOperationByCoding() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9")) + .execute(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam); + ourLog.info(resp); + + assertEquals("name", respParam.getParameter().get(0).getName()); + assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue()); + assertEquals("display", respParam.getParameter().get(1).getName()); + assertEquals(new StringType("Systolic blood pressure--expiration"), respParam.getParameter().get(1).getValue()); + assertEquals("abstract", respParam.getParameter().get(2).getName()); + assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue()); + } + + @Test + public void testLookupOperationByInvalidCombination() { + //@formatter:off + try { + ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9")) + .andParameter("code", new CodeType("8450-9")) + .andParameter("system", new UriType("http://loinc.org")) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: $lookup can only validate (system AND code) OR (coding.system AND coding.code)", e.getMessage()); + } + //@formatter:on + } + + @Test + public void testLookupOperationByInvalidCombination2() { + //@formatter:off + try { + ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9")) + .andParameter("system", new UriType("http://loinc.org")) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: $lookup can only validate (system AND code) OR (coding.system AND coding.code)", e.getMessage()); + } + //@formatter:on + } + + @Test + public void testLookupOperationByInvalidCombination3() { + //@formatter:off + try { + ourClient + .operation() + .onType(ValueSet.class) + .named("lookup") + .withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode(null)) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: No code, coding, or codeableConcept provided to validate", e.getMessage()); + } + //@formatter:on + } + + @Test + public void testExpandById() throws IOException { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onInstance(myExtensionalVsId) + .named("expand") + .withNoParameters(Parameters.class) + .execute(); + ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); + ourLog.info(resp); + // @formatter:off + assertThat(resp, + stringContainsInOrder("", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + )); + //@formatter:on + + /* + * Filter with display name + */ + + //@formatter:off + respParam = ourClient + .operation() + .onInstance(myExtensionalVsId) + .named("expand") + .withParameter(Parameters.class, "filter", new StringType("systolic")) + .execute(); + expanded = (ValueSet) respParam.getParameter().get(0).getResource(); + //@formatter:on + + expanded = myValueSetDao.expand(myExtensionalVsId, ("systolic")); + resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); + ourLog.info(resp); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "")); + //@formatter:on + + /* + * Filter with code + */ + + //@formatter:off + respParam = ourClient + .operation() + .onInstance(myExtensionalVsId) + .named("expand") + .withParameter(Parameters.class, "filter", new StringType("11378")) + .execute(); + expanded = (ValueSet) respParam.getParameter().get(0).getResource(); + //@formatter:on + resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); + ourLog.info(resp); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "")); + //@formatter:on + } + + @Test + public void testExpandByIdentifier() { + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("expand") + .withParameter(Parameters.class, "identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2")) + .andParameter("filter", new StringType("11378")) + .execute(); + ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); + ourLog.info(resp); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "")); + //@formatter:on + + assertThat(resp, not(containsString(""))); + } + + @Test + public void testExpandByValueSet() throws IOException { + ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml"); + + //@formatter:off + Parameters respParam = ourClient + .operation() + .onType(ValueSet.class) + .named("expand") + .withParameter(Parameters.class, "valueSet", toExpand) + .andParameter("filter", new StringType("11378")) + .execute(); + ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource(); + //@formatter:on + + String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded); + ourLog.info(resp); + //@formatter:off + assertThat(resp, stringContainsInOrder( + "", + "")); + //@formatter:on + + assertThat(resp, not(containsString(""))); + } + + @Test + public void testExpandInvalidParams() throws IOException { + //@formatter:off + try { + ourClient + .operation() + .onType(ValueSet.class) + .named("expand") + .withNoParameters(Parameters.class) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: $expand operation at the type level (no ID specified) requires an identifier or a valueSet as a part of the request", e.getMessage()); + } + //@formatter:on + + //@formatter:off + try { + ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml"); + ourClient + .operation() + .onType(ValueSet.class) + .named("expand") + .withParameter(Parameters.class, "valueSet", toExpand) + .andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2")) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the type level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage()); + } + //@formatter:on + + //@formatter:off + try { + ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml"); + ourClient + .operation() + .onInstance(myExtensionalVsId) + .named("expand") + .withParameter(Parameters.class, "valueSet", toExpand) + .andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2")) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the type level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage()); + } + //@formatter:on + + } + +} 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/dstu21/SystemProviderDstu21Test.java new file mode 100644 index 00000000000..2a339cea689 --- /dev/null +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java @@ -0,0 +1,426 @@ +package ca.uhn.fhir.jpa.provider.dstu21; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.InputStream; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.IOUtils; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +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.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.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.instance.model.api.IIdType; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Test; +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.rp.dstu21.ObservationResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu21.OrganizationResourceProvider; +import ca.uhn.fhir.jpa.rp.dstu21.PatientResourceProvider; +import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; +import ca.uhn.fhir.rest.client.IGenericClient; +import ca.uhn.fhir.rest.server.EncodingEnum; +import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; +import ca.uhn.fhir.rest.server.RestfulServer; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; +import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; + +public class SystemProviderDstu21Test extends BaseJpaDstu21Test { + + 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 Server ourServer; + private static String ourServerBase; + + @Before + public void beforeStartServer() throws Exception { + if (myRestServer == null) { + PatientResourceProvider patientRp = new PatientResourceProvider(); + patientRp.setDao(myPatientDao); + + QuestionnaireResourceProviderDstu21 questionnaireRp = new QuestionnaireResourceProviderDstu21(); + questionnaireRp.setDao(myQuestionnaireDao); + + ObservationResourceProvider observationRp = new ObservationResourceProvider(); + observationRp.setDao(myObservationDao); + + OrganizationResourceProvider organizationRp = new OrganizationResourceProvider(); + organizationRp.setDao(myOrganizationDao); + + RestfulServer restServer = new RestfulServer(ourCtx); + restServer.setPagingProvider(new FifoMemoryPagingProvider(10).setDefaultPageSize(10)); + restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp); + + restServer.setPlainProviders(mySystemProvider); + + int myPort = RandomServerPortProvider.findFreePort(); + ourServer = new Server(myPort); + + ServletContextHandler proxyHandler = new ServletContextHandler(); + proxyHandler.setContextPath("/"); + + ourServerBase = "http://localhost:" + myPort + "/fhir/context"; + + ServletHolder servletHolder = new ServletHolder(); + servletHolder.setServlet(restServer); + proxyHandler.addServlet(servletHolder, "/fhir/context/*"); + + ourCtx = FhirContext.forDstu2(); + restServer.setFhirContext(ourCtx); + + ourServer.setHandler(proxyHandler); + ourServer.start(); + + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS); + HttpClientBuilder builder = HttpClientBuilder.create(); + builder.setConnectionManager(connectionManager); + ourHttpClient = builder.build(); + + ourCtx.getRestfulClientFactory().setSocketTimeout(600 * 1000); + ourClient = ourCtx.newRestfulGenericClient(ourServerBase); + ourClient.setLogRequestAndResponse(true); + myRestServer = restServer; + } + } + + @Test + public void testEverythingReturnsCorrectFormatInPagingLink() throws Exception { + myRestServer.setDefaultResponseEncoding(EncodingEnum.JSON); + myRestServer.setPagingProvider(new FifoMemoryPagingProvider(1).setDefaultPageSize(10)); + ResponseHighlighterInterceptor interceptor = new ResponseHighlighterInterceptor(); + myRestServer.registerInterceptor(interceptor); + + for (int i = 0; i < 11; i++) { + Patient p = new Patient(); + p.addName().addFamily("Name" + i); + ourClient.create().resource(p).execute(); + } + + HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything"); + get.addHeader("Accept", "application/xml, text/html"); + CloseableHttpResponse http = ourHttpClient.execute(get); + try { + String response = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(response); + assertThat(response, not(containsString("_format"))); + assertEquals(200, http.getStatusLine().getStatusCode()); + } finally { + http.close(); + } + + myRestServer.unregisterInterceptor(interceptor); + } + + @Test + public void testEverythingReturnsCorrectBundleType() throws Exception { + myRestServer.setDefaultResponseEncoding(EncodingEnum.JSON); + myRestServer.setPagingProvider(new FifoMemoryPagingProvider(1).setDefaultPageSize(10)); + ResponseHighlighterInterceptor interceptor = new ResponseHighlighterInterceptor(); + myRestServer.registerInterceptor(interceptor); + + for (int i = 0; i < 11; i++) { + Patient p = new Patient(); + p.addName().addFamily("Name" + i); + ourClient.create().resource(p).execute(); + } + + HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything"); + get.addHeader("Accept", "application/xml+fhir"); + CloseableHttpResponse http = ourHttpClient.execute(get); + try { + String response = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(response); + assertThat(response, not(containsString("_format"))); + assertEquals(200, http.getStatusLine().getStatusCode()); + + Bundle responseBundle = ourCtx.newXmlParser().parseResource(Bundle.class, response); + assertEquals(BundleType.COLLECTION, responseBundle.getTypeElement().getValue()); + + } finally { + http.close(); + } + + myRestServer.unregisterInterceptor(interceptor); + } + + @Test + public void testEverythingType() throws Exception { + HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything"); + CloseableHttpResponse http = ourHttpClient.execute(get); + try { + assertEquals(200, http.getStatusLine().getStatusCode()); + } finally { + http.close(); + } + } + + @Transactional(propagation=Propagation.NEVER) + @Test + public void testSuggestKeywords() throws Exception { + + Patient patient = new Patient(); + patient.addName().addFamily("testSuggest"); + IIdType ptId = myPatientDao.create(patient).getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL"); + obs.getSubject().setReferenceElement(ptId); + IIdType obsId = myObservationDao.create(obs).getId().toUnqualifiedVersionless(); + + obs = new Observation(); + obs.setId(obsId); + obs.getSubject().setReferenceElement(ptId); + obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL"); + myObservationDao.update(obs); + + HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml"); + CloseableHttpResponse http = ourHttpClient.execute(get); + try { + assertEquals(200, http.getStatusLine().getStatusCode()); + String output = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(output); + + Parameters parameters = ourCtx.newXmlParser().parseResource(Parameters.class, output); + assertEquals(2, parameters.getParameter().size()); + assertEquals("keyword", parameters.getParameter().get(0).getPart().get(0).getName()); + assertEquals(new StringType("ZXCVBNM"), parameters.getParameter().get(0).getPart().get(0).getValue()); + assertEquals("score", parameters.getParameter().get(0).getPart().get(1).getName()); + assertEquals(new DecimalType("1.0"), parameters.getParameter().get(0).getPart().get(1).getValue()); + + } finally { + http.close(); + } + } + + @Test + public void testSuggestKeywordsInvalid() throws Exception { + Patient patient = new Patient(); + patient.addName().addFamily("testSuggest"); + IIdType ptId = myPatientDao.create(patient).getId().toUnqualifiedVersionless(); + + Observation obs = new Observation(); + obs.getSubject().setReferenceElement(ptId); + obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL"); + myObservationDao.create(obs); + + HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords"); + CloseableHttpResponse http = ourHttpClient.execute(get); + try { + assertEquals(400, http.getStatusLine().getStatusCode()); + String output = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(output); + assertThat(output, containsString("Parameter 'context' must be provided")); + } finally { + http.close(); + } + + get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything"); + http = ourHttpClient.execute(get); + try { + assertEquals(400, http.getStatusLine().getStatusCode()); + String output = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(output); + assertThat(output, containsString("Parameter 'searchParam' must be provided")); + } finally { + http.close(); + } + + get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=aa"); + http = ourHttpClient.execute(get); + try { + assertEquals(400, http.getStatusLine().getStatusCode()); + String output = IOUtils.toString(http.getEntity().getContent()); + ourLog.info(output); + assertThat(output, containsString("Parameter 'text' must be provided")); + } finally { + http.close(); + } + + } + + @Test + public void testGetOperationDefinition() { + OperationDefinition op = ourClient.read(OperationDefinition.class, "get-resource-counts"); + assertEquals("$get-resource-counts", op.getCode()); + } + + @Test + public void testTransactionFromBundle() throws Exception { + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve.xml"); + String bundle = IOUtils.toString(bundleRes); + String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + ourLog.info(response); + } + + @Test + public void testTransactionFromBundle2() throws Exception { + + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); + String bundle = IOUtils.toString(bundleRes); + String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + ourLog.info(response); + + Bundle resp = ourCtx.newXmlParser().parseResource(Bundle.class, response); + IdType id1_1 = new IdType(resp.getEntry().get(0).getResponse().getLocation()); + assertEquals("Provenance", id1_1.getResourceType()); + IdType id1_2 = new IdType(resp.getEntry().get(1).getResponse().getLocation()); + IdType id1_3 = new IdType(resp.getEntry().get(2).getResponse().getLocation()); + IdType id1_4 = new IdType(resp.getEntry().get(3).getResponse().getLocation()); + + /* + * Same bundle! + */ + + bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml"); + bundle = IOUtils.toString(bundleRes); + response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + ourLog.info(response); + + resp = ourCtx.newXmlParser().parseResource(Bundle.class, response); + IdType id2_1 = new IdType(resp.getEntry().get(0).getResponse().getLocation()); + IdType id2_2 = new IdType(resp.getEntry().get(1).getResponse().getLocation()); + IdType id2_3 = new IdType(resp.getEntry().get(2).getResponse().getLocation()); + IdType id2_4 = new IdType(resp.getEntry().get(3).getResponse().getLocation()); + + assertNotEquals(id1_1.toVersionless(), id2_1.toVersionless()); + assertEquals("Provenance", id2_1.getResourceType()); + assertEquals(id1_2.toVersionless(), id2_2.toVersionless()); + assertEquals(id1_3.toVersionless(), id2_3.toVersionless()); + assertEquals(id1_4.toVersionless(), id2_4.toVersionless()); + } + + /** + * This is Gramahe's test transaction - it requires some set up in order to work + */ + // @Test + public void testTransactionFromBundle3() throws Exception { + + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/grahame-transaction.xml"); + String bundle = IOUtils.toString(bundleRes); + String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + ourLog.info(response); + } + + @Test + public void testTransactionFromBundle4() throws Exception { + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle.xml"); + String bundle = IOUtils.toString(bundleRes); + String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + ourLog.info(response); + Bundle bundleResp = ourCtx.newXmlParser().parseResource(Bundle.class, response); + IdType id = new IdType(bundleResp.getEntry().get(0).getResponse().getLocation()); + assertEquals("Patient", id.getResourceType()); + assertTrue(id.hasIdPart()); + assertTrue(id.isIdPartValidLong()); + assertTrue(id.hasVersionIdPart()); + assertTrue(id.isVersionIdPartValidLong()); + } + + @Test + public void testTransactionFromBundle5() throws Exception { + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle2.xml"); + String bundle = IOUtils.toString(bundleRes); + try { + ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + fail(); + } catch (InvalidRequestException e) { + OperationOutcome oo = (OperationOutcome) e.getOperationOutcome(); + assertEquals("Invalid placeholder ID found: uri:uuid:bb0cd4bc-1839-4606-8c46-ba3069e69b1d - Must be of the form 'urn:uuid:[uuid]' or 'urn:oid:[oid]'", oo.getIssue().get(0).getDiagnostics()); + assertEquals("processing", oo.getIssue().get(0).getCode()); + } + } + + @Test + public void testTransactionFromBundle6() throws Exception { + InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle3.xml"); + String bundle = IOUtils.toString(bundleRes); + ourClient.transaction().withBundle(bundle).prettyPrint().execute(); + // try { + // fail(); + // } catch (InvalidRequestException e) { + // OperationOutcome oo = (OperationOutcome) e.getOperationOutcome(); + // assertEquals("Invalid placeholder ID found: uri:uuid:bb0cd4bc-1839-4606-8c46-ba3069e69b1d - Must be of the form 'urn:uuid:[uuid]' or 'urn:oid:[oid]'", oo.getIssue().get(0).getDiagnostics()); + // assertEquals("processing", oo.getIssue().get(0).getCode()); + // } + } + + @Test + public void testTransactionSearch() throws Exception { + for (int i = 0; i < 20; i ++) { + Patient p = new Patient(); + p.addName().addFamily("PATIENT_" + i); + myPatientDao.create(p); + } + + Bundle req = new Bundle(); + req.setType(BundleType.TRANSACTION); + req.addEntry().getRequest().setMethod(HTTPVerb.GET).setUrl("Patient?"); + Bundle resp = ourClient.transaction().withBundle(req).execute(); + ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp)); + + assertEquals(1, resp.getEntry().size()); + Bundle respSub = (Bundle)resp.getEntry().get(0).getResource(); + assertEquals("self", respSub.getLink().get(0).getRelation()); + assertEquals(ourServerBase + "/Patient", respSub.getLink().get(0).getUrl()); + assertEquals("next", respSub.getLink().get(1).getRelation()); + assertThat(respSub.getLink().get(1).getUrl(), containsString("/fhir/context?_getpages")); + assertThat(respSub.getEntry().get(0).getFullUrl(), startsWith(ourServerBase + "/Patient/")); + assertEquals(Patient.class, respSub.getEntry().get(0).getResource().getClass()); + } + + @Test + public void testTransactionCount() throws Exception { + for (int i = 0; i < 20; i ++) { + Patient p = new Patient(); + p.addName().addFamily("PATIENT_" + i); + myPatientDao.create(p); + } + + Bundle req = new Bundle(); + req.setType(BundleType.TRANSACTION); + req.addEntry().getRequest().setMethod(HTTPVerb.GET).setUrl("Patient?_summary=count"); + Bundle resp = ourClient.transaction().withBundle(req).execute(); + ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp)); + + assertEquals(1, resp.getEntry().size()); + Bundle respSub = (Bundle)resp.getEntry().get(0).getResource(); + assertEquals(20, respSub.getTotal()); + assertEquals(0, respSub.getEntry().size()); + } + + @AfterClass + public static void afterClass() throws Exception { + ourServer.stop(); + } + +} diff --git a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java index 5bbeba35c24..b8255149a20 100644 --- a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java +++ b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java @@ -35,6 +35,7 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; @@ -398,4 +399,10 @@ public class FhirDstu1 implements IFhirVersion { return theExtensionDefToCode; } + @Override + public IIdType newIdType() { + return new IdDt(); + } + + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java index 45039cd1849..23af232fc56 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java @@ -29,11 +29,15 @@ 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.instance.model.api.IBaseCoding; import org.hl7.fhir.instance.model.api.IBaseReference; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.ConfigurationException; @@ -98,7 +102,7 @@ public class FhirDstu21 implements IFhirVersion { @Override public IPrimitiveType getLastUpdated(IBaseResource theResource) { - return ResourceMetadataKeyEnum.UPDATED.get((IResource) theResource); + return ((Resource) theResource).getMeta().getLastUpdatedElement(); } @Override @@ -126,4 +130,9 @@ public class FhirDstu21 implements IFhirVersion { return new Coding(); } + @Override + public IIdType newIdType() { + return new IdType(); + } + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java index 7c178c881aa..cfeecdb8f5d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java @@ -29,15 +29,14 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.hl7.fhir.dstu21.model.Bundle; -import org.hl7.fhir.dstu21.model.DomainResource; 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.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.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -46,14 +45,10 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimeResourceDefinition; -import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt; import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.valueset.BundleEntrySearchModeEnum; import ca.uhn.fhir.model.valueset.BundleEntryTransactionMethodEnum; import ca.uhn.fhir.model.valueset.BundleTypeEnum; import ca.uhn.fhir.rest.server.AddProfileTagEnum; @@ -94,26 +89,26 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { Set containedIds = new HashSet(); if (next instanceof DomainResource) { for (Resource nextContained : ((DomainResource)next).getContained()) { - if (nextContained.getId().isEmpty() == false) { - containedIds.add(nextContained.getId()); + if (nextContained.getIdElement().isEmpty() == false) { + containedIds.add(nextContained.getIdElement().getValue()); } } } List references = myContext.newTerser().getAllPopulatedChildElementsOfType(next, BaseResourceReferenceDt.class); do { - List addedResourcesThisPass = new ArrayList(); + List addedResourcesThisPass = new ArrayList(); for (BaseResourceReferenceDt nextRef : references) { - IResource nextRes = (IResource) nextRef.getResource(); + IAnyResource nextRes = (IAnyResource) nextRef.getResource(); if (nextRes != null) { - if (nextRes.getId().hasIdPart()) { - if (containedIds.contains(nextRes.getId().getValue())) { + if (nextRes.getIdElement().hasIdPart()) { + if (containedIds.contains(nextRes.getIdElement().getValue())) { // Don't add contained IDs as top level resources continue; } - IdDt id = nextRes.getId(); + IIdType id = nextRes.getIdElement(); if (id.hasResourceType() == false) { String resName = myContext.getResourceDefinition(nextRes).getName(); id = id.withResourceType(resName); @@ -130,7 +125,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { // Linked resources may themselves have linked resources references = new ArrayList(); - for (IResource iResource : addedResourcesThisPass) { + for (IAnyResource iResource : addedResourcesThisPass) { List newReferences = myContext.newTerser().getAllPopulatedChildElementsOfType(iResource, BaseResourceReferenceDt.class); references.addAll(newReferences); } @@ -144,9 +139,9 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { entry.setFullUrl(next.getId()); } - BundleEntryTransactionMethodEnum httpVerb = (BundleEntryTransactionMethodEnum) next.getUserData(ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.name()); + String httpVerb = ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.get(next); if (httpVerb != null) { - entry.getRequest().getMethodElement().setValueAsString(httpVerb.getCode()); + entry.getRequest().getMethodElement().setValueAsString(httpVerb); } } @@ -168,12 +163,12 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { myBundle = new Bundle(); } - List includedResources = new ArrayList(); - Set addedResourceIds = new HashSet(); + List includedResources = new ArrayList(); + Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { if (next.getIdElement().isEmpty() == false) { - addedResourceIds.add((IdDt) next.getIdElement()); + addedResourceIds.add((IdType) next.getIdElement()); } } @@ -191,21 +186,21 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { List references = myContext.newTerser().getAllResourceReferences(next); do { - List addedResourcesThisPass = new ArrayList(); + List addedResourcesThisPass = new ArrayList(); for (ResourceReferenceInfo nextRefInfo : references) { if (!theBundleInclusionRule.shouldIncludeReferencedResource(nextRefInfo, theIncludes)) continue; - IResource nextRes = (IResource) nextRefInfo.getResourceReference().getResource(); + IAnyResource nextRes = (IAnyResource) nextRefInfo.getResourceReference().getResource(); if (nextRes != null) { - if (nextRes.getId().hasIdPart()) { - if (containedIds.contains(nextRes.getId().getValue())) { + if (nextRes.getIdElement().hasIdPart()) { + if (containedIds.contains(nextRes.getIdElement().getValue())) { // Don't add contained IDs as top level resources continue; } - IdDt id = nextRes.getId(); + IIdType id = nextRes.getIdElement(); if (id.hasResourceType() == false) { String resName = myContext.getResourceDefinition(nextRes).getName(); id = id.withResourceType(resName); @@ -224,7 +219,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { // Linked resources may themselves have linked resources references = new ArrayList(); - for (IResource iResource : addedResourcesThisPass) { + for (IAnyResource iResource : addedResourcesThisPass) { List newReferences = myContext.newTerser().getAllResourceReferences(iResource); references.addAll(newReferences); } @@ -232,22 +227,22 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { BundleEntryComponent entry = myBundle.addEntry().setResource((Resource) next); Resource nextAsResource = (Resource)next; - BundleEntryTransactionMethodEnum httpVerb = (BundleEntryTransactionMethodEnum) nextAsResource.getUserData(ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.name()); + String httpVerb = ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.get(nextAsResource); if (httpVerb != null) { - entry.getRequest().getMethodElement().setValueAsString(httpVerb.getCode()); + entry.getRequest().getMethodElement().setValueAsString(httpVerb); } populateBundleEntryFullUrl(next, entry); - BundleEntrySearchModeEnum searchMode = (BundleEntrySearchModeEnum) nextAsResource.getUserData(ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.name()); + String searchMode = ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.get(nextAsResource); if (searchMode != null) { - entry.getSearch().getModeElement().setValueAsString(searchMode.getCode()); + entry.getSearch().getModeElement().setValueAsString(searchMode); } } /* * Actually add the resources to the bundle */ - for (IResource next : includedResources) { + for (IAnyResource next : includedResources) { BundleEntryComponent entry = myBundle.addEntry(); entry.setResource((Resource) next).getSearch().setMode(SearchEntryMode.INCLUDE); populateBundleEntryFullUrl(next, entry); @@ -272,7 +267,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { myBase = theServerBase; - if (myBundle.getId().isEmpty()) { + if (myBundle.getIdElement().isEmpty()) { myBundle.setId(UUID.randomUUID().toString()); } @@ -413,7 +408,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { BundleEntryComponent nextEntry = myBundle.addEntry(); nextEntry.setResource((Resource) next); - if (next.getId().isEmpty()) { + if (next.getIdElement().isEmpty()) { nextEntry.getRequest().setMethod(HTTPVerb.POST); } else { nextEntry.getRequest().setMethod(HTTPVerb.PUT); @@ -421,7 +416,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { nextEntry.getRequest().setUrl(next.getId()); } else { String resourceType = myContext.getResourceDefinition(next).getName(); - nextEntry.getRequest().setUrl(new IdDt(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue()); + nextEntry.getRequest().setUrl(new IdType(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue()); } } } @@ -444,10 +439,10 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory { if (next.getResource() != null) { retVal.add(next.getResource()); } else if (next.getResponse().getLocationElement().isEmpty() == false) { - IdDt id = new IdDt(next.getResponse().getLocation()); + IdType id = new IdType(next.getResponse().getLocation()); String resourceType = id.getResourceType(); if (isNotBlank(resourceType)) { - IResource res = (IResource) myContext.getResourceDefinition(resourceType).newInstance(); + IAnyResource res = (IAnyResource) myContext.getResourceDefinition(resourceType).newInstance(); res.setId(id); retVal.add(res); } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java index 5352e612044..0c0c2740026 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -777,42 +777,204 @@ public class Account extends DomainResource { return ResourceType.Account; } + /** + * Search parameter: owner + *

+ * Description: Who is responsible?
+ * Type: reference
+ * Path: Account.owner
+ *

+ */ @SearchParamDefinition(name="owner", path="Account.owner", description="Who is responsible?", type="reference" ) public static final String SP_OWNER = "owner"; + /** + * Fluent Client search parameter constant for owner + *

+ * Description: Who is responsible?
+ * Type: reference
+ * Path: Account.owner
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam OWNER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_OWNER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Account:owner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_OWNER = new ca.uhn.fhir.model.api.Include("Account:owner").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Account number
+ * Type: token
+ * Path: Account.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Account number
+ * Type: token
+ * Path: Account.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: period + *

+ * Description: Transaction window
+ * Type: date
+ * Path: Account.coveragePeriod
+ *

+ */ @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date" ) public static final String SP_PERIOD = "period"; + /** + * Fluent Client search parameter constant for period + *

+ * Description: Transaction window
+ * Type: date
+ * Path: Account.coveragePeriod
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD); + + /** + * Search parameter: balance + *

+ * Description: How much is in account?
+ * Type: quantity
+ * Path: Account.balance
+ *

+ */ @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="quantity" ) public static final String SP_BALANCE = "balance"; + /** + * Fluent Client search parameter constant for balance + *

+ * Description: How much is in account?
+ * Type: quantity
+ * Path: Account.balance
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam BALANCE = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_BALANCE); + + /** + * Search parameter: subject + *

+ * Description: What is account tied to?
+ * Type: reference
+ * Path: Account.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: What is account tied to?
+ * Type: reference
+ * Path: Account.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Account:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Account:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: What is account tied to?
+ * Type: reference
+ * Path: Account.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: What is account tied to?
+ * Type: reference
+ * Path: Account.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Account:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Account:patient").toLocked(); + /** + * Search parameter: name + *

+ * Description: Human-readable label
+ * Type: string
+ * Path: Account.name
+ *

+ */ @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Human-readable label
+ * Type: string
+ * Path: Account.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: type + *

+ * Description: E.g. patient, expense, depreciation
+ * Type: token
+ * Path: Account.type
+ *

+ */ @SearchParamDefinition(name="type", path="Account.type", description="E.g. patient, expense, depreciation", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: E.g. patient, expense, depreciation
+ * Type: token
+ * Path: Account.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: status + *

+ * Description: active | inactive
+ * Type: token
+ * Path: Account.status
+ *

+ */ @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: active | inactive
+ * Type: token
+ * Path: Account.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java index 91b6758db92..a6b545224a1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java index 57c47e9ee03..ce67b588b2b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java index 3713ad7b654..834a10e7de7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2132,54 +2132,324 @@ public class AllergyIntolerance extends DomainResource { return ResourceType.AllergyIntolerance; } + /** + * Search parameter: severity + *

+ * Description: mild | moderate | severe (of event as a whole)
+ * Type: token
+ * Path: AllergyIntolerance.reaction.severity
+ *

+ */ @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token" ) public static final String SP_SEVERITY = "severity"; + /** + * Fluent Client search parameter constant for severity + *

+ * Description: mild | moderate | severe (of event as a whole)
+ * Type: token
+ * Path: AllergyIntolerance.reaction.severity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY); + + /** + * Search parameter: date + *

+ * Description: When recorded
+ * Type: date
+ * Path: AllergyIntolerance.recordedDate
+ *

+ */ @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="When recorded", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When recorded
+ * Type: date
+ * Path: AllergyIntolerance.recordedDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: External ids for this item
+ * Type: token
+ * Path: AllergyIntolerance.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier", description="External ids for this item", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External ids for this item
+ * Type: token
+ * Path: AllergyIntolerance.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: manifestation + *

+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: token
+ * Path: AllergyIntolerance.reaction.manifestation
+ *

+ */ @SearchParamDefinition(name="manifestation", path="AllergyIntolerance.reaction.manifestation", description="Clinical symptoms/signs associated with the Event", type="token" ) public static final String SP_MANIFESTATION = "manifestation"; + /** + * Fluent Client search parameter constant for manifestation + *

+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: token
+ * Path: AllergyIntolerance.reaction.manifestation
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam MANIFESTATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MANIFESTATION); + + /** + * Search parameter: recorder + *

+ * Description: Who recorded the sensitivity
+ * Type: reference
+ * Path: AllergyIntolerance.recorder
+ *

+ */ @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference" ) public static final String SP_RECORDER = "recorder"; + /** + * Fluent Client search parameter constant for recorder + *

+ * Description: Who recorded the sensitivity
+ * Type: reference
+ * Path: AllergyIntolerance.recorder
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECORDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECORDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AllergyIntolerance:recorder". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECORDER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:recorder").toLocked(); + /** + * Search parameter: substance + *

+ * Description: Substance, (or class) considered to be responsible for risk
+ * Type: token
+ * Path: AllergyIntolerance.substance, AllergyIntolerance.reaction.substance
+ *

+ */ @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance|AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token" ) public static final String SP_SUBSTANCE = "substance"; + /** + * Fluent Client search parameter constant for substance + *

+ * Description: Substance, (or class) considered to be responsible for risk
+ * Type: token
+ * Path: AllergyIntolerance.substance, AllergyIntolerance.reaction.substance
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBSTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBSTANCE); + + /** + * Search parameter: criticality + *

+ * Description: CRITL | CRITH | CRITU
+ * Type: token
+ * Path: AllergyIntolerance.criticality
+ *

+ */ @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="CRITL | CRITH | CRITU", type="token" ) public static final String SP_CRITICALITY = "criticality"; + /** + * Fluent Client search parameter constant for criticality + *

+ * Description: CRITL | CRITH | CRITU
+ * Type: token
+ * Path: AllergyIntolerance.criticality
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CRITICALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CRITICALITY); + + /** + * Search parameter: reporter + *

+ * Description: Source of the information about the allergy
+ * Type: reference
+ * Path: AllergyIntolerance.reporter
+ *

+ */ @SearchParamDefinition(name="reporter", path="AllergyIntolerance.reporter", description="Source of the information about the allergy", type="reference" ) public static final String SP_REPORTER = "reporter"; + /** + * Fluent Client search parameter constant for reporter + *

+ * Description: Source of the information about the allergy
+ * Type: reference
+ * Path: AllergyIntolerance.reporter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REPORTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REPORTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AllergyIntolerance:reporter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REPORTER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:reporter").toLocked(); + /** + * Search parameter: type + *

+ * Description: allergy | intolerance - Underlying mechanism (if known)
+ * Type: token
+ * Path: AllergyIntolerance.type
+ *

+ */ @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="allergy | intolerance - Underlying mechanism (if known)", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: allergy | intolerance - Underlying mechanism (if known)
+ * Type: token
+ * Path: AllergyIntolerance.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: onset + *

+ * Description: Date(/time) when manifestations showed
+ * Type: date
+ * Path: AllergyIntolerance.reaction.onset
+ *

+ */ @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date" ) public static final String SP_ONSET = "onset"; + /** + * Fluent Client search parameter constant for onset + *

+ * Description: Date(/time) when manifestations showed
+ * Type: date
+ * Path: AllergyIntolerance.reaction.onset
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam ONSET = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ONSET); + + /** + * Search parameter: route + *

+ * Description: How the subject was exposed to the substance
+ * Type: token
+ * Path: AllergyIntolerance.reaction.exposureRoute
+ *

+ */ @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token" ) public static final String SP_ROUTE = "route"; + /** + * Fluent Client search parameter constant for route + *

+ * Description: How the subject was exposed to the substance
+ * Type: token
+ * Path: AllergyIntolerance.reaction.exposureRoute
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROUTE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROUTE); + + /** + * Search parameter: patient + *

+ * Description: Who the sensitivity is for
+ * Type: reference
+ * Path: AllergyIntolerance.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient", description="Who the sensitivity is for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who the sensitivity is for
+ * Type: reference
+ * Path: AllergyIntolerance.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AllergyIntolerance:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:patient").toLocked(); + /** + * Search parameter: category + *

+ * Description: food | medication | environment | other - Category of Substance
+ * Type: token
+ * Path: AllergyIntolerance.category
+ *

+ */ @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: food | medication | environment | other - Category of Substance
+ * Type: token
+ * Path: AllergyIntolerance.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: last-date + *

+ * Description: Date(/time) of last known occurrence of a reaction
+ * Type: date
+ * Path: AllergyIntolerance.lastOccurence
+ *

+ */ @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurrence of a reaction", type="date" ) public static final String SP_LAST_DATE = "last-date"; + /** + * Fluent Client search parameter constant for last-date + *

+ * Description: Date(/time) of last known occurrence of a reaction
+ * Type: date
+ * Path: AllergyIntolerance.lastOccurence
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam LAST_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LAST_DATE); + + /** + * Search parameter: status + *

+ * Description: active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error
+ * Type: token
+ * Path: AllergyIntolerance.status
+ *

+ */ @SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error
+ * Type: token
+ * Path: AllergyIntolerance.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java index f53e1e062e0..89ef1ec18f5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java index 474a921a32b..230fc5aedb7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1544,46 +1544,190 @@ public class Appointment extends DomainResource { return ResourceType.Appointment; } + /** + * Search parameter: date + *

+ * Description: Appointment date/time.
+ * Type: date
+ * Path: Appointment.start
+ *

+ */ @SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Appointment date/time.
+ * Type: date
+ * Path: Appointment.start
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: actor + *

+ * Description: Any one of the individuals participating in the appointment
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ @SearchParamDefinition(name="actor", path="Appointment.participant.actor", description="Any one of the individuals participating in the appointment", type="reference" ) public static final String SP_ACTOR = "actor"; + /** + * Fluent Client search parameter constant for actor + *

+ * Description: Any one of the individuals participating in the appointment
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Appointment:actor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Appointment:actor").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: An Identifier of the Appointment
+ * Type: token
+ * Path: Appointment.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Appointment.identifier", description="An Identifier of the Appointment", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: An Identifier of the Appointment
+ * Type: token
+ * Path: Appointment.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: practitioner + *

+ * Description: One of the individuals of the appointment is this practitioner
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + /** + * Fluent Client search parameter constant for practitioner + *

+ * Description: One of the individuals of the appointment is this practitioner
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Appointment:practitioner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("Appointment:practitioner").toLocked(); + /** + * Search parameter: part-status + *

+ * Description: The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.
+ * Type: token
+ * Path: Appointment.participant.status
+ *

+ */ @SearchParamDefinition(name="part-status", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token" ) public static final String SP_PART_STATUS = "part-status"; + /** + * Fluent Client search parameter constant for part-status + *

+ * Description: The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.
+ * Type: token
+ * Path: Appointment.participant.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PART_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PART_STATUS); + + /** + * Search parameter: patient + *

+ * Description: One of the individuals of the appointment is this patient
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: One of the individuals of the appointment is this patient
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Appointment:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Appointment:patient").toLocked(); + /** + * Search parameter: location + *

+ * Description: This location is listed in the participants of the appointment
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: This location is listed in the participants of the appointment
+ * Type: reference
+ * Path: Appointment.participant.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Appointment:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Appointment:location").toLocked(); + /** + * Search parameter: status + *

+ * Description: The overall status of the appointment
+ * Type: token
+ * Path: Appointment.status
+ *

+ */ @SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The overall status of the appointment
+ * Type: token
+ * Path: Appointment.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java index 4dbbb05c937..611c217d963 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -770,44 +770,170 @@ public class AppointmentResponse extends DomainResource { return ResourceType.AppointmentResponse; } + /** + * Search parameter: actor + *

+ * Description: The Person, Location/HealthcareService or Device that this appointment response replies for
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ @SearchParamDefinition(name="actor", path="AppointmentResponse.actor", description="The Person, Location/HealthcareService or Device that this appointment response replies for", type="reference" ) public static final String SP_ACTOR = "actor"; + /** + * Fluent Client search parameter constant for actor + *

+ * Description: The Person, Location/HealthcareService or Device that this appointment response replies for
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AppointmentResponse:actor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("AppointmentResponse:actor").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: An Identifier in this appointment response
+ * Type: token
+ * Path: AppointmentResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="AppointmentResponse.identifier", description="An Identifier in this appointment response", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: An Identifier in this appointment response
+ * Type: token
+ * Path: AppointmentResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: practitioner + *

+ * Description: This Response is for this Practitioner
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + /** + * Fluent Client search parameter constant for practitioner + *

+ * Description: This Response is for this Practitioner
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AppointmentResponse:practitioner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("AppointmentResponse:practitioner").toLocked(); + /** + * Search parameter: part-status + *

+ * Description: The participants acceptance status for this appointment
+ * Type: token
+ * Path: AppointmentResponse.participantStatus
+ *

+ */ @SearchParamDefinition(name="part-status", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token" ) public static final String SP_PART_STATUS = "part-status"; + /** + * Fluent Client search parameter constant for part-status + *

+ * Description: The participants acceptance status for this appointment
+ * Type: token
+ * Path: AppointmentResponse.participantStatus
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PART_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PART_STATUS); + + /** + * Search parameter: patient + *

+ * Description: This Response is for this Patient
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: This Response is for this Patient
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AppointmentResponse:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AppointmentResponse:patient").toLocked(); + /** + * Search parameter: appointment + *

+ * Description: The appointment that the response is attached to
+ * Type: reference
+ * Path: AppointmentResponse.appointment
+ *

+ */ @SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference" ) public static final String SP_APPOINTMENT = "appointment"; + /** + * Fluent Client search parameter constant for appointment + *

+ * Description: The appointment that the response is attached to
+ * Type: reference
+ * Path: AppointmentResponse.appointment
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam APPOINTMENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_APPOINTMENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AppointmentResponse:appointment". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_APPOINTMENT = new ca.uhn.fhir.model.api.Include("AppointmentResponse:appointment").toLocked(); + /** + * Search parameter: location + *

+ * Description: This Response is for this Location
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ @SearchParamDefinition(name="location", path="AppointmentResponse.actor", description="This Response is for this Location", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: This Response is for this Location
+ * Type: reference
+ * Path: AppointmentResponse.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AppointmentResponse:location". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java index a2fa680b00d..f6b94c60a51 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java index 032cab3702e..d4502bb475f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2984,58 +2984,364 @@ public class AuditEvent extends DomainResource { return ResourceType.AuditEvent; } + /** + * Search parameter: date + *

+ * Description: Time when the event occurred on source
+ * Type: date
+ * Path: AuditEvent.recorded
+ *

+ */ @SearchParamDefinition(name="date", path="AuditEvent.recorded", description="Time when the event occurred on source", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Time when the event occurred on source
+ * Type: date
+ * Path: AuditEvent.recorded
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: address + *

+ * Description: Identifier for the network access point of the user device
+ * Type: token
+ * Path: AuditEvent.agent.network.address
+ *

+ */ @SearchParamDefinition(name="address", path="AuditEvent.agent.network.address", description="Identifier for the network access point of the user device", type="token" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: Identifier for the network access point of the user device
+ * Type: token
+ * Path: AuditEvent.agent.network.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS); + + /** + * Search parameter: source + *

+ * Description: The identity of source detecting the event
+ * Type: token
+ * Path: AuditEvent.source.identifier
+ *

+ */ @SearchParamDefinition(name="source", path="AuditEvent.source.identifier", description="The identity of source detecting the event", type="token" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: The identity of source detecting the event
+ * Type: token
+ * Path: AuditEvent.source.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SOURCE); + + /** + * Search parameter: type + *

+ * Description: Type/identifier of event
+ * Type: token
+ * Path: AuditEvent.type
+ *

+ */ @SearchParamDefinition(name="type", path="AuditEvent.type", description="Type/identifier of event", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Type/identifier of event
+ * Type: token
+ * Path: AuditEvent.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: altid + *

+ * Description: Alternative User id e.g. authentication
+ * Type: token
+ * Path: AuditEvent.agent.altId
+ *

+ */ @SearchParamDefinition(name="altid", path="AuditEvent.agent.altId", description="Alternative User id e.g. authentication", type="token" ) public static final String SP_ALTID = "altid"; + /** + * Fluent Client search parameter constant for altid + *

+ * Description: Alternative User id e.g. authentication
+ * Type: token
+ * Path: AuditEvent.agent.altId
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ALTID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ALTID); + + /** + * Search parameter: participant + *

+ * Description: Direct reference to resource
+ * Type: reference
+ * Path: AuditEvent.agent.reference
+ *

+ */ @SearchParamDefinition(name="participant", path="AuditEvent.agent.reference", description="Direct reference to resource", type="reference" ) public static final String SP_PARTICIPANT = "participant"; + /** + * Fluent Client search parameter constant for participant + *

+ * Description: Direct reference to resource
+ * Type: reference
+ * Path: AuditEvent.agent.reference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AuditEvent:participant". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("AuditEvent:participant").toLocked(); + /** + * Search parameter: reference + *

+ * Description: Specific instance of resource (e.g. versioned)
+ * Type: reference
+ * Path: AuditEvent.entity.reference
+ *

+ */ @SearchParamDefinition(name="reference", path="AuditEvent.entity.reference", description="Specific instance of resource (e.g. versioned)", type="reference" ) public static final String SP_REFERENCE = "reference"; + /** + * Fluent Client search parameter constant for reference + *

+ * Description: Specific instance of resource (e.g. versioned)
+ * Type: reference
+ * Path: AuditEvent.entity.reference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REFERENCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AuditEvent:reference". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REFERENCE = new ca.uhn.fhir.model.api.Include("AuditEvent:reference").toLocked(); + /** + * Search parameter: site + *

+ * Description: Logical source location within the enterprise
+ * Type: token
+ * Path: AuditEvent.source.site
+ *

+ */ @SearchParamDefinition(name="site", path="AuditEvent.source.site", description="Logical source location within the enterprise", type="token" ) public static final String SP_SITE = "site"; + /** + * Fluent Client search parameter constant for site + *

+ * Description: Logical source location within the enterprise
+ * Type: token
+ * Path: AuditEvent.source.site
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SITE); + + /** + * Search parameter: subtype + *

+ * Description: More specific type/id for the event
+ * Type: token
+ * Path: AuditEvent.subtype
+ *

+ */ @SearchParamDefinition(name="subtype", path="AuditEvent.subtype", description="More specific type/id for the event", type="token" ) public static final String SP_SUBTYPE = "subtype"; + /** + * Fluent Client search parameter constant for subtype + *

+ * Description: More specific type/id for the event
+ * Type: token
+ * Path: AuditEvent.subtype
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBTYPE); + + /** + * Search parameter: identity + *

+ * Description: Specific instance of object (e.g. versioned)
+ * Type: token
+ * Path: AuditEvent.entity.identifier
+ *

+ */ @SearchParamDefinition(name="identity", path="AuditEvent.entity.identifier", description="Specific instance of object (e.g. versioned)", type="token" ) public static final String SP_IDENTITY = "identity"; + /** + * Fluent Client search parameter constant for identity + *

+ * Description: Specific instance of object (e.g. versioned)
+ * Type: token
+ * Path: AuditEvent.entity.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTITY); + + /** + * Search parameter: patient + *

+ * Description: Direct reference to resource
+ * Type: reference
+ * Path: AuditEvent.agent.reference, AuditEvent.entity.reference
+ *

+ */ @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference|AuditEvent.entity.reference", description="Direct reference to resource", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Direct reference to resource
+ * Type: reference
+ * Path: AuditEvent.agent.reference, AuditEvent.entity.reference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "AuditEvent:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AuditEvent:patient").toLocked(); + /** + * Search parameter: object-type + *

+ * Description: Type of object involved
+ * Type: token
+ * Path: AuditEvent.entity.type
+ *

+ */ @SearchParamDefinition(name="object-type", path="AuditEvent.entity.type", description="Type of object involved", type="token" ) public static final String SP_OBJECT_TYPE = "object-type"; + /** + * Fluent Client search parameter constant for object-type + *

+ * Description: Type of object involved
+ * Type: token
+ * Path: AuditEvent.entity.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam OBJECT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OBJECT_TYPE); + + /** + * Search parameter: name + *

+ * Description: Human-meaningful name for the user
+ * Type: string
+ * Path: AuditEvent.agent.name
+ *

+ */ @SearchParamDefinition(name="name", path="AuditEvent.agent.name", description="Human-meaningful name for the user", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Human-meaningful name for the user
+ * Type: string
+ * Path: AuditEvent.agent.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: action + *

+ * Description: Type of action performed during the event
+ * Type: token
+ * Path: AuditEvent.action
+ *

+ */ @SearchParamDefinition(name="action", path="AuditEvent.action", description="Type of action performed during the event", type="token" ) public static final String SP_ACTION = "action"; + /** + * Fluent Client search parameter constant for action + *

+ * Description: Type of action performed during the event
+ * Type: token
+ * Path: AuditEvent.action
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTION); + + /** + * Search parameter: user + *

+ * Description: Unique identifier for the user
+ * Type: token
+ * Path: AuditEvent.agent.userId
+ *

+ */ @SearchParamDefinition(name="user", path="AuditEvent.agent.userId", description="Unique identifier for the user", type="token" ) public static final String SP_USER = "user"; + /** + * Fluent Client search parameter constant for user + *

+ * Description: Unique identifier for the user
+ * Type: token
+ * Path: AuditEvent.agent.userId
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam USER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USER); + + /** + * Search parameter: desc + *

+ * Description: Descriptor for entity
+ * Type: string
+ * Path: AuditEvent.entity.name
+ *

+ */ @SearchParamDefinition(name="desc", path="AuditEvent.entity.name", description="Descriptor for entity", type="string" ) public static final String SP_DESC = "desc"; + /** + * Fluent Client search parameter constant for desc + *

+ * Description: Descriptor for entity
+ * Type: string
+ * Path: AuditEvent.entity.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESC); + + /** + * Search parameter: policy + *

+ * Description: Policy that authorized event
+ * Type: uri
+ * Path: AuditEvent.agent.policy
+ *

+ */ @SearchParamDefinition(name="policy", path="AuditEvent.agent.policy", description="Policy that authorized event", type="uri" ) public static final String SP_POLICY = "policy"; + /** + * Fluent Client search parameter constant for policy + *

+ * Description: Policy that authorized event
+ * Type: uri
+ * Path: AuditEvent.agent.policy
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam POLICY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_POLICY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java index ece01d16eda..5765859595e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java index 0bdcbb69913..48ec40115b7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -404,30 +404,138 @@ public class Basic extends DomainResource { return ResourceType.Basic; } + /** + * Search parameter: identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: Basic.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: Basic.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Kind of Resource
+ * Type: token
+ * Path: Basic.code
+ *

+ */ @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Kind of Resource
+ * Type: token
+ * Path: Basic.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: subject + *

+ * Description: Identifies the focus of this resource
+ * Type: reference
+ * Path: Basic.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Identifies the focus of this resource
+ * Type: reference
+ * Path: Basic.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Basic:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Basic:subject").toLocked(); + /** + * Search parameter: created + *

+ * Description: When created
+ * Type: date
+ * Path: Basic.created
+ *

+ */ @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: When created
+ * Type: date
+ * Path: Basic.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: patient + *

+ * Description: Identifies the focus of this resource
+ * Type: reference
+ * Path: Basic.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the focus of this resource", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Identifies the focus of this resource
+ * Type: reference
+ * Path: Basic.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Basic:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Basic:patient").toLocked(); + /** + * Search parameter: author + *

+ * Description: Who created
+ * Type: reference
+ * Path: Basic.author
+ *

+ */ @SearchParamDefinition(name="author", path="Basic.author", description="Who created", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Who created
+ * Type: reference
+ * Path: Basic.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Basic:author". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java index 3d7bacde301..0a5d9014aeb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -245,8 +245,26 @@ public class Binary extends BaseBinary implements IBaseBinary { return ResourceType.Binary; } + /** + * Search parameter: contenttype + *

+ * Description: MimeType of the binary content
+ * Type: token
+ * Path: Binary.contentType
+ *

+ */ @SearchParamDefinition(name="contenttype", path="Binary.contentType", description="MimeType of the binary content", type="token" ) public static final String SP_CONTENTTYPE = "contenttype"; + /** + * Fluent Client search parameter constant for contenttype + *

+ * Description: MimeType of the binary content
+ * Type: token
+ * Path: Binary.contentType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTENTTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTENTTYPE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java index 8f155fdf4d0..4f54b7e6f94 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -468,12 +468,66 @@ public class BodySite extends DomainResource { return ResourceType.BodySite; } + /** + * Search parameter: identifier + *

+ * Description: Identifier for this instance of the anatomical location
+ * Type: token
+ * Path: BodySite.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="BodySite.identifier", description="Identifier for this instance of the anatomical location", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifier for this instance of the anatomical location
+ * Type: token
+ * Path: BodySite.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Named anatomical location
+ * Type: token
+ * Path: BodySite.code
+ *

+ */ @SearchParamDefinition(name="code", path="BodySite.code", description="Named anatomical location", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Named anatomical location
+ * Type: token
+ * Path: BodySite.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: patient + *

+ * Description: Patient to whom bodysite belongs
+ * Type: reference
+ * Path: BodySite.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="BodySite.patient", description="Patient to whom bodysite belongs", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient to whom bodysite belongs
+ * Type: reference
+ * Path: BodySite.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "BodySite:patient". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java index 138ae3694a3..26a3d2e35c1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2429,18 +2429,72 @@ public class Bundle extends Resource implements IBaseBundle { return ResourceType.Bundle; } + /** + * Search parameter: composition + *

+ * Description: The first resource in the bundle, if the bundle type is "document" - this is a composition, and this parameter provides access to searches its contents
+ * Type: reference
+ * Path: Bundle.entry.resource(0)
+ *

+ */ @SearchParamDefinition(name="composition", path="Bundle.entry.resource.item(0)", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to searches its contents", type="reference" ) public static final String SP_COMPOSITION = "composition"; + /** + * Fluent Client search parameter constant for composition + *

+ * Description: The first resource in the bundle, if the bundle type is "document" - this is a composition, and this parameter provides access to searches its contents
+ * Type: reference
+ * Path: Bundle.entry.resource(0)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam COMPOSITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_COMPOSITION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Bundle:composition". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_COMPOSITION = new ca.uhn.fhir.model.api.Include("Bundle:composition").toLocked(); + /** + * Search parameter: type + *

+ * Description: document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection
+ * Type: token
+ * Path: Bundle.type
+ *

+ */ @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection
+ * Type: token
+ * Path: Bundle.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: message + *

+ * Description: The first resource in the bundle, if the bundle type is "message" - this is a message header, and this parameter provides access to search its contents
+ * Type: reference
+ * Path: Bundle.entry.resource(0)
+ *

+ */ @SearchParamDefinition(name="message", path="Bundle.entry.resource.item(0)", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference" ) public static final String SP_MESSAGE = "message"; + /** + * Fluent Client search parameter constant for message + *

+ * Description: The first resource in the bundle, if the bundle type is "message" - this is a message header, and this parameter provides access to search its contents
+ * Type: reference
+ * Path: Bundle.entry.resource(0)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MESSAGE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MESSAGE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Bundle:message". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java index 47c212dc1dc..991dab82023 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -3137,74 +3137,308 @@ public class CarePlan extends DomainResource { return ResourceType.CarePlan; } + /** + * Search parameter: date + *

+ * Description: Time period plan covers
+ * Type: date
+ * Path: CarePlan.period
+ *

+ */ @SearchParamDefinition(name="date", path="CarePlan.period", description="Time period plan covers", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Time period plan covers
+ * Type: date
+ * Path: CarePlan.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: activitycode + *

+ * Description: Detail type of activity
+ * Type: token
+ * Path: CarePlan.activity.detail.code
+ *

+ */ @SearchParamDefinition(name="activitycode", path="CarePlan.activity.detail.code", description="Detail type of activity", type="token" ) public static final String SP_ACTIVITYCODE = "activitycode"; + /** + * Fluent Client search parameter constant for activitycode + *

+ * Description: Detail type of activity
+ * Type: token
+ * Path: CarePlan.activity.detail.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTIVITYCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTIVITYCODE); + + /** + * Search parameter: activitydate + *

+ * Description: Specified date occurs within period specified by CarePlan.activity.timingSchedule
+ * Type: date
+ * Path: CarePlan.activity.detail.scheduled[x]
+ *

+ */ @SearchParamDefinition(name="activitydate", path="CarePlan.activity.detail.scheduled[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date" ) public static final String SP_ACTIVITYDATE = "activitydate"; + /** + * Fluent Client search parameter constant for activitydate + *

+ * Description: Specified date occurs within period specified by CarePlan.activity.timingSchedule
+ * Type: date
+ * Path: CarePlan.activity.detail.scheduled[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam ACTIVITYDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ACTIVITYDATE); + + /** + * Search parameter: activityreference + *

+ * Description: Activity details defined in specific resource
+ * Type: reference
+ * Path: CarePlan.activity.reference
+ *

+ */ @SearchParamDefinition(name="activityreference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference" ) public static final String SP_ACTIVITYREFERENCE = "activityreference"; + /** + * Fluent Client search parameter constant for activityreference + *

+ * Description: Activity details defined in specific resource
+ * Type: reference
+ * Path: CarePlan.activity.reference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTIVITYREFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTIVITYREFERENCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:activityreference". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTIVITYREFERENCE = new ca.uhn.fhir.model.api.Include("CarePlan:activityreference").toLocked(); + /** + * Search parameter: performer + *

+ * Description: Matches if the practitioner is listed as a performer in any of the "simple" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)
+ * Type: reference
+ * Path: CarePlan.activity.detail.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: Matches if the practitioner is listed as a performer in any of the "simple" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)
+ * Type: reference
+ * Path: CarePlan.activity.detail.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("CarePlan:performer").toLocked(); + /** + * Search parameter: goal + *

+ * Description: Desired outcome of plan
+ * Type: reference
+ * Path: CarePlan.goal
+ *

+ */ @SearchParamDefinition(name="goal", path="CarePlan.goal", description="Desired outcome of plan", type="reference" ) public static final String SP_GOAL = "goal"; + /** + * Fluent Client search parameter constant for goal + *

+ * Description: Desired outcome of plan
+ * Type: reference
+ * Path: CarePlan.goal
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam GOAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_GOAL); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:goal". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_GOAL = new ca.uhn.fhir.model.api.Include("CarePlan:goal").toLocked(); + /** + * Search parameter: subject + *

+ * Description: Who care plan is for
+ * Type: reference
+ * Path: CarePlan.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="CarePlan.subject", description="Who care plan is for", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who care plan is for
+ * Type: reference
+ * Path: CarePlan.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CarePlan:subject").toLocked(); + /** + * Search parameter: relatedcode + *

+ * Description: includes | replaces | fulfills
+ * Type: token
+ * Path: CarePlan.relatedPlan.code
+ *

+ */ @SearchParamDefinition(name="relatedcode", path="CarePlan.relatedPlan.code", description="includes | replaces | fulfills", type="token" ) public static final String SP_RELATEDCODE = "relatedcode"; + /** + * Fluent Client search parameter constant for relatedcode + *

+ * Description: includes | replaces | fulfills
+ * Type: token
+ * Path: CarePlan.relatedPlan.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATEDCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATEDCODE); + + /** + * Search parameter: participant + *

+ * Description: Who is involved
+ * Type: reference
+ * Path: CarePlan.participant.member
+ *

+ */ @SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="Who is involved", type="reference" ) public static final String SP_PARTICIPANT = "participant"; + /** + * Fluent Client search parameter constant for participant + *

+ * Description: Who is involved
+ * Type: reference
+ * Path: CarePlan.participant.member
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:participant". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("CarePlan:participant").toLocked(); + /** + * Search parameter: relatedplan + *

+ * Description: Plan relationship exists with
+ * Type: reference
+ * Path: CarePlan.relatedPlan.plan
+ *

+ */ @SearchParamDefinition(name="relatedplan", path="CarePlan.relatedPlan.plan", description="Plan relationship exists with", type="reference" ) public static final String SP_RELATEDPLAN = "relatedplan"; + /** + * Fluent Client search parameter constant for relatedplan + *

+ * Description: Plan relationship exists with
+ * Type: reference
+ * Path: CarePlan.relatedPlan.plan
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATEDPLAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATEDPLAN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:relatedplan". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATEDPLAN = new ca.uhn.fhir.model.api.Include("CarePlan:relatedplan").toLocked(); + /** + * Search parameter: condition + *

+ * Description: Health issues this plan addresses
+ * Type: reference
+ * Path: CarePlan.addresses
+ *

+ */ @SearchParamDefinition(name="condition", path="CarePlan.addresses", description="Health issues this plan addresses", type="reference" ) public static final String SP_CONDITION = "condition"; + /** + * Fluent Client search parameter constant for condition + *

+ * Description: Health issues this plan addresses
+ * Type: reference
+ * Path: CarePlan.addresses
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:condition". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("CarePlan:condition").toLocked(); + /** + * Search parameter: related + *

+ * Description: A combination of the type of relationship and the related plan
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite" ) public static final String SP_RELATED = "related"; + /** + * Fluent Client search parameter constant for related + *

+ * Description: A combination of the type of relationship and the related plan
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATED); + + /** + * Search parameter: patient + *

+ * Description: Who care plan is for
+ * Type: reference
+ * Path: CarePlan.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="CarePlan.subject", description="Who care plan is for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who care plan is for
+ * Type: reference
+ * Path: CarePlan.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CarePlan:patient". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java index c9b9a524456..b9c2d04d059 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -6052,48 +6052,210 @@ public class Claim extends DomainResource { return ResourceType.Claim; } + /** + * Search parameter: identifier + *

+ * Description: The primary identifier of the financial resource
+ * Type: token
+ * Path: Claim.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Claim.identifier", description="The primary identifier of the financial resource", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The primary identifier of the financial resource
+ * Type: token
+ * Path: Claim.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: provider + *

+ * Description: Provider responsible for the Claim
+ * Type: reference
+ * Path: Claim.provider
+ *

+ */ @SearchParamDefinition(name="provider", path="Claim.provider", description="Provider responsible for the Claim", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: Provider responsible for the Claim
+ * Type: reference
+ * Path: Claim.provider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Claim:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("Claim:provider").toLocked(); + /** + * Search parameter: use + *

+ * Description: The kind of financial resource
+ * Type: token
+ * Path: Claim.use
+ *

+ */ @SearchParamDefinition(name="use", path="Claim.use", description="The kind of financial resource", type="token" ) public static final String SP_USE = "use"; + /** + * Fluent Client search parameter constant for use + *

+ * Description: The kind of financial resource
+ * Type: token
+ * Path: Claim.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USE); + + /** + * Search parameter: patient + *

+ * Description: Patient receiveing the services
+ * Type: reference
+ * Path: Claim.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="Claim.patient", description="Patient receiveing the services", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient receiveing the services
+ * Type: reference
+ * Path: Claim.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Claim:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Claim:patient").toLocked(); + /** + * Search parameter: created + *

+ * Description: The creation date for the Claim
+ * Type: date
+ * Path: Claim.created
+ *

+ */ @SearchParamDefinition(name="created", path="Claim.created", description="The creation date for the Claim", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date for the Claim
+ * Type: date
+ * Path: Claim.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: Claim.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="Claim.organization", description="The reference to the providing organization", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: Claim.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Claim:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Claim:organization").toLocked(); + /** + * Search parameter: priority + *

+ * Description: Processing priority requested
+ * Type: token
+ * Path: Claim.priority
+ *

+ */ @SearchParamDefinition(name="priority", path="Claim.priority", description="Processing priority requested", type="token" ) public static final String SP_PRIORITY = "priority"; + /** + * Fluent Client search parameter constant for priority + *

+ * Description: Processing priority requested
+ * Type: token
+ * Path: Claim.priority
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRIORITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRIORITY); + + /** + * Search parameter: facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: Claim.facility
+ *

+ */ @SearchParamDefinition(name="facility", path="Claim.facility", description="Facility responsible for the goods and services", type="reference" ) public static final String SP_FACILITY = "facility"; + /** + * Fluent Client search parameter constant for facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: Claim.facility
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FACILITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FACILITY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Claim:facility". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_FACILITY = new ca.uhn.fhir.model.api.Include("Claim:facility").toLocked(); + /** + * Search parameter: target + *

+ * Description: The target payor/insurer for the Claim
+ * Type: reference
+ * Path: Claim.target
+ *

+ */ @SearchParamDefinition(name="target", path="Claim.target", description="The target payor/insurer for the Claim", type="reference" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: The target payor/insurer for the Claim
+ * Type: reference
+ * Path: Claim.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Claim:target". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java index c9329deef2f..0f990338904 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -5080,32 +5080,158 @@ public class ClaimResponse extends DomainResource { return ResourceType.ClaimResponse; } + /** + * Search parameter: identifier + *

+ * Description: The identity of the insurer
+ * Type: token
+ * Path: ClaimResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ClaimResponse.identifier", description="The identity of the insurer", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identity of the insurer
+ * Type: token
+ * Path: ClaimResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: The claim reference
+ * Type: reference
+ * Path: ClaimResponse.request
+ *

+ */ @SearchParamDefinition(name="request", path="ClaimResponse.request", description="The claim reference", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The claim reference
+ * Type: reference
+ * Path: ClaimResponse.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClaimResponse:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("ClaimResponse:request").toLocked(); + /** + * Search parameter: disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: ClaimResponse.disposition
+ *

+ */ @SearchParamDefinition(name="disposition", path="ClaimResponse.disposition", description="The contents of the disposition message", type="string" ) public static final String SP_DISPOSITION = "disposition"; + /** + * Fluent Client search parameter constant for disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: ClaimResponse.disposition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION); + + /** + * Search parameter: paymentdate + *

+ * Description: The expected paymentDate
+ * Type: date
+ * Path: ClaimResponse.paymentDate
+ *

+ */ @SearchParamDefinition(name="paymentdate", path="ClaimResponse.paymentDate", description="The expected paymentDate", type="date" ) public static final String SP_PAYMENTDATE = "paymentdate"; + /** + * Fluent Client search parameter constant for paymentdate + *

+ * Description: The expected paymentDate
+ * Type: date
+ * Path: ClaimResponse.paymentDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam PAYMENTDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PAYMENTDATE); + + /** + * Search parameter: created + *

+ * Description: The creation date
+ * Type: date
+ * Path: ClaimResponse.created
+ *

+ */ @SearchParamDefinition(name="created", path="ClaimResponse.created", description="The creation date", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date
+ * Type: date
+ * Path: ClaimResponse.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: ClaimResponse.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="ClaimResponse.organization", description="The organization who generated this resource", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: ClaimResponse.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClaimResponse:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("ClaimResponse:organization").toLocked(); + /** + * Search parameter: outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: ClaimResponse.outcome
+ *

+ */ @SearchParamDefinition(name="outcome", path="ClaimResponse.outcome", description="The processing outcome", type="token" ) public static final String SP_OUTCOME = "outcome"; + /** + * Fluent Client search parameter constant for outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: ClaimResponse.outcome
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam OUTCOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OUTCOME); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java index 352f2102c13..e782588c5fd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1853,82 +1853,334 @@ public class ClinicalImpression extends DomainResource { return ResourceType.ClinicalImpression; } + /** + * Search parameter: date + *

+ * Description: When the assessment occurred
+ * Type: date
+ * Path: ClinicalImpression.date
+ *

+ */ @SearchParamDefinition(name="date", path="ClinicalImpression.date", description="When the assessment occurred", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the assessment occurred
+ * Type: date
+ * Path: ClinicalImpression.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: previous + *

+ * Description: Reference to last assessment
+ * Type: reference
+ * Path: ClinicalImpression.previous
+ *

+ */ @SearchParamDefinition(name="previous", path="ClinicalImpression.previous", description="Reference to last assessment", type="reference" ) public static final String SP_PREVIOUS = "previous"; + /** + * Fluent Client search parameter constant for previous + *

+ * Description: Reference to last assessment
+ * Type: reference
+ * Path: ClinicalImpression.previous
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PREVIOUS = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PREVIOUS); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:previous". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PREVIOUS = new ca.uhn.fhir.model.api.Include("ClinicalImpression:previous").toLocked(); + /** + * Search parameter: assessor + *

+ * Description: The clinician performing the assessment
+ * Type: reference
+ * Path: ClinicalImpression.assessor
+ *

+ */ @SearchParamDefinition(name="assessor", path="ClinicalImpression.assessor", description="The clinician performing the assessment", type="reference" ) public static final String SP_ASSESSOR = "assessor"; + /** + * Fluent Client search parameter constant for assessor + *

+ * Description: The clinician performing the assessment
+ * Type: reference
+ * Path: ClinicalImpression.assessor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ASSESSOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ASSESSOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:assessor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ASSESSOR = new ca.uhn.fhir.model.api.Include("ClinicalImpression:assessor").toLocked(); + /** + * Search parameter: trigger + *

+ * Description: Request or event that necessitated this assessment
+ * Type: reference
+ * Path: ClinicalImpression.triggerReference
+ *

+ */ @SearchParamDefinition(name="trigger", path="ClinicalImpression.triggerReference", description="Request or event that necessitated this assessment", type="reference" ) public static final String SP_TRIGGER = "trigger"; + /** + * Fluent Client search parameter constant for trigger + *

+ * Description: Request or event that necessitated this assessment
+ * Type: reference
+ * Path: ClinicalImpression.triggerReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TRIGGER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TRIGGER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:trigger". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_TRIGGER = new ca.uhn.fhir.model.api.Include("ClinicalImpression:trigger").toLocked(); + /** + * Search parameter: finding + *

+ * Description: Specific text or code for finding
+ * Type: token
+ * Path: ClinicalImpression.finding.item
+ *

+ */ @SearchParamDefinition(name="finding", path="ClinicalImpression.finding.item", description="Specific text or code for finding", type="token" ) public static final String SP_FINDING = "finding"; + /** + * Fluent Client search parameter constant for finding + *

+ * Description: Specific text or code for finding
+ * Type: token
+ * Path: ClinicalImpression.finding.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FINDING = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FINDING); + + /** + * Search parameter: ruledout + *

+ * Description: Specific text of code for diagnosis
+ * Type: token
+ * Path: ClinicalImpression.ruledOut.item
+ *

+ */ @SearchParamDefinition(name="ruledout", path="ClinicalImpression.ruledOut.item", description="Specific text of code for diagnosis", type="token" ) public static final String SP_RULEDOUT = "ruledout"; + /** + * Fluent Client search parameter constant for ruledout + *

+ * Description: Specific text of code for diagnosis
+ * Type: token
+ * Path: ClinicalImpression.ruledOut.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RULEDOUT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RULEDOUT); + + /** + * Search parameter: problem + *

+ * Description: General assessment of patient state
+ * Type: reference
+ * Path: ClinicalImpression.problem
+ *

+ */ @SearchParamDefinition(name="problem", path="ClinicalImpression.problem", description="General assessment of patient state", type="reference" ) public static final String SP_PROBLEM = "problem"; + /** + * Fluent Client search parameter constant for problem + *

+ * Description: General assessment of patient state
+ * Type: reference
+ * Path: ClinicalImpression.problem
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROBLEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROBLEM); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:problem". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROBLEM = new ca.uhn.fhir.model.api.Include("ClinicalImpression:problem").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The patient being assessed
+ * Type: reference
+ * Path: ClinicalImpression.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ClinicalImpression.patient", description="The patient being assessed", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient being assessed
+ * Type: reference
+ * Path: ClinicalImpression.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ClinicalImpression:patient").toLocked(); + /** + * Search parameter: investigation + *

+ * Description: Record of a specific investigation
+ * Type: reference
+ * Path: ClinicalImpression.investigations.item
+ *

+ */ @SearchParamDefinition(name="investigation", path="ClinicalImpression.investigations.item", description="Record of a specific investigation", type="reference" ) public static final String SP_INVESTIGATION = "investigation"; + /** + * Fluent Client search parameter constant for investigation + *

+ * Description: Record of a specific investigation
+ * Type: reference
+ * Path: ClinicalImpression.investigations.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INVESTIGATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INVESTIGATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:investigation". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INVESTIGATION = new ca.uhn.fhir.model.api.Include("ClinicalImpression:investigation").toLocked(); + /** + * Search parameter: action + *

+ * Description: Actions taken during assessment
+ * Type: reference
+ * Path: ClinicalImpression.action
+ *

+ */ @SearchParamDefinition(name="action", path="ClinicalImpression.action", description="Actions taken during assessment", type="reference" ) public static final String SP_ACTION = "action"; + /** + * Fluent Client search parameter constant for action + *

+ * Description: Actions taken during assessment
+ * Type: reference
+ * Path: ClinicalImpression.action
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:action". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTION = new ca.uhn.fhir.model.api.Include("ClinicalImpression:action").toLocked(); + /** + * Search parameter: trigger-code + *

+ * Description: Request or event that necessitated this assessment
+ * Type: token
+ * Path: ClinicalImpression.triggerCodeableConcept
+ *

+ */ @SearchParamDefinition(name="trigger-code", path="ClinicalImpression.triggerCodeableConcept", description="Request or event that necessitated this assessment", type="token" ) public static final String SP_TRIGGER_CODE = "trigger-code"; + /** + * Fluent Client search parameter constant for trigger-code + *

+ * Description: Request or event that necessitated this assessment
+ * Type: token
+ * Path: ClinicalImpression.triggerCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TRIGGER_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TRIGGER_CODE); + + /** + * Search parameter: plan + *

+ * Description: Plan of action after assessment
+ * Type: reference
+ * Path: ClinicalImpression.plan
+ *

+ */ @SearchParamDefinition(name="plan", path="ClinicalImpression.plan", description="Plan of action after assessment", type="reference" ) public static final String SP_PLAN = "plan"; + /** + * Fluent Client search parameter constant for plan + *

+ * Description: Plan of action after assessment
+ * Type: reference
+ * Path: ClinicalImpression.plan
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PLAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PLAN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ClinicalImpression:plan". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PLAN = new ca.uhn.fhir.model.api.Include("ClinicalImpression:plan").toLocked(); + /** + * Search parameter: resolved + *

+ * Description: Diagnoses/conditions resolved since previous assessment
+ * Type: token
+ * Path: ClinicalImpression.resolved
+ *

+ */ @SearchParamDefinition(name="resolved", path="ClinicalImpression.resolved", description="Diagnoses/conditions resolved since previous assessment", type="token" ) public static final String SP_RESOLVED = "resolved"; + /** + * Fluent Client search parameter constant for resolved + *

+ * Description: Diagnoses/conditions resolved since previous assessment
+ * Type: token
+ * Path: ClinicalImpression.resolved
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOLVED = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOLVED); + + /** + * Search parameter: status + *

+ * Description: in-progress | completed | entered-in-error
+ * Type: token
+ * Path: ClinicalImpression.status
+ *

+ */ @SearchParamDefinition(name="status", path="ClinicalImpression.status", description="in-progress | completed | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: in-progress | completed | entered-in-error
+ * Type: token
+ * Path: ClinicalImpression.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java index 22c07faba9c..07e752d3429 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java index 6786d713ae1..6bfcfc4e47c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java index eb762890441..996d0afadba 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1197,66 +1197,282 @@ public class Communication extends DomainResource { return ResourceType.Communication; } + /** + * Search parameter: identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: Communication.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: Communication.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: CommunicationRequest producing this message
+ * Type: reference
+ * Path: Communication.requestDetail
+ *

+ */ @SearchParamDefinition(name="request", path="Communication.requestDetail", description="CommunicationRequest producing this message", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: CommunicationRequest producing this message
+ * Type: reference
+ * Path: Communication.requestDetail
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("Communication:request").toLocked(); + /** + * Search parameter: sender + *

+ * Description: Message sender
+ * Type: reference
+ * Path: Communication.sender
+ *

+ */ @SearchParamDefinition(name="sender", path="Communication.sender", description="Message sender", type="reference" ) public static final String SP_SENDER = "sender"; + /** + * Fluent Client search parameter constant for sender + *

+ * Description: Message sender
+ * Type: reference
+ * Path: Communication.sender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SENDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SENDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:sender". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SENDER = new ca.uhn.fhir.model.api.Include("Communication:sender").toLocked(); + /** + * Search parameter: subject + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: Communication.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Communication.subject", description="Focus of message", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: Communication.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Communication:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: Communication.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Communication.subject", description="Focus of message", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: Communication.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Communication:patient").toLocked(); + /** + * Search parameter: recipient + *

+ * Description: Message recipient
+ * Type: reference
+ * Path: Communication.recipient
+ *

+ */ @SearchParamDefinition(name="recipient", path="Communication.recipient", description="Message recipient", type="reference" ) public static final String SP_RECIPIENT = "recipient"; + /** + * Fluent Client search parameter constant for recipient + *

+ * Description: Message recipient
+ * Type: reference
+ * Path: Communication.recipient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:recipient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("Communication:recipient").toLocked(); + /** + * Search parameter: received + *

+ * Description: When received
+ * Type: date
+ * Path: Communication.received
+ *

+ */ @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date" ) public static final String SP_RECEIVED = "received"; + /** + * Fluent Client search parameter constant for received + *

+ * Description: When received
+ * Type: date
+ * Path: Communication.received
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam RECEIVED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_RECEIVED); + + /** + * Search parameter: medium + *

+ * Description: A channel of communication
+ * Type: token
+ * Path: Communication.medium
+ *

+ */ @SearchParamDefinition(name="medium", path="Communication.medium", description="A channel of communication", type="token" ) public static final String SP_MEDIUM = "medium"; + /** + * Fluent Client search parameter constant for medium + *

+ * Description: A channel of communication
+ * Type: token
+ * Path: Communication.medium
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam MEDIUM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MEDIUM); + + /** + * Search parameter: encounter + *

+ * Description: Encounter leading to message
+ * Type: reference
+ * Path: Communication.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Communication.encounter", description="Encounter leading to message", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Encounter leading to message
+ * Type: reference
+ * Path: Communication.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Communication:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Communication:encounter").toLocked(); + /** + * Search parameter: category + *

+ * Description: Message category
+ * Type: token
+ * Path: Communication.category
+ *

+ */ @SearchParamDefinition(name="category", path="Communication.category", description="Message category", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: Message category
+ * Type: token
+ * Path: Communication.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: sent + *

+ * Description: When sent
+ * Type: date
+ * Path: Communication.sent
+ *

+ */ @SearchParamDefinition(name="sent", path="Communication.sent", description="When sent", type="date" ) public static final String SP_SENT = "sent"; + /** + * Fluent Client search parameter constant for sent + *

+ * Description: When sent
+ * Type: date
+ * Path: Communication.sent
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam SENT = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_SENT); + + /** + * Search parameter: status + *

+ * Description: in-progress | completed | suspended | rejected | failed
+ * Type: token
+ * Path: Communication.status
+ *

+ */ @SearchParamDefinition(name="status", path="Communication.status", description="in-progress | completed | suspended | rejected | failed", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: in-progress | completed | suspended | rejected | failed
+ * Type: token
+ * Path: Communication.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java index 00c246070d2..f96c0c37cff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1311,68 +1311,302 @@ public class CommunicationRequest extends DomainResource { return ResourceType.CommunicationRequest; } + /** + * Search parameter: requester + *

+ * Description: An individual who requested a communication
+ * Type: reference
+ * Path: CommunicationRequest.requester
+ *

+ */ @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="An individual who requested a communication", type="reference" ) public static final String SP_REQUESTER = "requester"; + /** + * Fluent Client search parameter constant for requester + *

+ * Description: An individual who requested a communication
+ * Type: reference
+ * Path: CommunicationRequest.requester
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:requester". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:requester").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: CommunicationRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: CommunicationRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: subject + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: CommunicationRequest.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: CommunicationRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:subject").toLocked(); + /** + * Search parameter: medium + *

+ * Description: A channel of communication
+ * Type: token
+ * Path: CommunicationRequest.medium
+ *

+ */ @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="A channel of communication", type="token" ) public static final String SP_MEDIUM = "medium"; + /** + * Fluent Client search parameter constant for medium + *

+ * Description: A channel of communication
+ * Type: token
+ * Path: CommunicationRequest.medium
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam MEDIUM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MEDIUM); + + /** + * Search parameter: encounter + *

+ * Description: Encounter leading to message
+ * Type: reference
+ * Path: CommunicationRequest.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="CommunicationRequest.encounter", description="Encounter leading to message", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Encounter leading to message
+ * Type: reference
+ * Path: CommunicationRequest.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:encounter").toLocked(); + /** + * Search parameter: priority + *

+ * Description: Message urgency
+ * Type: token
+ * Path: CommunicationRequest.priority
+ *

+ */ @SearchParamDefinition(name="priority", path="CommunicationRequest.priority", description="Message urgency", type="token" ) public static final String SP_PRIORITY = "priority"; + /** + * Fluent Client search parameter constant for priority + *

+ * Description: Message urgency
+ * Type: token
+ * Path: CommunicationRequest.priority
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRIORITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRIORITY); + + /** + * Search parameter: requested + *

+ * Description: When ordered or proposed
+ * Type: date
+ * Path: CommunicationRequest.requestedOn
+ *

+ */ @SearchParamDefinition(name="requested", path="CommunicationRequest.requestedOn", description="When ordered or proposed", type="date" ) public static final String SP_REQUESTED = "requested"; + /** + * Fluent Client search parameter constant for requested + *

+ * Description: When ordered or proposed
+ * Type: date
+ * Path: CommunicationRequest.requestedOn
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam REQUESTED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_REQUESTED); + + /** + * Search parameter: sender + *

+ * Description: Message sender
+ * Type: reference
+ * Path: CommunicationRequest.sender
+ *

+ */ @SearchParamDefinition(name="sender", path="CommunicationRequest.sender", description="Message sender", type="reference" ) public static final String SP_SENDER = "sender"; + /** + * Fluent Client search parameter constant for sender + *

+ * Description: Message sender
+ * Type: reference
+ * Path: CommunicationRequest.sender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SENDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SENDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:sender". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SENDER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:sender").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: CommunicationRequest.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="CommunicationRequest.subject", description="Focus of message", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Focus of message
+ * Type: reference
+ * Path: CommunicationRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:patient").toLocked(); + /** + * Search parameter: recipient + *

+ * Description: Message recipient
+ * Type: reference
+ * Path: CommunicationRequest.recipient
+ *

+ */ @SearchParamDefinition(name="recipient", path="CommunicationRequest.recipient", description="Message recipient", type="reference" ) public static final String SP_RECIPIENT = "recipient"; + /** + * Fluent Client search parameter constant for recipient + *

+ * Description: Message recipient
+ * Type: reference
+ * Path: CommunicationRequest.recipient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "CommunicationRequest:recipient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:recipient").toLocked(); + /** + * Search parameter: time + *

+ * Description: When scheduled
+ * Type: date
+ * Path: CommunicationRequest.scheduledDateTime
+ *

+ */ @SearchParamDefinition(name="time", path="CommunicationRequest.scheduledDateTime", description="When scheduled", type="date" ) public static final String SP_TIME = "time"; + /** + * Fluent Client search parameter constant for time + *

+ * Description: When scheduled
+ * Type: date
+ * Path: CommunicationRequest.scheduledDateTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam TIME = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_TIME); + + /** + * Search parameter: category + *

+ * Description: Message category
+ * Type: token
+ * Path: CommunicationRequest.category
+ *

+ */ @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: Message category
+ * Type: token
+ * Path: CommunicationRequest.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: status + *

+ * Description: proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed
+ * Type: token
+ * Path: CommunicationRequest.status
+ *

+ */ @SearchParamDefinition(name="status", path="CommunicationRequest.status", description="proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed
+ * Type: token
+ * Path: CommunicationRequest.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java index 8cb8139507f..ebaefdfb496 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2143,74 +2143,362 @@ public class Composition extends DomainResource { return ResourceType.Composition; } + /** + * Search parameter: date + *

+ * Description: Composition editing time
+ * Type: date
+ * Path: Composition.date
+ *

+ */ @SearchParamDefinition(name="date", path="Composition.date", description="Composition editing time", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Composition editing time
+ * Type: date
+ * Path: Composition.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Logical identifier of composition (version-independent)
+ * Type: token
+ * Path: Composition.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Composition.identifier", description="Logical identifier of composition (version-independent)", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Logical identifier of composition (version-independent)
+ * Type: token
+ * Path: Composition.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: period + *

+ * Description: The period covered by the documentation
+ * Type: date
+ * Path: Composition.event.period
+ *

+ */ @SearchParamDefinition(name="period", path="Composition.event.period", description="The period covered by the documentation", type="date" ) public static final String SP_PERIOD = "period"; + /** + * Fluent Client search parameter constant for period + *

+ * Description: The period covered by the documentation
+ * Type: date
+ * Path: Composition.event.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD); + + /** + * Search parameter: subject + *

+ * Description: Who and/or what the composition is about
+ * Type: reference
+ * Path: Composition.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Composition.subject", description="Who and/or what the composition is about", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who and/or what the composition is about
+ * Type: reference
+ * Path: Composition.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Composition:subject").toLocked(); + /** + * Search parameter: author + *

+ * Description: Who and/or what authored the composition
+ * Type: reference
+ * Path: Composition.author
+ *

+ */ @SearchParamDefinition(name="author", path="Composition.author", description="Who and/or what authored the composition", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Who and/or what authored the composition
+ * Type: reference
+ * Path: Composition.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("Composition:author").toLocked(); + /** + * Search parameter: confidentiality + *

+ * Description: As defined by affinity domain
+ * Type: token
+ * Path: Composition.confidentiality
+ *

+ */ @SearchParamDefinition(name="confidentiality", path="Composition.confidentiality", description="As defined by affinity domain", type="token" ) public static final String SP_CONFIDENTIALITY = "confidentiality"; + /** + * Fluent Client search parameter constant for confidentiality + *

+ * Description: As defined by affinity domain
+ * Type: token
+ * Path: Composition.confidentiality
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONFIDENTIALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONFIDENTIALITY); + + /** + * Search parameter: section + *

+ * Description: Classification of section (recommended)
+ * Type: token
+ * Path: Composition.section.code
+ *

+ */ @SearchParamDefinition(name="section", path="Composition.section.code", description="Classification of section (recommended)", type="token" ) public static final String SP_SECTION = "section"; + /** + * Fluent Client search parameter constant for section + *

+ * Description: Classification of section (recommended)
+ * Type: token
+ * Path: Composition.section.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECTION); + + /** + * Search parameter: encounter + *

+ * Description: Context of the Composition
+ * Type: reference
+ * Path: Composition.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Composition.encounter", description="Context of the Composition", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Context of the Composition
+ * Type: reference
+ * Path: Composition.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Composition:encounter").toLocked(); + /** + * Search parameter: type + *

+ * Description: Kind of composition (LOINC if possible)
+ * Type: token
+ * Path: Composition.type
+ *

+ */ @SearchParamDefinition(name="type", path="Composition.type", description="Kind of composition (LOINC if possible)", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Kind of composition (LOINC if possible)
+ * Type: token
+ * Path: Composition.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: title + *

+ * Description: Human Readable name/title
+ * Type: string
+ * Path: Composition.title
+ *

+ */ @SearchParamDefinition(name="title", path="Composition.title", description="Human Readable name/title", type="string" ) public static final String SP_TITLE = "title"; + /** + * Fluent Client search parameter constant for title + *

+ * Description: Human Readable name/title
+ * Type: string
+ * Path: Composition.title
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE); + + /** + * Search parameter: attester + *

+ * Description: Who attested the composition
+ * Type: reference
+ * Path: Composition.attester.party
+ *

+ */ @SearchParamDefinition(name="attester", path="Composition.attester.party", description="Who attested the composition", type="reference" ) public static final String SP_ATTESTER = "attester"; + /** + * Fluent Client search parameter constant for attester + *

+ * Description: Who attested the composition
+ * Type: reference
+ * Path: Composition.attester.party
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ATTESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ATTESTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:attester". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ATTESTER = new ca.uhn.fhir.model.api.Include("Composition:attester").toLocked(); + /** + * Search parameter: entry + *

+ * Description: A reference to data that supports this section
+ * Type: reference
+ * Path: Composition.section.entry
+ *

+ */ @SearchParamDefinition(name="entry", path="Composition.section.entry", description="A reference to data that supports this section", type="reference" ) public static final String SP_ENTRY = "entry"; + /** + * Fluent Client search parameter constant for entry + *

+ * Description: A reference to data that supports this section
+ * Type: reference
+ * Path: Composition.section.entry
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENTRY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENTRY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:entry". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENTRY = new ca.uhn.fhir.model.api.Include("Composition:entry").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Who and/or what the composition is about
+ * Type: reference
+ * Path: Composition.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Composition.subject", description="Who and/or what the composition is about", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who and/or what the composition is about
+ * Type: reference
+ * Path: Composition.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Composition:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Composition:patient").toLocked(); + /** + * Search parameter: context + *

+ * Description: Code(s) that apply to the event being documented
+ * Type: token
+ * Path: Composition.event.code
+ *

+ */ @SearchParamDefinition(name="context", path="Composition.event.code", description="Code(s) that apply to the event being documented", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: Code(s) that apply to the event being documented
+ * Type: token
+ * Path: Composition.event.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: class + *

+ * Description: Categorization of Composition
+ * Type: token
+ * Path: Composition.class
+ *

+ */ @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token" ) public static final String SP_CLASS = "class"; + /** + * Fluent Client search parameter constant for class + *

+ * Description: Categorization of Composition
+ * Type: token
+ * Path: Composition.class
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLASS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLASS); + + /** + * Search parameter: status + *

+ * Description: preliminary | final | amended | entered-in-error
+ * Type: token
+ * Path: Composition.status
+ *

+ */ @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: preliminary | final | amended | entered-in-error
+ * Type: token
+ * Path: Composition.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java index fd8f95691fa..a64bc0200d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2236,60 +2236,384 @@ public class ConceptMap extends DomainResource { return ResourceType.ConceptMap; } + /** + * Search parameter: date + *

+ * Description: The concept map publication date
+ * Type: date
+ * Path: ConceptMap.date
+ *

+ */ @SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The concept map publication date
+ * Type: date
+ * Path: ConceptMap.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Additional identifier for the concept map
+ * Type: token
+ * Path: ConceptMap.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="Additional identifier for the concept map", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Additional identifier for the concept map
+ * Type: token
+ * Path: ConceptMap.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: product + *

+ * Description: Reference to element/field/ValueSet mapping depends on
+ * Type: uri
+ * Path: ConceptMap.element.target.product.element
+ *

+ */ @SearchParamDefinition(name="product", path="ConceptMap.element.target.product.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" ) public static final String SP_PRODUCT = "product"; + /** + * Fluent Client search parameter constant for product + *

+ * Description: Reference to element/field/ValueSet mapping depends on
+ * Type: uri
+ * Path: ConceptMap.element.target.product.element
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam PRODUCT = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_PRODUCT); + + /** + * Search parameter: dependson + *

+ * Description: Reference to element/field/ValueSet mapping depends on
+ * Type: uri
+ * Path: ConceptMap.element.target.dependsOn.element
+ *

+ */ @SearchParamDefinition(name="dependson", path="ConceptMap.element.target.dependsOn.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" ) public static final String SP_DEPENDSON = "dependson"; + /** + * Fluent Client search parameter constant for dependson + *

+ * Description: Reference to element/field/ValueSet mapping depends on
+ * Type: uri
+ * Path: ConceptMap.element.target.dependsOn.element
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam DEPENDSON = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DEPENDSON); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the concept map
+ * Type: string
+ * Path: ConceptMap.description
+ *

+ */ @SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the concept map
+ * Type: string
+ * Path: ConceptMap.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: targetsystem + *

+ * Description: System of the target (if necessary)
+ * Type: uri
+ * Path: ConceptMap.element.target.codeSystem
+ *

+ */ @SearchParamDefinition(name="targetsystem", path="ConceptMap.element.target.codeSystem", description="System of the target (if necessary)", type="uri" ) public static final String SP_TARGETSYSTEM = "targetsystem"; + /** + * Fluent Client search parameter constant for targetsystem + *

+ * Description: System of the target (if necessary)
+ * Type: uri
+ * Path: ConceptMap.element.target.codeSystem
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam TARGETSYSTEM = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_TARGETSYSTEM); + + /** + * Search parameter: source + *

+ * Description: Identifies the source of the concepts which are being mapped
+ * Type: reference
+ * Path: ConceptMap.sourceReference
+ *

+ */ @SearchParamDefinition(name="source", path="ConceptMap.sourceReference", description="Identifies the source of the concepts which are being mapped", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Identifies the source of the concepts which are being mapped
+ * Type: reference
+ * Path: ConceptMap.sourceReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ConceptMap:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("ConceptMap:source").toLocked(); + /** + * Search parameter: version + *

+ * Description: The version identifier of the concept map
+ * Type: token
+ * Path: ConceptMap.version
+ *

+ */ @SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the concept map
+ * Type: token
+ * Path: ConceptMap.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: sourcesystem + *

+ * Description: Code System (if value set crosses code systems)
+ * Type: uri
+ * Path: ConceptMap.element.codeSystem
+ *

+ */ @SearchParamDefinition(name="sourcesystem", path="ConceptMap.element.codeSystem", description="Code System (if value set crosses code systems)", type="uri" ) public static final String SP_SOURCESYSTEM = "sourcesystem"; + /** + * Fluent Client search parameter constant for sourcesystem + *

+ * Description: Code System (if value set crosses code systems)
+ * Type: uri
+ * Path: ConceptMap.element.codeSystem
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SOURCESYSTEM = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SOURCESYSTEM); + + /** + * Search parameter: url + *

+ * Description: The URL of the concept map
+ * Type: uri
+ * Path: ConceptMap.url
+ *

+ */ @SearchParamDefinition(name="url", path="ConceptMap.url", description="The URL of the concept map", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The URL of the concept map
+ * Type: uri
+ * Path: ConceptMap.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: target + *

+ * Description: Provides context to the mappings
+ * Type: reference
+ * Path: ConceptMap.target[x]
+ *

+ */ @SearchParamDefinition(name="target", path="ConceptMap.target[x]", description="Provides context to the mappings", type="reference" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: Provides context to the mappings
+ * Type: reference
+ * Path: ConceptMap.target[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ConceptMap:target". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("ConceptMap:target").toLocked(); + /** + * Search parameter: sourcecode + *

+ * Description: Identifies element being mapped
+ * Type: token
+ * Path: ConceptMap.element.code
+ *

+ */ @SearchParamDefinition(name="sourcecode", path="ConceptMap.element.code", description="Identifies element being mapped", type="token" ) public static final String SP_SOURCECODE = "sourcecode"; + /** + * Fluent Client search parameter constant for sourcecode + *

+ * Description: Identifies element being mapped
+ * Type: token
+ * Path: ConceptMap.element.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SOURCECODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SOURCECODE); + + /** + * Search parameter: sourceuri + *

+ * Description: Identifies the source of the concepts which are being mapped
+ * Type: reference
+ * Path: ConceptMap.sourceUri
+ *

+ */ @SearchParamDefinition(name="sourceuri", path="ConceptMap.sourceUri", description="Identifies the source of the concepts which are being mapped", type="reference" ) public static final String SP_SOURCEURI = "sourceuri"; + /** + * Fluent Client search parameter constant for sourceuri + *

+ * Description: Identifies the source of the concepts which are being mapped
+ * Type: reference
+ * Path: ConceptMap.sourceUri
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCEURI = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCEURI); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ConceptMap:sourceuri". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCEURI = new ca.uhn.fhir.model.api.Include("ConceptMap:sourceuri").toLocked(); + /** + * Search parameter: name + *

+ * Description: Name of the concept map
+ * Type: string
+ * Path: ConceptMap.name
+ *

+ */ @SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Name of the concept map
+ * Type: string
+ * Path: ConceptMap.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the concept map
+ * Type: token
+ * Path: ConceptMap.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="ConceptMap.useContext", description="A use context assigned to the concept map", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the concept map
+ * Type: token
+ * Path: ConceptMap.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the concept map
+ * Type: string
+ * Path: ConceptMap.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the concept map
+ * Type: string
+ * Path: ConceptMap.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: targetcode + *

+ * Description: Code that identifies the target element
+ * Type: token
+ * Path: ConceptMap.element.target.code
+ *

+ */ @SearchParamDefinition(name="targetcode", path="ConceptMap.element.target.code", description="Code that identifies the target element", type="token" ) public static final String SP_TARGETCODE = "targetcode"; + /** + * Fluent Client search parameter constant for targetcode + *

+ * Description: Code that identifies the target element
+ * Type: token
+ * Path: ConceptMap.element.target.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TARGETCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TARGETCODE); + + /** + * Search parameter: status + *

+ * Description: Status of the concept map
+ * Type: token
+ * Path: ConceptMap.status
+ *

+ */ @SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Status of the concept map
+ * Type: token
+ * Path: ConceptMap.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java index deea2861f54..26c4e211614 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1655,52 +1655,304 @@ public class Condition extends DomainResource { return ResourceType.Condition; } + /** + * Search parameter: severity + *

+ * Description: The severity of the condition
+ * Type: token
+ * Path: Condition.severity
+ *

+ */ @SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token" ) public static final String SP_SEVERITY = "severity"; + /** + * Fluent Client search parameter constant for severity + *

+ * Description: The severity of the condition
+ * Type: token
+ * Path: Condition.severity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY); + + /** + * Search parameter: identifier + *

+ * Description: A unique identifier of the condition record
+ * Type: token
+ * Path: Condition.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Condition.identifier", description="A unique identifier of the condition record", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A unique identifier of the condition record
+ * Type: token
+ * Path: Condition.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: clinicalstatus + *

+ * Description: The clinical status of the condition
+ * Type: token
+ * Path: Condition.clinicalStatus
+ *

+ */ @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token" ) public static final String SP_CLINICALSTATUS = "clinicalstatus"; + /** + * Fluent Client search parameter constant for clinicalstatus + *

+ * Description: The clinical status of the condition
+ * Type: token
+ * Path: Condition.clinicalStatus
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLINICALSTATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLINICALSTATUS); + + /** + * Search parameter: onset-info + *

+ * Description: Other onsets (boolean, age, range, string)
+ * Type: string
+ * Path: Condition.onset[x]
+ *

+ */ @SearchParamDefinition(name="onset-info", path="Condition.onset[x]", description="Other onsets (boolean, age, range, string)", type="string" ) public static final String SP_ONSET_INFO = "onset-info"; + /** + * Fluent Client search parameter constant for onset-info + *

+ * Description: Other onsets (boolean, age, range, string)
+ * Type: string
+ * Path: Condition.onset[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ONSET_INFO = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ONSET_INFO); + + /** + * Search parameter: code + *

+ * Description: Code for the condition
+ * Type: token
+ * Path: Condition.code
+ *

+ */ @SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Code for the condition
+ * Type: token
+ * Path: Condition.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: evidence + *

+ * Description: Manifestation/symptom
+ * Type: token
+ * Path: Condition.evidence.code
+ *

+ */ @SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="Manifestation/symptom", type="token" ) public static final String SP_EVIDENCE = "evidence"; + /** + * Fluent Client search parameter constant for evidence + *

+ * Description: Manifestation/symptom
+ * Type: token
+ * Path: Condition.evidence.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVIDENCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVIDENCE); + + /** + * Search parameter: encounter + *

+ * Description: Encounter when condition first asserted
+ * Type: reference
+ * Path: Condition.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Condition.encounter", description="Encounter when condition first asserted", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Encounter when condition first asserted
+ * Type: reference
+ * Path: Condition.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Condition:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Condition:encounter").toLocked(); + /** + * Search parameter: onset + *

+ * Description: Date related onsets (dateTime and Period)
+ * Type: date
+ * Path: Condition.onset[x]
+ *

+ */ @SearchParamDefinition(name="onset", path="Condition.onset[x]", description="Date related onsets (dateTime and Period)", type="date" ) public static final String SP_ONSET = "onset"; + /** + * Fluent Client search parameter constant for onset + *

+ * Description: Date related onsets (dateTime and Period)
+ * Type: date
+ * Path: Condition.onset[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam ONSET = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ONSET); + + /** + * Search parameter: asserter + *

+ * Description: Person who asserts this condition
+ * Type: reference
+ * Path: Condition.asserter
+ *

+ */ @SearchParamDefinition(name="asserter", path="Condition.asserter", description="Person who asserts this condition", type="reference" ) public static final String SP_ASSERTER = "asserter"; + /** + * Fluent Client search parameter constant for asserter + *

+ * Description: Person who asserts this condition
+ * Type: reference
+ * Path: Condition.asserter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ASSERTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ASSERTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Condition:asserter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ASSERTER = new ca.uhn.fhir.model.api.Include("Condition:asserter").toLocked(); + /** + * Search parameter: date-recorded + *

+ * Description: A date, when the Condition statement was documented
+ * Type: date
+ * Path: Condition.dateRecorded
+ *

+ */ @SearchParamDefinition(name="date-recorded", path="Condition.dateRecorded", description="A date, when the Condition statement was documented", type="date" ) public static final String SP_DATE_RECORDED = "date-recorded"; + /** + * Fluent Client search parameter constant for date-recorded + *

+ * Description: A date, when the Condition statement was documented
+ * Type: date
+ * Path: Condition.dateRecorded
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE_RECORDED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE_RECORDED); + + /** + * Search parameter: stage + *

+ * Description: Simple summary (disease specific)
+ * Type: token
+ * Path: Condition.stage.summary
+ *

+ */ @SearchParamDefinition(name="stage", path="Condition.stage.summary", description="Simple summary (disease specific)", type="token" ) public static final String SP_STAGE = "stage"; + /** + * Fluent Client search parameter constant for stage + *

+ * Description: Simple summary (disease specific)
+ * Type: token
+ * Path: Condition.stage.summary
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STAGE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STAGE); + + /** + * Search parameter: patient + *

+ * Description: Who has the condition?
+ * Type: reference
+ * Path: Condition.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="Condition.patient", description="Who has the condition?", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who has the condition?
+ * Type: reference
+ * Path: Condition.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Condition:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Condition:patient").toLocked(); + /** + * Search parameter: category + *

+ * Description: The category of the condition
+ * Type: token
+ * Path: Condition.category
+ *

+ */ @SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: The category of the condition
+ * Type: token
+ * Path: Condition.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: body-site + *

+ * Description: Anatomical location, if relevant
+ * Type: token
+ * Path: Condition.bodySite
+ *

+ */ @SearchParamDefinition(name="body-site", path="Condition.bodySite", description="Anatomical location, if relevant", type="token" ) public static final String SP_BODY_SITE = "body-site"; + /** + * Fluent Client search parameter constant for body-site + *

+ * Description: Anatomical location, if relevant
+ * Type: token
+ * Path: Condition.bodySite
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODY_SITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODY_SITE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java index f494847bb8c..547b40673e8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -7776,50 +7776,338 @@ public class Conformance extends DomainResource implements IBaseConformance { return ResourceType.Conformance; } + /** + * Search parameter: date + *

+ * Description: The conformance statement publication date
+ * Type: date
+ * Path: Conformance.date
+ *

+ */ @SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The conformance statement publication date
+ * Type: date
+ * Path: Conformance.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: software + *

+ * Description: Part of a the name of a software application
+ * Type: string
+ * Path: Conformance.software.name
+ *

+ */ @SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application", type="string" ) public static final String SP_SOFTWARE = "software"; + /** + * Fluent Client search parameter constant for software + *

+ * Description: Part of a the name of a software application
+ * Type: string
+ * Path: Conformance.software.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam SOFTWARE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_SOFTWARE); + + /** + * Search parameter: resource + *

+ * Description: Name of a resource mentioned in a conformance statement
+ * Type: token
+ * Path: Conformance.rest.resource.type
+ *

+ */ @SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement", type="token" ) public static final String SP_RESOURCE = "resource"; + /** + * Fluent Client search parameter constant for resource + *

+ * Description: Name of a resource mentioned in a conformance statement
+ * Type: token
+ * Path: Conformance.rest.resource.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE); + + /** + * Search parameter: profile + *

+ * Description: A profile id invoked in a conformance statement
+ * Type: reference
+ * Path: Conformance.rest.resource.profile
+ *

+ */ @SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference" ) public static final String SP_PROFILE = "profile"; + /** + * Fluent Client search parameter constant for profile + *

+ * Description: A profile id invoked in a conformance statement
+ * Type: reference
+ * Path: Conformance.rest.resource.profile
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROFILE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Conformance:profile". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROFILE = new ca.uhn.fhir.model.api.Include("Conformance:profile").toLocked(); + /** + * Search parameter: format + *

+ * Description: formats supported (xml | json | mime type)
+ * Type: token
+ * Path: Conformance.format
+ *

+ */ @SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | mime type)", type="token" ) public static final String SP_FORMAT = "format"; + /** + * Fluent Client search parameter constant for format + *

+ * Description: formats supported (xml | json | mime type)
+ * Type: token
+ * Path: Conformance.format
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the conformance statement
+ * Type: string
+ * Path: Conformance.description
+ *

+ */ @SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the conformance statement
+ * Type: string
+ * Path: Conformance.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: fhirversion + *

+ * Description: The version of FHIR
+ * Type: token
+ * Path: Conformance.version
+ *

+ */ @SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token" ) public static final String SP_FHIRVERSION = "fhirversion"; + /** + * Fluent Client search parameter constant for fhirversion + *

+ * Description: The version of FHIR
+ * Type: token
+ * Path: Conformance.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FHIRVERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FHIRVERSION); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the conformance statement
+ * Type: token
+ * Path: Conformance.version
+ *

+ */ @SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the conformance statement
+ * Type: token
+ * Path: Conformance.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: The uri that identifies the conformance statement
+ * Type: uri
+ * Path: Conformance.url
+ *

+ */ @SearchParamDefinition(name="url", path="Conformance.url", description="The uri that identifies the conformance statement", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The uri that identifies the conformance statement
+ * Type: uri
+ * Path: Conformance.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: supported-profile + *

+ * Description: Profiles for use cases supported
+ * Type: reference
+ * Path: Conformance.profile
+ *

+ */ @SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="Profiles for use cases supported", type="reference" ) public static final String SP_SUPPORTED_PROFILE = "supported-profile"; + /** + * Fluent Client search parameter constant for supported-profile + *

+ * Description: Profiles for use cases supported
+ * Type: reference
+ * Path: Conformance.profile
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPORTED_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPORTED_PROFILE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Conformance:supported-profile". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORTED_PROFILE = new ca.uhn.fhir.model.api.Include("Conformance:supported-profile").toLocked(); + /** + * Search parameter: mode + *

+ * Description: Mode - restful (server/client) or messaging (sender/receiver)
+ * Type: token
+ * Path: Conformance.rest.mode
+ *

+ */ @SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token" ) public static final String SP_MODE = "mode"; + /** + * Fluent Client search parameter constant for mode + *

+ * Description: Mode - restful (server/client) or messaging (sender/receiver)
+ * Type: token
+ * Path: Conformance.rest.mode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODE); + + /** + * Search parameter: security + *

+ * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
+ * Type: token
+ * Path: Conformance.rest.security.service
+ *

+ */ @SearchParamDefinition(name="security", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" ) public static final String SP_SECURITY = "security"; + /** + * Fluent Client search parameter constant for security + *

+ * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
+ * Type: token
+ * Path: Conformance.rest.security.service
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITY); + + /** + * Search parameter: name + *

+ * Description: Name of the conformance statement
+ * Type: string
+ * Path: Conformance.name
+ *

+ */ @SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Name of the conformance statement
+ * Type: string
+ * Path: Conformance.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the conformance statement
+ * Type: string
+ * Path: Conformance.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the conformance statement
+ * Type: string
+ * Path: Conformance.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: event + *

+ * Description: Event code in a conformance statement
+ * Type: token
+ * Path: Conformance.messaging.event.code
+ *

+ */ @SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token" ) public static final String SP_EVENT = "event"; + /** + * Fluent Client search parameter constant for event + *

+ * Description: Event code in a conformance statement
+ * Type: token
+ * Path: Conformance.messaging.event.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT); + + /** + * Search parameter: status + *

+ * Description: The current status of the conformance statement
+ * Type: token
+ * Path: Conformance.status
+ *

+ */ @SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the conformance statement
+ * Type: token
+ * Path: Conformance.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java index fb8161d144a..c5cedb52144 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java @@ -29,12 +29,12 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 public class Constants { public final static String VERSION = "1.2.0"; public final static String REVISION = "7464"; - public final static String DATE = "Sun Dec 20 20:55:40 EST 2015"; + public final static String DATE = "Mon Dec 21 19:58:53 EST 2015"; } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java index 87096e65fdd..0a133c4c7bf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java index 41aaed006f5..daa755858d0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -3947,34 +3947,124 @@ public class Contract extends DomainResource { return ResourceType.Contract; } + /** + * Search parameter: actor + *

+ * Description: Contract Actor Type
+ * Type: reference
+ * Path: Contract.actor.entity
+ *

+ */ @SearchParamDefinition(name="actor", path="Contract.actor.entity", description="Contract Actor Type", type="reference" ) public static final String SP_ACTOR = "actor"; + /** + * Fluent Client search parameter constant for actor + *

+ * Description: Contract Actor Type
+ * Type: reference
+ * Path: Contract.actor.entity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Contract:actor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Contract:actor").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: The identity of the contract
+ * Type: token
+ * Path: Contract.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Contract.identifier", description="The identity of the contract", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identity of the contract
+ * Type: token
+ * Path: Contract.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: subject + *

+ * Description: The identity of the target of the contract
+ * Type: reference
+ * Path: Contract.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Contract.subject", description="The identity of the target of the contract", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The identity of the target of the contract
+ * Type: reference
+ * Path: Contract.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Contract:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Contract:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The identity of the target of the contract (if a patient)
+ * Type: reference
+ * Path: Contract.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Contract.subject", description="The identity of the target of the contract (if a patient)", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of the target of the contract (if a patient)
+ * Type: reference
+ * Path: Contract.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Contract:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Contract:patient").toLocked(); + /** + * Search parameter: signer + *

+ * Description: Contract Signatory Party
+ * Type: reference
+ * Path: Contract.signer.party
+ *

+ */ @SearchParamDefinition(name="signer", path="Contract.signer.party", description="Contract Signatory Party", type="reference" ) public static final String SP_SIGNER = "signer"; + /** + * Fluent Client search parameter constant for signer + *

+ * Description: Contract Signatory Party
+ * Type: reference
+ * Path: Contract.signer.party
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SIGNER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SIGNER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Contract:signer". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java index 15e4c5b6d49..3af9df8deb4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java index ebcacd596d4..5171f2df300 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -898,36 +898,198 @@ public class Coverage extends DomainResource { return ResourceType.Coverage; } + /** + * Search parameter: identifier + *

+ * Description: The primary identifier of the insured
+ * Type: token
+ * Path: Coverage.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The primary identifier of the insured
+ * Type: token
+ * Path: Coverage.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: sequence + *

+ * Description: Sequence number
+ * Type: token
+ * Path: Coverage.sequence
+ *

+ */ @SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token" ) public static final String SP_SEQUENCE = "sequence"; + /** + * Fluent Client search parameter constant for sequence + *

+ * Description: Sequence number
+ * Type: token
+ * Path: Coverage.sequence
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEQUENCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEQUENCE); + + /** + * Search parameter: subscriber + *

+ * Description: Reference to the subscriber
+ * Type: reference
+ * Path: Coverage.subscriber
+ *

+ */ @SearchParamDefinition(name="subscriber", path="Coverage.subscriber", description="Reference to the subscriber", type="reference" ) public static final String SP_SUBSCRIBER = "subscriber"; + /** + * Fluent Client search parameter constant for subscriber + *

+ * Description: Reference to the subscriber
+ * Type: reference
+ * Path: Coverage.subscriber
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBSCRIBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBSCRIBER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Coverage:subscriber". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSCRIBER = new ca.uhn.fhir.model.api.Include("Coverage:subscriber").toLocked(); + /** + * Search parameter: subplan + *

+ * Description: Sub-plan identifier
+ * Type: token
+ * Path: Coverage.subPlan
+ *

+ */ @SearchParamDefinition(name="subplan", path="Coverage.subPlan", description="Sub-plan identifier", type="token" ) public static final String SP_SUBPLAN = "subplan"; + /** + * Fluent Client search parameter constant for subplan + *

+ * Description: Sub-plan identifier
+ * Type: token
+ * Path: Coverage.subPlan
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBPLAN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBPLAN); + + /** + * Search parameter: type + *

+ * Description: The kind of coverage
+ * Type: token
+ * Path: Coverage.type
+ *

+ */ @SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The kind of coverage
+ * Type: token
+ * Path: Coverage.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: plan + *

+ * Description: A plan or policy identifier
+ * Type: token
+ * Path: Coverage.plan
+ *

+ */ @SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token" ) public static final String SP_PLAN = "plan"; + /** + * Fluent Client search parameter constant for plan + *

+ * Description: A plan or policy identifier
+ * Type: token
+ * Path: Coverage.plan
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PLAN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PLAN); + + /** + * Search parameter: dependent + *

+ * Description: Dependent number
+ * Type: token
+ * Path: Coverage.dependent
+ *

+ */ @SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token" ) public static final String SP_DEPENDENT = "dependent"; + /** + * Fluent Client search parameter constant for dependent + *

+ * Description: Dependent number
+ * Type: token
+ * Path: Coverage.dependent
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam DEPENDENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DEPENDENT); + + /** + * Search parameter: issuer + *

+ * Description: The identity of the insurer
+ * Type: reference
+ * Path: Coverage.issuer
+ *

+ */ @SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer", type="reference" ) public static final String SP_ISSUER = "issuer"; + /** + * Fluent Client search parameter constant for issuer + *

+ * Description: The identity of the insurer
+ * Type: reference
+ * Path: Coverage.issuer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ISSUER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ISSUER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Coverage:issuer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ISSUER = new ca.uhn.fhir.model.api.Include("Coverage:issuer").toLocked(); + /** + * Search parameter: group + *

+ * Description: Group identifier
+ * Type: token
+ * Path: Coverage.group
+ *

+ */ @SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token" ) public static final String SP_GROUP = "group"; + /** + * Fluent Client search parameter constant for group + *

+ * Description: Group identifier
+ * Type: token
+ * Path: Coverage.group
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GROUP = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GROUP); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java index f9b02aa14dc..bd914208c5d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1646,28 +1646,226 @@ public class DataElement extends DomainResource { return ResourceType.DataElement; } + /** + * Search parameter: date + *

+ * Description: The data element publication date
+ * Type: date
+ * Path: DataElement.date
+ *

+ */ @SearchParamDefinition(name="date", path="DataElement.date", description="The data element publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The data element publication date
+ * Type: date
+ * Path: DataElement.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: The identifier of the data element
+ * Type: token
+ * Path: DataElement.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DataElement.identifier", description="The identifier of the data element", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identifier of the data element
+ * Type: token
+ * Path: DataElement.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A code for the data element (server may choose to do subsumption)
+ * Type: token
+ * Path: DataElement.element.code
+ *

+ */ @SearchParamDefinition(name="code", path="DataElement.element.code", description="A code for the data element (server may choose to do subsumption)", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A code for the data element (server may choose to do subsumption)
+ * Type: token
+ * Path: DataElement.element.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: stringency + *

+ * Description: The stringency of the data element definition
+ * Type: token
+ * Path: DataElement.stringency
+ *

+ */ @SearchParamDefinition(name="stringency", path="DataElement.stringency", description="The stringency of the data element definition", type="token" ) public static final String SP_STRINGENCY = "stringency"; + /** + * Fluent Client search parameter constant for stringency + *

+ * Description: The stringency of the data element definition
+ * Type: token
+ * Path: DataElement.stringency
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STRINGENCY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STRINGENCY); + + /** + * Search parameter: name + *

+ * Description: Name of the data element
+ * Type: string
+ * Path: DataElement.name
+ *

+ */ @SearchParamDefinition(name="name", path="DataElement.name", description="Name of the data element", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Name of the data element
+ * Type: string
+ * Path: DataElement.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the data element
+ * Type: token
+ * Path: DataElement.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="DataElement.useContext", description="A use context assigned to the data element", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the data element
+ * Type: token
+ * Path: DataElement.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the data element
+ * Type: string
+ * Path: DataElement.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="DataElement.publisher", description="Name of the publisher of the data element", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the data element
+ * Type: string
+ * Path: DataElement.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the data element. This corresponds to the definition of the first DataElement.element.
+ * Type: string
+ * Path: DataElement.element.definition
+ *

+ */ @SearchParamDefinition(name="description", path="DataElement.element.definition", description="Text search in the description of the data element. This corresponds to the definition of the first DataElement.element.", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the data element. This corresponds to the definition of the first DataElement.element.
+ * Type: string
+ * Path: DataElement.element.definition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the data element
+ * Type: string
+ * Path: DataElement.version
+ *

+ */ @SearchParamDefinition(name="version", path="DataElement.version", description="The version identifier of the data element", type="string" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the data element
+ * Type: string
+ * Path: DataElement.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam VERSION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: The official URL for the data element
+ * Type: uri
+ * Path: DataElement.url
+ *

+ */ @SearchParamDefinition(name="url", path="DataElement.url", description="The official URL for the data element", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The official URL for the data element
+ * Type: uri
+ * Path: DataElement.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: status + *

+ * Description: The current status of the data element
+ * Type: token
+ * Path: DataElement.status
+ *

+ */ @SearchParamDefinition(name="status", path="DataElement.status", description="The current status of the data element", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the data element
+ * Type: token
+ * Path: DataElement.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java index b1b90c7a325..878883170ff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java index a86411d03bc..4cb67b07d09 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java index 206b68e5781..c15bc82ab0e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1050,36 +1050,144 @@ public class DetectedIssue extends DomainResource { return ResourceType.DetectedIssue; } + /** + * Search parameter: date + *

+ * Description: When identified
+ * Type: date
+ * Path: DetectedIssue.date
+ *

+ */ @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When identified
+ * Type: date
+ * Path: DetectedIssue.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Unique id for the detected issue
+ * Type: token
+ * Path: DetectedIssue.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DetectedIssue.identifier", description="Unique id for the detected issue", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique id for the detected issue
+ * Type: token
+ * Path: DetectedIssue.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: patient + *

+ * Description: Associated patient
+ * Type: reference
+ * Path: DetectedIssue.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="DetectedIssue.patient", description="Associated patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Associated patient
+ * Type: reference
+ * Path: DetectedIssue.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DetectedIssue:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DetectedIssue:patient").toLocked(); + /** + * Search parameter: author + *

+ * Description: The provider or device that identified the issue
+ * Type: reference
+ * Path: DetectedIssue.author
+ *

+ */ @SearchParamDefinition(name="author", path="DetectedIssue.author", description="The provider or device that identified the issue", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: The provider or device that identified the issue
+ * Type: reference
+ * Path: DetectedIssue.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DetectedIssue:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DetectedIssue:author").toLocked(); + /** + * Search parameter: implicated + *

+ * Description: Problem resource
+ * Type: reference
+ * Path: DetectedIssue.implicated
+ *

+ */ @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference" ) public static final String SP_IMPLICATED = "implicated"; + /** + * Fluent Client search parameter constant for implicated + *

+ * Description: Problem resource
+ * Type: reference
+ * Path: DetectedIssue.implicated
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam IMPLICATED = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_IMPLICATED); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DetectedIssue:implicated". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_IMPLICATED = new ca.uhn.fhir.model.api.Include("DetectedIssue:implicated").toLocked(); + /** + * Search parameter: category + *

+ * Description: Issue Category, e.g. drug-drug, duplicate therapy, etc.
+ * Type: token
+ * Path: DetectedIssue.category
+ *

+ */ @SearchParamDefinition(name="category", path="DetectedIssue.category", description="Issue Category, e.g. drug-drug, duplicate therapy, etc.", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: Issue Category, e.g. drug-drug, duplicate therapy, etc.
+ * Type: token
+ * Path: DetectedIssue.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java index 56896f6bd53..6e588072df7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1212,42 +1212,204 @@ public class Device extends DomainResource { return ResourceType.Device; } + /** + * Search parameter: identifier + *

+ * Description: Instance id from manufacturer, owner, and others
+ * Type: token
+ * Path: Device.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Device.identifier", description="Instance id from manufacturer, owner, and others", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Instance id from manufacturer, owner, and others
+ * Type: token
+ * Path: Device.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: patient + *

+ * Description: Patient information, if the resource is affixed to a person
+ * Type: reference
+ * Path: Device.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient information, if the resource is affixed to a person
+ * Type: reference
+ * Path: Device.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Device:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Device:patient").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization responsible for the device
+ * Type: reference
+ * Path: Device.owner
+ *

+ */ @SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization responsible for the device
+ * Type: reference
+ * Path: Device.owner
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Device:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Device:organization").toLocked(); + /** + * Search parameter: model + *

+ * Description: The model of the device
+ * Type: string
+ * Path: Device.model
+ *

+ */ @SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string" ) public static final String SP_MODEL = "model"; + /** + * Fluent Client search parameter constant for model + *

+ * Description: The model of the device
+ * Type: string
+ * Path: Device.model
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam MODEL = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_MODEL); + + /** + * Search parameter: location + *

+ * Description: A location, where the resource is found
+ * Type: reference
+ * Path: Device.location
+ *

+ */ @SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: A location, where the resource is found
+ * Type: reference
+ * Path: Device.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Device:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Device:location").toLocked(); + /** + * Search parameter: udi + *

+ * Description: FDA mandated Unique Device Identifier
+ * Type: string
+ * Path: Device.udi
+ *

+ */ @SearchParamDefinition(name="udi", path="Device.udi", description="FDA mandated Unique Device Identifier", type="string" ) public static final String SP_UDI = "udi"; + /** + * Fluent Client search parameter constant for udi + *

+ * Description: FDA mandated Unique Device Identifier
+ * Type: string
+ * Path: Device.udi
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam UDI = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_UDI); + + /** + * Search parameter: type + *

+ * Description: The type of the device
+ * Type: token
+ * Path: Device.type
+ *

+ */ @SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The type of the device
+ * Type: token
+ * Path: Device.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: url + *

+ * Description: Network address to contact device
+ * Type: uri
+ * Path: Device.url
+ *

+ */ @SearchParamDefinition(name="url", path="Device.url", description="Network address to contact device", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Network address to contact device
+ * Type: uri
+ * Path: Device.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: manufacturer + *

+ * Description: The manufacturer of the device
+ * Type: string
+ * Path: Device.manufacturer
+ *

+ */ @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string" ) public static final String SP_MANUFACTURER = "manufacturer"; + /** + * Fluent Client search parameter constant for manufacturer + *

+ * Description: The manufacturer of the device
+ * Type: string
+ * Path: Device.manufacturer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam MANUFACTURER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_MANUFACTURER); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java index 65aefa05fd6..8dd4233e725 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1097,24 +1097,78 @@ public class DeviceComponent extends DomainResource { return ResourceType.DeviceComponent; } + /** + * Search parameter: parent + *

+ * Description: The parent DeviceComponent resource
+ * Type: reference
+ * Path: DeviceComponent.parent
+ *

+ */ @SearchParamDefinition(name="parent", path="DeviceComponent.parent", description="The parent DeviceComponent resource", type="reference" ) public static final String SP_PARENT = "parent"; + /** + * Fluent Client search parameter constant for parent + *

+ * Description: The parent DeviceComponent resource
+ * Type: reference
+ * Path: DeviceComponent.parent
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceComponent:parent". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARENT = new ca.uhn.fhir.model.api.Include("DeviceComponent:parent").toLocked(); + /** + * Search parameter: source + *

+ * Description: The device source
+ * Type: reference
+ * Path: DeviceComponent.source
+ *

+ */ @SearchParamDefinition(name="source", path="DeviceComponent.source", description="The device source", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: The device source
+ * Type: reference
+ * Path: DeviceComponent.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceComponent:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("DeviceComponent:source").toLocked(); + /** + * Search parameter: type + *

+ * Description: The device component type
+ * Type: token
+ * Path: DeviceComponent.type
+ *

+ */ @SearchParamDefinition(name="type", path="DeviceComponent.type", description="The device component type", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The device component type
+ * Type: token
+ * Path: DeviceComponent.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java index c283f594dc8..2e9911b1f80 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1560,28 +1560,118 @@ public class DeviceMetric extends DomainResource { return ResourceType.DeviceMetric; } + /** + * Search parameter: parent + *

+ * Description: The parent DeviceMetric resource
+ * Type: reference
+ * Path: DeviceMetric.parent
+ *

+ */ @SearchParamDefinition(name="parent", path="DeviceMetric.parent", description="The parent DeviceMetric resource", type="reference" ) public static final String SP_PARENT = "parent"; + /** + * Fluent Client search parameter constant for parent + *

+ * Description: The parent DeviceMetric resource
+ * Type: reference
+ * Path: DeviceMetric.parent
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceMetric:parent". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARENT = new ca.uhn.fhir.model.api.Include("DeviceMetric:parent").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: The identifier of the metric
+ * Type: token
+ * Path: DeviceMetric.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DeviceMetric.identifier", description="The identifier of the metric", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identifier of the metric
+ * Type: token
+ * Path: DeviceMetric.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: source + *

+ * Description: The device resource
+ * Type: reference
+ * Path: DeviceMetric.source
+ *

+ */ @SearchParamDefinition(name="source", path="DeviceMetric.source", description="The device resource", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: The device resource
+ * Type: reference
+ * Path: DeviceMetric.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceMetric:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("DeviceMetric:source").toLocked(); + /** + * Search parameter: type + *

+ * Description: The component type
+ * Type: token
+ * Path: DeviceMetric.type
+ *

+ */ @SearchParamDefinition(name="type", path="DeviceMetric.type", description="The component type", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The component type
+ * Type: token
+ * Path: DeviceMetric.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: category + *

+ * Description: The category of the metric
+ * Type: token
+ * Path: DeviceMetric.category
+ *

+ */ @SearchParamDefinition(name="category", path="DeviceMetric.category", description="The category of the metric", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: The category of the metric
+ * Type: token
+ * Path: DeviceMetric.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java index d2108a5370f..7ef33f0438f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1304,24 +1304,78 @@ public class DeviceUseRequest extends DomainResource { return ResourceType.DeviceUseRequest; } + /** + * Search parameter: subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: DeviceUseRequest.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DeviceUseRequest.subject", description="Search by subject", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: DeviceUseRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseRequest:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DeviceUseRequest:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: DeviceUseRequest.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DeviceUseRequest.subject", description="Search by subject - a patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: DeviceUseRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceUseRequest:patient").toLocked(); + /** + * Search parameter: device + *

+ * Description: Device requested
+ * Type: reference
+ * Path: DeviceUseRequest.device
+ *

+ */ @SearchParamDefinition(name="device", path="DeviceUseRequest.device", description="Device requested", type="reference" ) public static final String SP_DEVICE = "device"; + /** + * Fluent Client search parameter constant for device + *

+ * Description: Device requested
+ * Type: reference
+ * Path: DeviceUseRequest.device
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseRequest:device". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java index 061c0a70570..4381aacbb87 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -694,24 +694,78 @@ public class DeviceUseStatement extends DomainResource { return ResourceType.DeviceUseStatement; } + /** + * Search parameter: subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: DeviceUseStatement.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DeviceUseStatement.subject", description="Search by subject", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: DeviceUseStatement.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseStatement:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DeviceUseStatement:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: DeviceUseStatement.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DeviceUseStatement.subject", description="Search by subject - a patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: DeviceUseStatement.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseStatement:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceUseStatement:patient").toLocked(); + /** + * Search parameter: device + *

+ * Description: Search by device
+ * Type: reference
+ * Path: DeviceUseStatement.device
+ *

+ */ @SearchParamDefinition(name="device", path="DeviceUseStatement.device", description="Search by device", type="reference" ) public static final String SP_DEVICE = "device"; + /** + * Fluent Client search parameter constant for device + *

+ * Description: Search by device
+ * Type: reference
+ * Path: DeviceUseStatement.device
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DeviceUseStatement:device". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java index 6e236df37e2..9e2aa9e9980 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1923,76 +1923,382 @@ public class DiagnosticOrder extends DomainResource { return ResourceType.DiagnosticOrder; } + /** + * Search parameter: item-past-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.item.event.status
+ *

+ */ @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" ) public static final String SP_ITEM_PAST_STATUS = "item-past-status"; + /** + * Fluent Client search parameter constant for item-past-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.item.event.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ITEM_PAST_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ITEM_PAST_STATUS); + + /** + * Search parameter: identifier + *

+ * Description: Identifiers assigned to this order
+ * Type: token
+ * Path: DiagnosticOrder.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="Identifiers assigned to this order", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifiers assigned to this order
+ * Type: token
+ * Path: DiagnosticOrder.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: bodysite + *

+ * Description: Location of requested test (if applicable)
+ * Type: token
+ * Path: DiagnosticOrder.item.bodySite
+ *

+ */ @SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="Location of requested test (if applicable)", type="token" ) public static final String SP_BODYSITE = "bodysite"; + /** + * Fluent Client search parameter constant for bodysite + *

+ * Description: Location of requested test (if applicable)
+ * Type: token
+ * Path: DiagnosticOrder.item.bodySite
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODYSITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODYSITE); + + /** + * Search parameter: code + *

+ * Description: Code to indicate the item (test or panel) being ordered
+ * Type: token
+ * Path: DiagnosticOrder.item.code
+ *

+ */ @SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="Code to indicate the item (test or panel) being ordered", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Code to indicate the item (test or panel) being ordered
+ * Type: token
+ * Path: DiagnosticOrder.item.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: event-date + *

+ * Description: The date at which the event happened
+ * Type: date
+ * Path: DiagnosticOrder.event.dateTime
+ *

+ */ @SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="The date at which the event happened", type="date" ) public static final String SP_EVENT_DATE = "event-date"; + /** + * Fluent Client search parameter constant for event-date + *

+ * Description: The date at which the event happened
+ * Type: date
+ * Path: DiagnosticOrder.event.dateTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam EVENT_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EVENT_DATE); + + /** + * Search parameter: event-status-date + *

+ * Description: A combination of past-status and date
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite" ) public static final String SP_EVENT_STATUS_DATE = "event-status-date"; + /** + * Fluent Client search parameter constant for event-status-date + *

+ * Description: A combination of past-status and date
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam EVENT_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_EVENT_STATUS_DATE); + + /** + * Search parameter: subject + *

+ * Description: Who and/or what test is about
+ * Type: reference
+ * Path: DiagnosticOrder.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who and/or what test is about
+ * Type: reference
+ * Path: DiagnosticOrder.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:subject").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: The encounter that this diagnostic order is associated with
+ * Type: reference
+ * Path: DiagnosticOrder.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="The encounter that this diagnostic order is associated with", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: The encounter that this diagnostic order is associated with
+ * Type: reference
+ * Path: DiagnosticOrder.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:encounter").toLocked(); + /** + * Search parameter: actor + *

+ * Description: Who recorded or did this
+ * Type: reference
+ * Path: DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor
+ *

+ */ @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor|DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference" ) public static final String SP_ACTOR = "actor"; + /** + * Fluent Client search parameter constant for actor + *

+ * Description: Who recorded or did this
+ * Type: reference
+ * Path: DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:actor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:actor").toLocked(); + /** + * Search parameter: item-date + *

+ * Description: The date at which the event happened
+ * Type: date
+ * Path: DiagnosticOrder.item.event.dateTime
+ *

+ */ @SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="The date at which the event happened", type="date" ) public static final String SP_ITEM_DATE = "item-date"; + /** + * Fluent Client search parameter constant for item-date + *

+ * Description: The date at which the event happened
+ * Type: date
+ * Path: DiagnosticOrder.item.event.dateTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam ITEM_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ITEM_DATE); + + /** + * Search parameter: item-status-date + *

+ * Description: A combination of item-past-status and item-date
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite" ) public static final String SP_ITEM_STATUS_DATE = "item-status-date"; + /** + * Fluent Client search parameter constant for item-status-date + *

+ * Description: A combination of item-past-status and item-date
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam ITEM_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_ITEM_STATUS_DATE); + + /** + * Search parameter: event-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.event.status
+ *

+ */ @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" ) public static final String SP_EVENT_STATUS = "event-status"; + /** + * Fluent Client search parameter constant for event-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.event.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT_STATUS); + + /** + * Search parameter: item-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.item.status
+ *

+ */ @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" ) public static final String SP_ITEM_STATUS = "item-status"; + /** + * Fluent Client search parameter constant for item-status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.item.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ITEM_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ITEM_STATUS); + + /** + * Search parameter: patient + *

+ * Description: Who and/or what test is about
+ * Type: reference
+ * Path: DiagnosticOrder.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who and/or what test is about
+ * Type: reference
+ * Path: DiagnosticOrder.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:patient").toLocked(); + /** + * Search parameter: orderer + *

+ * Description: Who ordered the test
+ * Type: reference
+ * Path: DiagnosticOrder.orderer
+ *

+ */ @SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="Who ordered the test", type="reference" ) public static final String SP_ORDERER = "orderer"; + /** + * Fluent Client search parameter constant for orderer + *

+ * Description: Who ordered the test
+ * Type: reference
+ * Path: DiagnosticOrder.orderer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORDERER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORDERER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:orderer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORDERER = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:orderer").toLocked(); + /** + * Search parameter: specimen + *

+ * Description: If the whole order relates to specific specimens
+ * Type: reference
+ * Path: DiagnosticOrder.specimen, DiagnosticOrder.item.specimen
+ *

+ */ @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen|DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference" ) public static final String SP_SPECIMEN = "specimen"; + /** + * Fluent Client search parameter constant for specimen + *

+ * Description: If the whole order relates to specific specimens
+ * Type: reference
+ * Path: DiagnosticOrder.specimen, DiagnosticOrder.item.specimen
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIMEN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIMEN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticOrder:specimen". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIMEN = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:specimen").toLocked(); + /** + * Search parameter: status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.status
+ *

+ */ @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed
+ * Type: token
+ * Path: DiagnosticOrder.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java index f7232d955cb..389cb5b5f49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1558,84 +1558,354 @@ public class DiagnosticReport extends DomainResource { return ResourceType.DiagnosticReport; } + /** + * Search parameter: date + *

+ * Description: The clinically relevant time of the report
+ * Type: date
+ * Path: DiagnosticReport.effective[x]
+ *

+ */ @SearchParamDefinition(name="date", path="DiagnosticReport.effective[x]", description="The clinically relevant time of the report", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The clinically relevant time of the report
+ * Type: date
+ * Path: DiagnosticReport.effective[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: An identifier for the report
+ * Type: token
+ * Path: DiagnosticReport.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: An identifier for the report
+ * Type: token
+ * Path: DiagnosticReport.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: image + *

+ * Description: A reference to the image source.
+ * Type: reference
+ * Path: DiagnosticReport.image.link
+ *

+ */ @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="A reference to the image source.", type="reference" ) public static final String SP_IMAGE = "image"; + /** + * Fluent Client search parameter constant for image + *

+ * Description: A reference to the image source.
+ * Type: reference
+ * Path: DiagnosticReport.image.link
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam IMAGE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_IMAGE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:image". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_IMAGE = new ca.uhn.fhir.model.api.Include("DiagnosticReport:image").toLocked(); + /** + * Search parameter: request + *

+ * Description: Reference to the test or procedure request.
+ * Type: reference
+ * Path: DiagnosticReport.request
+ *

+ */ @SearchParamDefinition(name="request", path="DiagnosticReport.request", description="Reference to the test or procedure request.", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: Reference to the test or procedure request.
+ * Type: reference
+ * Path: DiagnosticReport.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("DiagnosticReport:request").toLocked(); + /** + * Search parameter: performer + *

+ * Description: Who was the source of the report (organization)
+ * Type: reference
+ * Path: DiagnosticReport.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: Who was the source of the report (organization)
+ * Type: reference
+ * Path: DiagnosticReport.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("DiagnosticReport:performer").toLocked(); + /** + * Search parameter: code + *

+ * Description: The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result
+ * Type: token
+ * Path: DiagnosticReport.code
+ *

+ */ @SearchParamDefinition(name="code", path="DiagnosticReport.code", description="The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result
+ * Type: token
+ * Path: DiagnosticReport.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: subject + *

+ * Description: The subject of the report
+ * Type: reference
+ * Path: DiagnosticReport.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The subject of the report
+ * Type: reference
+ * Path: DiagnosticReport.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:subject").toLocked(); + /** + * Search parameter: diagnosis + *

+ * Description: A coded diagnosis on the report
+ * Type: token
+ * Path: DiagnosticReport.codedDiagnosis
+ *

+ */ @SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token" ) public static final String SP_DIAGNOSIS = "diagnosis"; + /** + * Fluent Client search parameter constant for diagnosis + *

+ * Description: A coded diagnosis on the report
+ * Type: token
+ * Path: DiagnosticReport.codedDiagnosis
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam DIAGNOSIS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DIAGNOSIS); + + /** + * Search parameter: encounter + *

+ * Description: The Encounter when the order was made
+ * Type: reference
+ * Path: DiagnosticReport.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="DiagnosticReport.encounter", description="The Encounter when the order was made", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: The Encounter when the order was made
+ * Type: reference
+ * Path: DiagnosticReport.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DiagnosticReport:encounter").toLocked(); + /** + * Search parameter: result + *

+ * Description: Link to an atomic result (observation resource)
+ * Type: reference
+ * Path: DiagnosticReport.result
+ *

+ */ @SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)", type="reference" ) public static final String SP_RESULT = "result"; + /** + * Fluent Client search parameter constant for result + *

+ * Description: Link to an atomic result (observation resource)
+ * Type: reference
+ * Path: DiagnosticReport.result
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESULT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESULT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:result". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESULT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:result").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The subject of the report if a patient
+ * Type: reference
+ * Path: DiagnosticReport.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DiagnosticReport.subject", description="The subject of the report if a patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The subject of the report if a patient
+ * Type: reference
+ * Path: DiagnosticReport.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:patient").toLocked(); + /** + * Search parameter: specimen + *

+ * Description: The specimen details
+ * Type: reference
+ * Path: DiagnosticReport.specimen
+ *

+ */ @SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference" ) public static final String SP_SPECIMEN = "specimen"; + /** + * Fluent Client search parameter constant for specimen + *

+ * Description: The specimen details
+ * Type: reference
+ * Path: DiagnosticReport.specimen
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIMEN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIMEN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DiagnosticReport:specimen". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIMEN = new ca.uhn.fhir.model.api.Include("DiagnosticReport:specimen").toLocked(); + /** + * Search parameter: issued + *

+ * Description: When the report was issued
+ * Type: date
+ * Path: DiagnosticReport.issued
+ *

+ */ @SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date" ) public static final String SP_ISSUED = "issued"; + /** + * Fluent Client search parameter constant for issued + *

+ * Description: When the report was issued
+ * Type: date
+ * Path: DiagnosticReport.issued
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam ISSUED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ISSUED); + + /** + * Search parameter: category + *

+ * Description: Which diagnostic discipline/department created the report
+ * Type: token
+ * Path: DiagnosticReport.category
+ *

+ */ @SearchParamDefinition(name="category", path="DiagnosticReport.category", description="Which diagnostic discipline/department created the report", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: Which diagnostic discipline/department created the report
+ * Type: token
+ * Path: DiagnosticReport.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: status + *

+ * Description: The status of the report
+ * Type: token
+ * Path: DiagnosticReport.status
+ *

+ */ @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the report
+ * Type: token
+ * Path: DiagnosticReport.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java index e788167654e..46e50ce1cea 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java index c720d7d9780..fcb3ed85887 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1136,68 +1136,302 @@ public class DocumentManifest extends DomainResource { return ResourceType.DocumentManifest; } + /** + * Search parameter: identifier + *

+ * Description: Unique Identifier for the set of documents
+ * Type: token
+ * Path: DocumentManifest.masterIdentifier, DocumentManifest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier|DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique Identifier for the set of documents
+ * Type: token
+ * Path: DocumentManifest.masterIdentifier, DocumentManifest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: related-id + *

+ * Description: Identifiers of things that are related
+ * Type: token
+ * Path: DocumentManifest.related.identifier
+ *

+ */ @SearchParamDefinition(name="related-id", path="DocumentManifest.related.identifier", description="Identifiers of things that are related", type="token" ) public static final String SP_RELATED_ID = "related-id"; + /** + * Fluent Client search parameter constant for related-id + *

+ * Description: Identifiers of things that are related
+ * Type: token
+ * Path: DocumentManifest.related.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATED_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATED_ID); + + /** + * Search parameter: content-ref + *

+ * Description: Contents of this set of documents
+ * Type: reference
+ * Path: DocumentManifest.content.pReference
+ *

+ */ @SearchParamDefinition(name="content-ref", path="DocumentManifest.content.pReference", description="Contents of this set of documents", type="reference" ) public static final String SP_CONTENT_REF = "content-ref"; + /** + * Fluent Client search parameter constant for content-ref + *

+ * Description: Contents of this set of documents
+ * Type: reference
+ * Path: DocumentManifest.content.pReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTENT_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTENT_REF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:content-ref". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTENT_REF = new ca.uhn.fhir.model.api.Include("DocumentManifest:content-ref").toLocked(); + /** + * Search parameter: subject + *

+ * Description: The subject of the set of documents
+ * Type: reference
+ * Path: DocumentManifest.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The subject of the set of documents
+ * Type: reference
+ * Path: DocumentManifest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DocumentManifest:subject").toLocked(); + /** + * Search parameter: author + *

+ * Description: Who and/or what authored the manifest
+ * Type: reference
+ * Path: DocumentManifest.author
+ *

+ */ @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Who and/or what authored the manifest
+ * Type: reference
+ * Path: DocumentManifest.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DocumentManifest:author").toLocked(); + /** + * Search parameter: created + *

+ * Description: When this document manifest created
+ * Type: date
+ * Path: DocumentManifest.created
+ *

+ */ @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: When this document manifest created
+ * Type: date
+ * Path: DocumentManifest.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: description + *

+ * Description: Human-readable description (title)
+ * Type: string
+ * Path: DocumentManifest.description
+ *

+ */ @SearchParamDefinition(name="description", path="DocumentManifest.description", description="Human-readable description (title)", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Human-readable description (title)
+ * Type: string
+ * Path: DocumentManifest.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: source + *

+ * Description: The source system/application/software
+ * Type: uri
+ * Path: DocumentManifest.source
+ *

+ */ @SearchParamDefinition(name="source", path="DocumentManifest.source", description="The source system/application/software", type="uri" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: The source system/application/software
+ * Type: uri
+ * Path: DocumentManifest.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SOURCE = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SOURCE); + + /** + * Search parameter: type + *

+ * Description: Kind of document set
+ * Type: token
+ * Path: DocumentManifest.type
+ *

+ */ @SearchParamDefinition(name="type", path="DocumentManifest.type", description="Kind of document set", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Kind of document set
+ * Type: token
+ * Path: DocumentManifest.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: related-ref + *

+ * Description: Related Resource
+ * Type: reference
+ * Path: DocumentManifest.related.ref
+ *

+ */ @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference" ) public static final String SP_RELATED_REF = "related-ref"; + /** + * Fluent Client search parameter constant for related-ref + *

+ * Description: Related Resource
+ * Type: reference
+ * Path: DocumentManifest.related.ref
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED_REF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:related-ref". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATED_REF = new ca.uhn.fhir.model.api.Include("DocumentManifest:related-ref").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The subject of the set of documents
+ * Type: reference
+ * Path: DocumentManifest.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The subject of the set of documents
+ * Type: reference
+ * Path: DocumentManifest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DocumentManifest:patient").toLocked(); + /** + * Search parameter: recipient + *

+ * Description: Intended to get notified about this set of documents
+ * Type: reference
+ * Path: DocumentManifest.recipient
+ *

+ */ @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference" ) public static final String SP_RECIPIENT = "recipient"; + /** + * Fluent Client search parameter constant for recipient + *

+ * Description: Intended to get notified about this set of documents
+ * Type: reference
+ * Path: DocumentManifest.recipient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentManifest:recipient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("DocumentManifest:recipient").toLocked(); + /** + * Search parameter: status + *

+ * Description: current | superseded | entered-in-error
+ * Type: token
+ * Path: DocumentManifest.status
+ *

+ */ @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: current | superseded | entered-in-error
+ * Type: token
+ * Path: DocumentManifest.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java index 0fb3a173f5d..890df3ef42e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2145,106 +2145,574 @@ public class DocumentReference extends DomainResource { return ResourceType.DocumentReference; } + /** + * Search parameter: securitylabel + *

+ * Description: Document security-tags
+ * Type: token
+ * Path: DocumentReference.securityLabel
+ *

+ */ @SearchParamDefinition(name="securitylabel", path="DocumentReference.securityLabel", description="Document security-tags", type="token" ) public static final String SP_SECURITYLABEL = "securitylabel"; + /** + * Fluent Client search parameter constant for securitylabel + *

+ * Description: Document security-tags
+ * Type: token
+ * Path: DocumentReference.securityLabel
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITYLABEL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITYLABEL); + + /** + * Search parameter: subject + *

+ * Description: Who/what is the subject of the document
+ * Type: reference
+ * Path: DocumentReference.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who/what is the subject of the document
+ * Type: reference
+ * Path: DocumentReference.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DocumentReference:subject").toLocked(); + /** + * Search parameter: description + *

+ * Description: Human-readable description (title)
+ * Type: string
+ * Path: DocumentReference.description
+ *

+ */ @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Human-readable description (title)
+ * Type: string
+ * Path: DocumentReference.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: language + *

+ * Description: Human language of the content (BCP-47)
+ * Type: token
+ * Path: DocumentReference.content.attachment.language
+ *

+ */ @SearchParamDefinition(name="language", path="DocumentReference.content.attachment.language", description="Human language of the content (BCP-47)", type="token" ) public static final String SP_LANGUAGE = "language"; + /** + * Fluent Client search parameter constant for language + *

+ * Description: Human language of the content (BCP-47)
+ * Type: token
+ * Path: DocumentReference.content.attachment.language
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam LANGUAGE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_LANGUAGE); + + /** + * Search parameter: type + *

+ * Description: Kind of document (LOINC if possible)
+ * Type: token
+ * Path: DocumentReference.type
+ *

+ */ @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document (LOINC if possible)", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Kind of document (LOINC if possible)
+ * Type: token
+ * Path: DocumentReference.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: relation + *

+ * Description: replaces | transforms | signs | appends
+ * Type: token
+ * Path: DocumentReference.relatesTo.code
+ *

+ */ @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token" ) public static final String SP_RELATION = "relation"; + /** + * Fluent Client search parameter constant for relation + *

+ * Description: replaces | transforms | signs | appends
+ * Type: token
+ * Path: DocumentReference.relatesTo.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATION); + + /** + * Search parameter: setting + *

+ * Description: Additional details about where the content was created (e.g. clinical specialty)
+ * Type: token
+ * Path: DocumentReference.context.practiceSetting
+ *

+ */ @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" ) public static final String SP_SETTING = "setting"; + /** + * Fluent Client search parameter constant for setting + *

+ * Description: Additional details about where the content was created (e.g. clinical specialty)
+ * Type: token
+ * Path: DocumentReference.context.practiceSetting
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SETTING = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SETTING); + + /** + * Search parameter: patient + *

+ * Description: Who/what is the subject of the document
+ * Type: reference
+ * Path: DocumentReference.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who/what is the subject of the document
+ * Type: reference
+ * Path: DocumentReference.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DocumentReference:patient").toLocked(); + /** + * Search parameter: relationship + *

+ * Description: Combination of relation and relatesTo
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite" ) public static final String SP_RELATIONSHIP = "relationship"; + /** + * Fluent Client search parameter constant for relationship + *

+ * Description: Combination of relation and relatesTo
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATIONSHIP = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATIONSHIP); + + /** + * Search parameter: event + *

+ * Description: Main Clinical Acts Documented
+ * Type: token
+ * Path: DocumentReference.context.event
+ *

+ */ @SearchParamDefinition(name="event", path="DocumentReference.context.event", description="Main Clinical Acts Documented", type="token" ) public static final String SP_EVENT = "event"; + /** + * Fluent Client search parameter constant for event + *

+ * Description: Main Clinical Acts Documented
+ * Type: token
+ * Path: DocumentReference.context.event
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT); + + /** + * Search parameter: class + *

+ * Description: Categorization of document
+ * Type: token
+ * Path: DocumentReference.class
+ *

+ */ @SearchParamDefinition(name="class", path="DocumentReference.class", description="Categorization of document", type="token" ) public static final String SP_CLASS = "class"; + /** + * Fluent Client search parameter constant for class + *

+ * Description: Categorization of document
+ * Type: token
+ * Path: DocumentReference.class
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLASS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLASS); + + /** + * Search parameter: authenticator + *

+ * Description: Who/what authenticated the document
+ * Type: reference
+ * Path: DocumentReference.authenticator
+ *

+ */ @SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="Who/what authenticated the document", type="reference" ) public static final String SP_AUTHENTICATOR = "authenticator"; + /** + * Fluent Client search parameter constant for authenticator + *

+ * Description: Who/what authenticated the document
+ * Type: reference
+ * Path: DocumentReference.authenticator
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHENTICATOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHENTICATOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:authenticator". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHENTICATOR = new ca.uhn.fhir.model.api.Include("DocumentReference:authenticator").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Master Version Specific Identifier
+ * Type: token
+ * Path: DocumentReference.masterIdentifier, DocumentReference.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier|DocumentReference.identifier", description="Master Version Specific Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Master Version Specific Identifier
+ * Type: token
+ * Path: DocumentReference.masterIdentifier, DocumentReference.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: period + *

+ * Description: Time of service that is being documented
+ * Type: date
+ * Path: DocumentReference.context.period
+ *

+ */ @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date" ) public static final String SP_PERIOD = "period"; + /** + * Fluent Client search parameter constant for period + *

+ * Description: Time of service that is being documented
+ * Type: date
+ * Path: DocumentReference.context.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD); + + /** + * Search parameter: related-id + *

+ * Description: Identifier of related objects or events
+ * Type: token
+ * Path: DocumentReference.context.related.identifier
+ *

+ */ @SearchParamDefinition(name="related-id", path="DocumentReference.context.related.identifier", description="Identifier of related objects or events", type="token" ) public static final String SP_RELATED_ID = "related-id"; + /** + * Fluent Client search parameter constant for related-id + *

+ * Description: Identifier of related objects or events
+ * Type: token
+ * Path: DocumentReference.context.related.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATED_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATED_ID); + + /** + * Search parameter: custodian + *

+ * Description: Organization which maintains the document
+ * Type: reference
+ * Path: DocumentReference.custodian
+ *

+ */ @SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="Organization which maintains the document", type="reference" ) public static final String SP_CUSTODIAN = "custodian"; + /** + * Fluent Client search parameter constant for custodian + *

+ * Description: Organization which maintains the document
+ * Type: reference
+ * Path: DocumentReference.custodian
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CUSTODIAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CUSTODIAN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:custodian". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CUSTODIAN = new ca.uhn.fhir.model.api.Include("DocumentReference:custodian").toLocked(); + /** + * Search parameter: indexed + *

+ * Description: When this document reference created
+ * Type: date
+ * Path: DocumentReference.indexed
+ *

+ */ @SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="When this document reference created", type="date" ) public static final String SP_INDEXED = "indexed"; + /** + * Fluent Client search parameter constant for indexed + *

+ * Description: When this document reference created
+ * Type: date
+ * Path: DocumentReference.indexed
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam INDEXED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_INDEXED); + + /** + * Search parameter: author + *

+ * Description: Who and/or what authored the document
+ * Type: reference
+ * Path: DocumentReference.author
+ *

+ */ @SearchParamDefinition(name="author", path="DocumentReference.author", description="Who and/or what authored the document", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Who and/or what authored the document
+ * Type: reference
+ * Path: DocumentReference.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DocumentReference:author").toLocked(); + /** + * Search parameter: created + *

+ * Description: Document creation time
+ * Type: date
+ * Path: DocumentReference.created
+ *

+ */ @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: Document creation time
+ * Type: date
+ * Path: DocumentReference.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: format + *

+ * Description: Format/content rules for the document
+ * Type: token
+ * Path: DocumentReference.content.format
+ *

+ */ @SearchParamDefinition(name="format", path="DocumentReference.content.format", description="Format/content rules for the document", type="token" ) public static final String SP_FORMAT = "format"; + /** + * Fluent Client search parameter constant for format + *

+ * Description: Format/content rules for the document
+ * Type: token
+ * Path: DocumentReference.content.format
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT); + + /** + * Search parameter: encounter + *

+ * Description: Context of the document content
+ * Type: reference
+ * Path: DocumentReference.context.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document content", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Context of the document content
+ * Type: reference
+ * Path: DocumentReference.context.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DocumentReference:encounter").toLocked(); + /** + * Search parameter: related-ref + *

+ * Description: Related Resource
+ * Type: reference
+ * Path: DocumentReference.context.related.ref
+ *

+ */ @SearchParamDefinition(name="related-ref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" ) public static final String SP_RELATED_REF = "related-ref"; + /** + * Fluent Client search parameter constant for related-ref + *

+ * Description: Related Resource
+ * Type: reference
+ * Path: DocumentReference.context.related.ref
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED_REF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:related-ref". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATED_REF = new ca.uhn.fhir.model.api.Include("DocumentReference:related-ref").toLocked(); + /** + * Search parameter: location + *

+ * Description: Uri where the data can be found
+ * Type: uri
+ * Path: DocumentReference.content.attachment.url
+ *

+ */ @SearchParamDefinition(name="location", path="DocumentReference.content.attachment.url", description="Uri where the data can be found", type="uri" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: Uri where the data can be found
+ * Type: uri
+ * Path: DocumentReference.content.attachment.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam LOCATION = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_LOCATION); + + /** + * Search parameter: relatesto + *

+ * Description: Target of the relationship
+ * Type: reference
+ * Path: DocumentReference.relatesTo.target
+ *

+ */ @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference" ) public static final String SP_RELATESTO = "relatesto"; + /** + * Fluent Client search parameter constant for relatesto + *

+ * Description: Target of the relationship
+ * Type: reference
+ * Path: DocumentReference.relatesTo.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATESTO = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATESTO); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "DocumentReference:relatesto". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATESTO = new ca.uhn.fhir.model.api.Include("DocumentReference:relatesto").toLocked(); + /** + * Search parameter: facility + *

+ * Description: Kind of facility where patient was seen
+ * Type: token
+ * Path: DocumentReference.context.facilityType
+ *

+ */ @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token" ) public static final String SP_FACILITY = "facility"; + /** + * Fluent Client search parameter constant for facility + *

+ * Description: Kind of facility where patient was seen
+ * Type: token
+ * Path: DocumentReference.context.facilityType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FACILITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FACILITY); + + /** + * Search parameter: status + *

+ * Description: current | superseded | entered-in-error
+ * Type: token
+ * Path: DocumentReference.status
+ *

+ */ @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: current | superseded | entered-in-error
+ * Type: token
+ * Path: DocumentReference.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java index d43e860cf10..59a35bf0f50 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java index c0720fdd723..f57c20e2041 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java index cbe584ade1e..6fe00c18963 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java index e1f0f969170..9b0ed415148 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java index bf1d8b69ad8..f64a5352e59 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1061,36 +1061,144 @@ public class EligibilityRequest extends DomainResource { return ResourceType.EligibilityRequest; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Eligibility
+ * Type: token
+ * Path: EligibilityRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="EligibilityRequest.identifier", description="The business identifier of the Eligibility", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Eligibility
+ * Type: token
+ * Path: EligibilityRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: EligibilityRequest.provider
+ *

+ */ @SearchParamDefinition(name="provider", path="EligibilityRequest.provider", description="The reference to the provider", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: EligibilityRequest.provider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityRequest:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("EligibilityRequest:provider").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The reference to the patient
+ * Type: reference
+ * Path: EligibilityRequest.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="EligibilityRequest.patient", description="The reference to the patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The reference to the patient
+ * Type: reference
+ * Path: EligibilityRequest.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("EligibilityRequest:patient").toLocked(); + /** + * Search parameter: created + *

+ * Description: The creation date for the EOB
+ * Type: date
+ * Path: EligibilityRequest.created
+ *

+ */ @SearchParamDefinition(name="created", path="EligibilityRequest.created", description="The creation date for the EOB", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date for the EOB
+ * Type: date
+ * Path: EligibilityRequest.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: EligibilityRequest.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="EligibilityRequest.organization", description="The reference to the providing organization", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: EligibilityRequest.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityRequest:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityRequest:organization").toLocked(); + /** + * Search parameter: facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: EligibilityRequest.facility
+ *

+ */ @SearchParamDefinition(name="facility", path="EligibilityRequest.facility", description="Facility responsible for the goods and services", type="reference" ) public static final String SP_FACILITY = "facility"; + /** + * Fluent Client search parameter constant for facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: EligibilityRequest.facility
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FACILITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FACILITY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityRequest:facility". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java index fd42bb78173..5e67700bb1f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1670,46 +1670,190 @@ public class EligibilityResponse extends DomainResource { return ResourceType.EligibilityResponse; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier
+ * Type: token
+ * Path: EligibilityResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="EligibilityResponse.identifier", description="The business identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier
+ * Type: token
+ * Path: EligibilityResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: The EligibilityRequest reference
+ * Type: reference
+ * Path: EligibilityResponse.request
+ *

+ */ @SearchParamDefinition(name="request", path="EligibilityResponse.request", description="The EligibilityRequest reference", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The EligibilityRequest reference
+ * Type: reference
+ * Path: EligibilityResponse.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityResponse:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("EligibilityResponse:request").toLocked(); + /** + * Search parameter: disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: EligibilityResponse.disposition
+ *

+ */ @SearchParamDefinition(name="disposition", path="EligibilityResponse.disposition", description="The contents of the disposition message", type="string" ) public static final String SP_DISPOSITION = "disposition"; + /** + * Fluent Client search parameter constant for disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: EligibilityResponse.disposition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION); + + /** + * Search parameter: created + *

+ * Description: The creation date
+ * Type: date
+ * Path: EligibilityResponse.created
+ *

+ */ @SearchParamDefinition(name="created", path="EligibilityResponse.created", description="The creation date", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date
+ * Type: date
+ * Path: EligibilityResponse.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The organization which generated this resource
+ * Type: reference
+ * Path: EligibilityResponse.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="EligibilityResponse.organization", description="The organization which generated this resource", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization which generated this resource
+ * Type: reference
+ * Path: EligibilityResponse.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityResponse:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityResponse:organization").toLocked(); + /** + * Search parameter: requestprovider + *

+ * Description: Reference to the EligibilityRequest provider
+ * Type: reference
+ * Path: EligibilityResponse.requestProvider
+ *

+ */ @SearchParamDefinition(name="requestprovider", path="EligibilityResponse.requestProvider", description="Reference to the EligibilityRequest provider", type="reference" ) public static final String SP_REQUESTPROVIDER = "requestprovider"; + /** + * Fluent Client search parameter constant for requestprovider + *

+ * Description: Reference to the EligibilityRequest provider
+ * Type: reference
+ * Path: EligibilityResponse.requestProvider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTPROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTPROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityResponse:requestprovider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTPROVIDER = new ca.uhn.fhir.model.api.Include("EligibilityResponse:requestprovider").toLocked(); + /** + * Search parameter: requestorganization + *

+ * Description: Reference to the EligibilityRequest organization
+ * Type: reference
+ * Path: EligibilityResponse.requestOrganization
+ *

+ */ @SearchParamDefinition(name="requestorganization", path="EligibilityResponse.requestOrganization", description="Reference to the EligibilityRequest organization", type="reference" ) public static final String SP_REQUESTORGANIZATION = "requestorganization"; + /** + * Fluent Client search parameter constant for requestorganization + *

+ * Description: Reference to the EligibilityRequest organization
+ * Type: reference
+ * Path: EligibilityResponse.requestOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EligibilityResponse:requestorganization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityResponse:requestorganization").toLocked(); + /** + * Search parameter: outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: EligibilityResponse.outcome
+ *

+ */ @SearchParamDefinition(name="outcome", path="EligibilityResponse.outcome", description="The processing outcome", type="token" ) public static final String SP_OUTCOME = "outcome"; + /** + * Fluent Client search parameter constant for outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: EligibilityResponse.outcome
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam OUTCOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OUTCOME); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java index 0e20d1db587..73058864ad5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -3069,112 +3069,472 @@ Not to be used when the patient is currently at the location return ResourceType.Encounter; } + /** + * Search parameter: date + *

+ * Description: A date within the period the Encounter lasted
+ * Type: date
+ * Path: Encounter.period
+ *

+ */ @SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: A date within the period the Encounter lasted
+ * Type: date
+ * Path: Encounter.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Identifier(s) by which this encounter is known
+ * Type: token
+ * Path: Encounter.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Encounter.identifier", description="Identifier(s) by which this encounter is known", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifier(s) by which this encounter is known
+ * Type: token
+ * Path: Encounter.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: reason + *

+ * Description: Reason the encounter takes place (code)
+ * Type: token
+ * Path: Encounter.reason
+ *

+ */ @SearchParamDefinition(name="reason", path="Encounter.reason", description="Reason the encounter takes place (code)", type="token" ) public static final String SP_REASON = "reason"; + /** + * Fluent Client search parameter constant for reason + *

+ * Description: Reason the encounter takes place (code)
+ * Type: token
+ * Path: Encounter.reason
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON); + + /** + * Search parameter: episodeofcare + *

+ * Description: Episode(s) of care that this encounter should be recorded against
+ * Type: reference
+ * Path: Encounter.episodeOfCare
+ *

+ */ @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="Episode(s) of care that this encounter should be recorded against", type="reference" ) public static final String SP_EPISODEOFCARE = "episodeofcare"; + /** + * Fluent Client search parameter constant for episodeofcare + *

+ * Description: Episode(s) of care that this encounter should be recorded against
+ * Type: reference
+ * Path: Encounter.episodeOfCare
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam EPISODEOFCARE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_EPISODEOFCARE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:episodeofcare". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_EPISODEOFCARE = new ca.uhn.fhir.model.api.Include("Encounter:episodeofcare").toLocked(); + /** + * Search parameter: participant-type + *

+ * Description: Role of participant in encounter
+ * Type: token
+ * Path: Encounter.participant.type
+ *

+ */ @SearchParamDefinition(name="participant-type", path="Encounter.participant.type", description="Role of participant in encounter", type="token" ) public static final String SP_PARTICIPANT_TYPE = "participant-type"; + /** + * Fluent Client search parameter constant for participant-type + *

+ * Description: Role of participant in encounter
+ * Type: token
+ * Path: Encounter.participant.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PARTICIPANT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PARTICIPANT_TYPE); + + /** + * Search parameter: incomingreferral + *

+ * Description: The ReferralRequest that initiated this encounter
+ * Type: reference
+ * Path: Encounter.incomingReferral
+ *

+ */ @SearchParamDefinition(name="incomingreferral", path="Encounter.incomingReferral", description="The ReferralRequest that initiated this encounter", type="reference" ) public static final String SP_INCOMINGREFERRAL = "incomingreferral"; + /** + * Fluent Client search parameter constant for incomingreferral + *

+ * Description: The ReferralRequest that initiated this encounter
+ * Type: reference
+ * Path: Encounter.incomingReferral
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INCOMINGREFERRAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INCOMINGREFERRAL); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:incomingreferral". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INCOMINGREFERRAL = new ca.uhn.fhir.model.api.Include("Encounter:incomingreferral").toLocked(); + /** + * Search parameter: practitioner + *

+ * Description: Persons involved in the encounter other than the patient
+ * Type: reference
+ * Path: Encounter.participant.individual
+ *

+ */ @SearchParamDefinition(name="practitioner", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + /** + * Fluent Client search parameter constant for practitioner + *

+ * Description: Persons involved in the encounter other than the patient
+ * Type: reference
+ * Path: Encounter.participant.individual
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:practitioner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("Encounter:practitioner").toLocked(); + /** + * Search parameter: length + *

+ * Description: Length of encounter in days
+ * Type: number
+ * Path: Encounter.length
+ *

+ */ @SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number" ) public static final String SP_LENGTH = "length"; + /** + * Fluent Client search parameter constant for length + *

+ * Description: Length of encounter in days
+ * Type: number
+ * Path: Encounter.length
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam LENGTH = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_LENGTH); + + /** + * Search parameter: appointment + *

+ * Description: The appointment that scheduled this encounter
+ * Type: reference
+ * Path: Encounter.appointment
+ *

+ */ @SearchParamDefinition(name="appointment", path="Encounter.appointment", description="The appointment that scheduled this encounter", type="reference" ) public static final String SP_APPOINTMENT = "appointment"; + /** + * Fluent Client search parameter constant for appointment + *

+ * Description: The appointment that scheduled this encounter
+ * Type: reference
+ * Path: Encounter.appointment
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam APPOINTMENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_APPOINTMENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:appointment". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_APPOINTMENT = new ca.uhn.fhir.model.api.Include("Encounter:appointment").toLocked(); + /** + * Search parameter: part-of + *

+ * Description: Another Encounter this encounter is part of
+ * Type: reference
+ * Path: Encounter.partOf
+ *

+ */ @SearchParamDefinition(name="part-of", path="Encounter.partOf", description="Another Encounter this encounter is part of", type="reference" ) public static final String SP_PART_OF = "part-of"; + /** + * Fluent Client search parameter constant for part-of + *

+ * Description: Another Encounter this encounter is part of
+ * Type: reference
+ * Path: Encounter.partOf
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PART_OF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PART_OF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:part-of". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PART_OF = new ca.uhn.fhir.model.api.Include("Encounter:part-of").toLocked(); + /** + * Search parameter: procedure + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ @SearchParamDefinition(name="procedure", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) public static final String SP_PROCEDURE = "procedure"; + /** + * Fluent Client search parameter constant for procedure + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROCEDURE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROCEDURE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:procedure". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROCEDURE = new ca.uhn.fhir.model.api.Include("Encounter:procedure").toLocked(); + /** + * Search parameter: type + *

+ * Description: Specific type of encounter
+ * Type: token
+ * Path: Encounter.type
+ *

+ */ @SearchParamDefinition(name="type", path="Encounter.type", description="Specific type of encounter", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Specific type of encounter
+ * Type: token
+ * Path: Encounter.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: participant + *

+ * Description: Persons involved in the encounter other than the patient
+ * Type: reference
+ * Path: Encounter.participant.individual
+ *

+ */ @SearchParamDefinition(name="participant", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" ) public static final String SP_PARTICIPANT = "participant"; + /** + * Fluent Client search parameter constant for participant + *

+ * Description: Persons involved in the encounter other than the patient
+ * Type: reference
+ * Path: Encounter.participant.individual
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:participant". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("Encounter:participant").toLocked(); + /** + * Search parameter: condition + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ @SearchParamDefinition(name="condition", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) public static final String SP_CONDITION = "condition"; + /** + * Fluent Client search parameter constant for condition + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:condition". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("Encounter:condition").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The patient present at the encounter
+ * Type: reference
+ * Path: Encounter.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="Encounter.patient", description="The patient present at the encounter", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient present at the encounter
+ * Type: reference
+ * Path: Encounter.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Encounter:patient").toLocked(); + /** + * Search parameter: location-period + *

+ * Description: Time period during which the patient was present at the location
+ * Type: date
+ * Path: Encounter.location.period
+ *

+ */ @SearchParamDefinition(name="location-period", path="Encounter.location.period", description="Time period during which the patient was present at the location", type="date" ) public static final String SP_LOCATION_PERIOD = "location-period"; + /** + * Fluent Client search parameter constant for location-period + *

+ * Description: Time period during which the patient was present at the location
+ * Type: date
+ * Path: Encounter.location.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam LOCATION_PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LOCATION_PERIOD); + + /** + * Search parameter: location + *

+ * Description: Location the encounter takes place
+ * Type: reference
+ * Path: Encounter.location.location
+ *

+ */ @SearchParamDefinition(name="location", path="Encounter.location.location", description="Location the encounter takes place", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: Location the encounter takes place
+ * Type: reference
+ * Path: Encounter.location.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Encounter:location").toLocked(); + /** + * Search parameter: indication + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ @SearchParamDefinition(name="indication", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" ) public static final String SP_INDICATION = "indication"; + /** + * Fluent Client search parameter constant for indication + *

+ * Description: Reason the encounter takes place (resource)
+ * Type: reference
+ * Path: Encounter.indication
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INDICATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Encounter:indication". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INDICATION = new ca.uhn.fhir.model.api.Include("Encounter:indication").toLocked(); + /** + * Search parameter: special-arrangement + *

+ * Description: Wheelchair, translator, stretcher, etc.
+ * Type: token
+ * Path: Encounter.hospitalization.specialArrangement
+ *

+ */ @SearchParamDefinition(name="special-arrangement", path="Encounter.hospitalization.specialArrangement", description="Wheelchair, translator, stretcher, etc.", type="token" ) public static final String SP_SPECIAL_ARRANGEMENT = "special-arrangement"; + /** + * Fluent Client search parameter constant for special-arrangement + *

+ * Description: Wheelchair, translator, stretcher, etc.
+ * Type: token
+ * Path: Encounter.hospitalization.specialArrangement
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIAL_ARRANGEMENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIAL_ARRANGEMENT); + + /** + * Search parameter: status + *

+ * Description: planned | arrived | in-progress | onleave | finished | cancelled
+ * Type: token
+ * Path: Encounter.status
+ *

+ */ @SearchParamDefinition(name="status", path="Encounter.status", description="planned | arrived | in-progress | onleave | finished | cancelled", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: planned | arrived | in-progress | onleave | finished | cancelled
+ * Type: token
+ * Path: Encounter.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java index 7ed9a010144..9c7da88b662 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -691,18 +691,72 @@ public class EnrollmentRequest extends DomainResource { return ResourceType.EnrollmentRequest; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Enrollment
+ * Type: token
+ * Path: EnrollmentRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="EnrollmentRequest.identifier", description="The business identifier of the Enrollment", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Enrollment
+ * Type: token
+ * Path: EnrollmentRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: subject + *

+ * Description: The party to be enrolled
+ * Type: reference
+ * Path: EnrollmentRequest.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The party to be enrolled
+ * Type: reference
+ * Path: EnrollmentRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EnrollmentRequest:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("EnrollmentRequest:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The party to be enrolled
+ * Type: reference
+ * Path: EnrollmentRequest.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The party to be enrolled
+ * Type: reference
+ * Path: EnrollmentRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EnrollmentRequest:patient". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java index 3f07b0fcdcd..ad4767a00ea 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -707,8 +707,26 @@ public class EnrollmentResponse extends DomainResource { return ResourceType.EnrollmentResponse; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: EnrollmentResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="EnrollmentResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: EnrollmentResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java index 86e8c5291e9..f9af080d5c7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.instance.model.api.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java index 66448d04dcc..fcbda974ee1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EpisodeOfCare.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1369,62 +1369,242 @@ public class EpisodeOfCare extends DomainResource { return ResourceType.EpisodeOfCare; } + /** + * Search parameter: date + *

+ * Description: The provided date search value falls within the episode of care's period
+ * Type: date
+ * Path: EpisodeOfCare.period
+ *

+ */ @SearchParamDefinition(name="date", path="EpisodeOfCare.period", description="The provided date search value falls within the episode of care's period", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The provided date search value falls within the episode of care's period
+ * Type: date
+ * Path: EpisodeOfCare.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Identifier(s) for the EpisodeOfCare
+ * Type: token
+ * Path: EpisodeOfCare.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="EpisodeOfCare.identifier", description="Identifier(s) for the EpisodeOfCare", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifier(s) for the EpisodeOfCare
+ * Type: token
+ * Path: EpisodeOfCare.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: condition + *

+ * Description: Conditions/problems/diagnoses this episode of care is for
+ * Type: reference
+ * Path: EpisodeOfCare.condition
+ *

+ */ @SearchParamDefinition(name="condition", path="EpisodeOfCare.condition", description="Conditions/problems/diagnoses this episode of care is for", type="reference" ) public static final String SP_CONDITION = "condition"; + /** + * Fluent Client search parameter constant for condition + *

+ * Description: Conditions/problems/diagnoses this episode of care is for
+ * Type: reference
+ * Path: EpisodeOfCare.condition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:condition". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:condition").toLocked(); + /** + * Search parameter: incomingreferral + *

+ * Description: Incoming Referral Request
+ * Type: reference
+ * Path: EpisodeOfCare.referralRequest
+ *

+ */ @SearchParamDefinition(name="incomingreferral", path="EpisodeOfCare.referralRequest", description="Incoming Referral Request", type="reference" ) public static final String SP_INCOMINGREFERRAL = "incomingreferral"; + /** + * Fluent Client search parameter constant for incomingreferral + *

+ * Description: Incoming Referral Request
+ * Type: reference
+ * Path: EpisodeOfCare.referralRequest
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INCOMINGREFERRAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INCOMINGREFERRAL); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:incomingreferral". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INCOMINGREFERRAL = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:incomingreferral").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Patient for this episode of care
+ * Type: reference
+ * Path: EpisodeOfCare.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="EpisodeOfCare.patient", description="Patient for this episode of care", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient for this episode of care
+ * Type: reference
+ * Path: EpisodeOfCare.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:patient").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization that has assumed the specific responsibilities of this EpisodeOfCare
+ * Type: reference
+ * Path: EpisodeOfCare.managingOrganization
+ *

+ */ @SearchParamDefinition(name="organization", path="EpisodeOfCare.managingOrganization", description="The organization that has assumed the specific responsibilities of this EpisodeOfCare", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization that has assumed the specific responsibilities of this EpisodeOfCare
+ * Type: reference
+ * Path: EpisodeOfCare.managingOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:organization").toLocked(); + /** + * Search parameter: team-member + *

+ * Description: A Practitioner or Organization allocated to the care team for this EpisodeOfCare
+ * Type: reference
+ * Path: EpisodeOfCare.careTeam.member
+ *

+ */ @SearchParamDefinition(name="team-member", path="EpisodeOfCare.careTeam.member", description="A Practitioner or Organization allocated to the care team for this EpisodeOfCare", type="reference" ) public static final String SP_TEAM_MEMBER = "team-member"; + /** + * Fluent Client search parameter constant for team-member + *

+ * Description: A Practitioner or Organization allocated to the care team for this EpisodeOfCare
+ * Type: reference
+ * Path: EpisodeOfCare.careTeam.member
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TEAM_MEMBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TEAM_MEMBER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:team-member". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_TEAM_MEMBER = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:team-member").toLocked(); + /** + * Search parameter: type + *

+ * Description: Type/class - e.g. specialist referral, disease management
+ * Type: token
+ * Path: EpisodeOfCare.type
+ *

+ */ @SearchParamDefinition(name="type", path="EpisodeOfCare.type", description="Type/class - e.g. specialist referral, disease management", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Type/class - e.g. specialist referral, disease management
+ * Type: token
+ * Path: EpisodeOfCare.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: care-manager + *

+ * Description: Care manager/care co-ordinator for the patient
+ * Type: reference
+ * Path: EpisodeOfCare.careManager
+ *

+ */ @SearchParamDefinition(name="care-manager", path="EpisodeOfCare.careManager", description="Care manager/care co-ordinator for the patient", type="reference" ) public static final String SP_CARE_MANAGER = "care-manager"; + /** + * Fluent Client search parameter constant for care-manager + *

+ * Description: Care manager/care co-ordinator for the patient
+ * Type: reference
+ * Path: EpisodeOfCare.careManager
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CARE_MANAGER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CARE_MANAGER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "EpisodeOfCare:care-manager". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CARE_MANAGER = new ca.uhn.fhir.model.api.Include("EpisodeOfCare:care-manager").toLocked(); + /** + * Search parameter: status + *

+ * Description: The current status of the Episode of Care as provided (does not check the status history collection)
+ * Type: token
+ * Path: EpisodeOfCare.status
+ *

+ */ @SearchParamDefinition(name="status", path="EpisodeOfCare.status", description="The current status of the Episode of Care as provided (does not check the status history collection)", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the Episode of Care as provided (does not check the status history collection)
+ * Type: token
+ * Path: EpisodeOfCare.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java index 2082005a156..c2dae38632e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExpansionProfile.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2979,22 +2979,166 @@ public class ExpansionProfile extends DomainResource { return ResourceType.ExpansionProfile; } + /** + * Search parameter: date + *

+ * Description: The expansion profile publication date
+ * Type: date
+ * Path: ExpansionProfile.date
+ *

+ */ @SearchParamDefinition(name="date", path="ExpansionProfile.date", description="The expansion profile publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The expansion profile publication date
+ * Type: date
+ * Path: ExpansionProfile.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: The identifier for the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ExpansionProfile.identifier", description="The identifier for the expansion profile", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identifier for the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: name + *

+ * Description: The name of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.name
+ *

+ */ @SearchParamDefinition(name="name", path="ExpansionProfile.name", description="The name of the expansion profile", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: The name of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="ExpansionProfile.publisher", description="Name of the publisher of the expansion profile", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.description
+ *

+ */ @SearchParamDefinition(name="description", path="ExpansionProfile.description", description="Text search in the description of the expansion profile", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the expansion profile
+ * Type: string
+ * Path: ExpansionProfile.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.version
+ *

+ */ @SearchParamDefinition(name="version", path="ExpansionProfile.version", description="The version identifier of the expansion profile", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: The logical URL for the expansion profile
+ * Type: uri
+ * Path: ExpansionProfile.url
+ *

+ */ @SearchParamDefinition(name="url", path="ExpansionProfile.url", description="The logical URL for the expansion profile", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The logical URL for the expansion profile
+ * Type: uri
+ * Path: ExpansionProfile.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: status + *

+ * Description: The status of the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.status
+ *

+ */ @SearchParamDefinition(name="status", path="ExpansionProfile.status", description="The status of the expansion profile", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the expansion profile
+ * Type: token
+ * Path: ExpansionProfile.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java index 59add19f1bb..007fbda21e8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ExplanationOfBenefit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -8866,46 +8866,190 @@ public class ExplanationOfBenefit extends DomainResource { return ResourceType.ExplanationOfBenefit; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: ExplanationOfBenefit.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ExplanationOfBenefit.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: ExplanationOfBenefit.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: ExplanationOfBenefit.disposition
+ *

+ */ @SearchParamDefinition(name="disposition", path="ExplanationOfBenefit.disposition", description="The contents of the disposition message", type="string" ) public static final String SP_DISPOSITION = "disposition"; + /** + * Fluent Client search parameter constant for disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: ExplanationOfBenefit.disposition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION); + + /** + * Search parameter: provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: ExplanationOfBenefit.provider
+ *

+ */ @SearchParamDefinition(name="provider", path="ExplanationOfBenefit.provider", description="The reference to the provider", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: ExplanationOfBenefit.provider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ExplanationOfBenefit:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:provider").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The reference to the patient
+ * Type: reference
+ * Path: ExplanationOfBenefit.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ExplanationOfBenefit.patient", description="The reference to the patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The reference to the patient
+ * Type: reference
+ * Path: ExplanationOfBenefit.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ExplanationOfBenefit:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:patient").toLocked(); + /** + * Search parameter: created + *

+ * Description: The creation date for the EOB
+ * Type: date
+ * Path: ExplanationOfBenefit.created
+ *

+ */ @SearchParamDefinition(name="created", path="ExplanationOfBenefit.created", description="The creation date for the EOB", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date for the EOB
+ * Type: date
+ * Path: ExplanationOfBenefit.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: ExplanationOfBenefit.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="ExplanationOfBenefit.organization", description="The reference to the providing organization", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The reference to the providing organization
+ * Type: reference
+ * Path: ExplanationOfBenefit.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ExplanationOfBenefit:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:organization").toLocked(); + /** + * Search parameter: claim + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: ExplanationOfBenefit.claim
+ *

+ */ @SearchParamDefinition(name="claim", path="ExplanationOfBenefit.claim", description="The reference to the claim", type="reference" ) public static final String SP_CLAIM = "claim"; + /** + * Fluent Client search parameter constant for claim + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: ExplanationOfBenefit.claim
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CLAIM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CLAIM); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ExplanationOfBenefit:claim". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CLAIM = new ca.uhn.fhir.model.api.Include("ExplanationOfBenefit:claim").toLocked(); + /** + * Search parameter: facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: ExplanationOfBenefit.facility
+ *

+ */ @SearchParamDefinition(name="facility", path="ExplanationOfBenefit.facility", description="Facility responsible for the goods and services", type="reference" ) public static final String SP_FACILITY = "facility"; + /** + * Fluent Client search parameter constant for facility + *

+ * Description: Facility responsible for the goods and services
+ * Type: reference
+ * Path: ExplanationOfBenefit.facility
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FACILITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FACILITY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ExplanationOfBenefit:facility". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java index 5be7b0bd890..80190bb1fa9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Extension.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/FamilyMemberHistory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/FamilyMemberHistory.java index e4244962787..cc8288f3c05 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/FamilyMemberHistory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1327,24 +1327,132 @@ public class FamilyMemberHistory extends DomainResource { return ResourceType.FamilyMemberHistory; } + /** + * Search parameter: date + *

+ * Description: When history was captured/updated
+ * Type: date
+ * Path: FamilyMemberHistory.date
+ *

+ */ @SearchParamDefinition(name="date", path="FamilyMemberHistory.date", description="When history was captured/updated", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When history was captured/updated
+ * Type: date
+ * Path: FamilyMemberHistory.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: A search by a record identifier
+ * Type: token
+ * Path: FamilyMemberHistory.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="FamilyMemberHistory.identifier", description="A search by a record identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A search by a record identifier
+ * Type: token
+ * Path: FamilyMemberHistory.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A search by a condition code
+ * Type: token
+ * Path: FamilyMemberHistory.condition.code
+ *

+ */ @SearchParamDefinition(name="code", path="FamilyMemberHistory.condition.code", description="A search by a condition code", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A search by a condition code
+ * Type: token
+ * Path: FamilyMemberHistory.condition.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: gender + *

+ * Description: A search by a gender code of a family member
+ * Type: token
+ * Path: FamilyMemberHistory.gender
+ *

+ */ @SearchParamDefinition(name="gender", path="FamilyMemberHistory.gender", description="A search by a gender code of a family member", type="token" ) public static final String SP_GENDER = "gender"; + /** + * Fluent Client search parameter constant for gender + *

+ * Description: A search by a gender code of a family member
+ * Type: token
+ * Path: FamilyMemberHistory.gender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENDER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENDER); + + /** + * Search parameter: patient + *

+ * Description: The identity of a subject to list family member history items for
+ * Type: reference
+ * Path: FamilyMemberHistory.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="FamilyMemberHistory.patient", description="The identity of a subject to list family member history items for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a subject to list family member history items for
+ * Type: reference
+ * Path: FamilyMemberHistory.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "FamilyMemberHistory:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("FamilyMemberHistory:patient").toLocked(); + /** + * Search parameter: relationship + *

+ * Description: A search by a relationship type
+ * Type: token
+ * Path: FamilyMemberHistory.relationship
+ *

+ */ @SearchParamDefinition(name="relationship", path="FamilyMemberHistory.relationship", description="A search by a relationship type", type="token" ) public static final String SP_RELATIONSHIP = "relationship"; + /** + * Fluent Client search parameter constant for relationship + *

+ * Description: A search by a relationship type
+ * Type: token
+ * Path: FamilyMemberHistory.relationship
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATIONSHIP = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATIONSHIP); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Flag.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Flag.java index 7e0a2c3be4e..6f914099d15 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Flag.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Flag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -650,34 +650,124 @@ public class Flag extends DomainResource { return ResourceType.Flag; } + /** + * Search parameter: date + *

+ * Description: Time period when flag is active
+ * Type: date
+ * Path: Flag.period
+ *

+ */ @SearchParamDefinition(name="date", path="Flag.period", description="Time period when flag is active", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Time period when flag is active
+ * Type: date
+ * Path: Flag.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: subject + *

+ * Description: The identity of a subject to list flags for
+ * Type: reference
+ * Path: Flag.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Flag.subject", description="The identity of a subject to list flags for", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The identity of a subject to list flags for
+ * Type: reference
+ * Path: Flag.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Flag:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Flag:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The identity of a subject to list flags for
+ * Type: reference
+ * Path: Flag.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Flag.subject", description="The identity of a subject to list flags for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a subject to list flags for
+ * Type: reference
+ * Path: Flag.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Flag:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Flag:patient").toLocked(); + /** + * Search parameter: author + *

+ * Description: Flag creator
+ * Type: reference
+ * Path: Flag.author
+ *

+ */ @SearchParamDefinition(name="author", path="Flag.author", description="Flag creator", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Flag creator
+ * Type: reference
+ * Path: Flag.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Flag:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("Flag:author").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Alert relevant during encounter
+ * Type: reference
+ * Path: Flag.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Flag.encounter", description="Alert relevant during encounter", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Alert relevant during encounter
+ * Type: reference
+ * Path: Flag.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Flag:encounter". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Goal.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Goal.java index 92b18f1b954..018a6645d94 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Goal.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Goal.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1271,30 +1271,138 @@ public class Goal extends DomainResource { return ResourceType.Goal; } + /** + * Search parameter: identifier + *

+ * Description: External Ids for this goal
+ * Type: token
+ * Path: Goal.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Goal.identifier", description="External Ids for this goal", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External Ids for this goal
+ * Type: token
+ * Path: Goal.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: patient + *

+ * Description: Who this goal is intended for
+ * Type: reference
+ * Path: Goal.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Goal.subject", description="Who this goal is intended for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who this goal is intended for
+ * Type: reference
+ * Path: Goal.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Goal:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Goal:patient").toLocked(); + /** + * Search parameter: subject + *

+ * Description: Who this goal is intended for
+ * Type: reference
+ * Path: Goal.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Goal.subject", description="Who this goal is intended for", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who this goal is intended for
+ * Type: reference
+ * Path: Goal.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Goal:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Goal:subject").toLocked(); + /** + * Search parameter: targetdate + *

+ * Description: Reach goal on or before
+ * Type: date
+ * Path: Goal.targetDate
+ *

+ */ @SearchParamDefinition(name="targetdate", path="Goal.targetDate", description="Reach goal on or before", type="date" ) public static final String SP_TARGETDATE = "targetdate"; + /** + * Fluent Client search parameter constant for targetdate + *

+ * Description: Reach goal on or before
+ * Type: date
+ * Path: Goal.targetDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam TARGETDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_TARGETDATE); + + /** + * Search parameter: category + *

+ * Description: E.g. Treatment, dietary, behavioral, etc.
+ * Type: token
+ * Path: Goal.category
+ *

+ */ @SearchParamDefinition(name="category", path="Goal.category", description="E.g. Treatment, dietary, behavioral, etc.", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: E.g. Treatment, dietary, behavioral, etc.
+ * Type: token
+ * Path: Goal.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: status + *

+ * Description: proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled
+ * Type: token
+ * Path: Goal.status
+ *

+ */ @SearchParamDefinition(name="status", path="Goal.status", description="proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: proposed | planned | accepted | rejected | in-progress | achieved | sustaining | on-hold | cancelled
+ * Type: token
+ * Path: Goal.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Group.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Group.java index 311be5fa9fc..eb253a533f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Group.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Group.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1277,30 +1277,192 @@ public class Group extends DomainResource { return ResourceType.Group; } + /** + * Search parameter: actual + *

+ * Description: Descriptive or actual
+ * Type: token
+ * Path: Group.actual
+ *

+ */ @SearchParamDefinition(name="actual", path="Group.actual", description="Descriptive or actual", type="token" ) public static final String SP_ACTUAL = "actual"; + /** + * Fluent Client search parameter constant for actual + *

+ * Description: Descriptive or actual
+ * Type: token
+ * Path: Group.actual
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTUAL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTUAL); + + /** + * Search parameter: identifier + *

+ * Description: Unique id
+ * Type: token
+ * Path: Group.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Group.identifier", description="Unique id", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique id
+ * Type: token
+ * Path: Group.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: characteristic-value + *

+ * Description: A composite of both characteristic and value
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="characteristic-value", path="", description="A composite of both characteristic and value", type="composite" ) public static final String SP_CHARACTERISTIC_VALUE = "characteristic-value"; + /** + * Fluent Client search parameter constant for characteristic-value + *

+ * Description: A composite of both characteristic and value
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CHARACTERISTIC_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CHARACTERISTIC_VALUE); + + /** + * Search parameter: code + *

+ * Description: The kind of resources contained
+ * Type: token
+ * Path: Group.code
+ *

+ */ @SearchParamDefinition(name="code", path="Group.code", description="The kind of resources contained", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: The kind of resources contained
+ * Type: token
+ * Path: Group.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: member + *

+ * Description: Reference to the group member
+ * Type: reference
+ * Path: Group.member.entity
+ *

+ */ @SearchParamDefinition(name="member", path="Group.member.entity", description="Reference to the group member", type="reference" ) public static final String SP_MEMBER = "member"; + /** + * Fluent Client search parameter constant for member + *

+ * Description: Reference to the group member
+ * Type: reference
+ * Path: Group.member.entity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEMBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEMBER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Group:member". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MEMBER = new ca.uhn.fhir.model.api.Include("Group:member").toLocked(); + /** + * Search parameter: exclude + *

+ * Description: Group includes or excludes
+ * Type: token
+ * Path: Group.characteristic.exclude
+ *

+ */ @SearchParamDefinition(name="exclude", path="Group.characteristic.exclude", description="Group includes or excludes", type="token" ) public static final String SP_EXCLUDE = "exclude"; + /** + * Fluent Client search parameter constant for exclude + *

+ * Description: Group includes or excludes
+ * Type: token
+ * Path: Group.characteristic.exclude
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EXCLUDE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EXCLUDE); + + /** + * Search parameter: type + *

+ * Description: The type of resources the group contains
+ * Type: token
+ * Path: Group.type
+ *

+ */ @SearchParamDefinition(name="type", path="Group.type", description="The type of resources the group contains", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The type of resources the group contains
+ * Type: token
+ * Path: Group.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: value + *

+ * Description: Value held by characteristic
+ * Type: token
+ * Path: Group.characteristic.value[x]
+ *

+ */ @SearchParamDefinition(name="value", path="Group.characteristic.value[x]", description="Value held by characteristic", type="token" ) public static final String SP_VALUE = "value"; + /** + * Fluent Client search parameter constant for value + *

+ * Description: Value held by characteristic
+ * Type: token
+ * Path: Group.characteristic.value[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VALUE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VALUE); + + /** + * Search parameter: characteristic + *

+ * Description: Kind of characteristic
+ * Type: token
+ * Path: Group.characteristic.code
+ *

+ */ @SearchParamDefinition(name="characteristic", path="Group.characteristic.code", description="Kind of characteristic", type="token" ) public static final String SP_CHARACTERISTIC = "characteristic"; + /** + * Fluent Client search parameter constant for characteristic + *

+ * Description: Kind of characteristic
+ * Type: token
+ * Path: Group.characteristic.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CHARACTERISTIC = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CHARACTERISTIC); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/GuidanceResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/GuidanceResponse.java index 73213aa5f07..34d90c249ad 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/GuidanceResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/GuidanceResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HealthcareService.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HealthcareService.java index afdb2243e21..0804a48796a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HealthcareService.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HealthcareService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2282,34 +2282,178 @@ public class HealthcareService extends DomainResource { return ResourceType.HealthcareService; } + /** + * Search parameter: identifier + *

+ * Description: External identifiers for this item
+ * Type: token
+ * Path: HealthcareService.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="HealthcareService.identifier", description="External identifiers for this item", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External identifiers for this item
+ * Type: token
+ * Path: HealthcareService.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: servicecategory + *

+ * Description: Service Category of the Healthcare Service
+ * Type: token
+ * Path: HealthcareService.serviceCategory
+ *

+ */ @SearchParamDefinition(name="servicecategory", path="HealthcareService.serviceCategory", description="Service Category of the Healthcare Service", type="token" ) public static final String SP_SERVICECATEGORY = "servicecategory"; + /** + * Fluent Client search parameter constant for servicecategory + *

+ * Description: Service Category of the Healthcare Service
+ * Type: token
+ * Path: HealthcareService.serviceCategory
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SERVICECATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SERVICECATEGORY); + + /** + * Search parameter: servicetype + *

+ * Description: The type of service provided by this healthcare service
+ * Type: token
+ * Path: HealthcareService.serviceType.type
+ *

+ */ @SearchParamDefinition(name="servicetype", path="HealthcareService.serviceType.type", description="The type of service provided by this healthcare service", type="token" ) public static final String SP_SERVICETYPE = "servicetype"; + /** + * Fluent Client search parameter constant for servicetype + *

+ * Description: The type of service provided by this healthcare service
+ * Type: token
+ * Path: HealthcareService.serviceType.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SERVICETYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SERVICETYPE); + + /** + * Search parameter: organization + *

+ * Description: The organization that provides this Healthcare Service
+ * Type: reference
+ * Path: HealthcareService.providedBy
+ *

+ */ @SearchParamDefinition(name="organization", path="HealthcareService.providedBy", description="The organization that provides this Healthcare Service", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization that provides this Healthcare Service
+ * Type: reference
+ * Path: HealthcareService.providedBy
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "HealthcareService:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("HealthcareService:organization").toLocked(); + /** + * Search parameter: name + *

+ * Description: A portion of the Healthcare service name
+ * Type: string
+ * Path: HealthcareService.serviceName
+ *

+ */ @SearchParamDefinition(name="name", path="HealthcareService.serviceName", description="A portion of the Healthcare service name", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of the Healthcare service name
+ * Type: string
+ * Path: HealthcareService.serviceName
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: programname + *

+ * Description: One of the Program Names serviced by this HealthcareService
+ * Type: string
+ * Path: HealthcareService.programName
+ *

+ */ @SearchParamDefinition(name="programname", path="HealthcareService.programName", description="One of the Program Names serviced by this HealthcareService", type="string" ) public static final String SP_PROGRAMNAME = "programname"; + /** + * Fluent Client search parameter constant for programname + *

+ * Description: One of the Program Names serviced by this HealthcareService
+ * Type: string
+ * Path: HealthcareService.programName
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PROGRAMNAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PROGRAMNAME); + + /** + * Search parameter: location + *

+ * Description: The location of the Healthcare Service
+ * Type: reference
+ * Path: HealthcareService.location
+ *

+ */ @SearchParamDefinition(name="location", path="HealthcareService.location", description="The location of the Healthcare Service", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: The location of the Healthcare Service
+ * Type: reference
+ * Path: HealthcareService.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "HealthcareService:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("HealthcareService:location").toLocked(); + /** + * Search parameter: characteristic + *

+ * Description: One of the HealthcareService's characteristics
+ * Type: token
+ * Path: HealthcareService.characteristic
+ *

+ */ @SearchParamDefinition(name="characteristic", path="HealthcareService.characteristic", description="One of the HealthcareService's characteristics", type="token" ) public static final String SP_CHARACTERISTIC = "characteristic"; + /** + * Fluent Client search parameter constant for characteristic + *

+ * Description: One of the HealthcareService's characteristics
+ * Type: token
+ * Path: HealthcareService.characteristic
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CHARACTERISTIC = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CHARACTERISTIC); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HumanName.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HumanName.java index 0693e80308f..92a12212789 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HumanName.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/HumanName.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/IdType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/IdType.java index cf96177e94f..f70373d42c0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/IdType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/IdType.java @@ -737,4 +737,26 @@ public final class IdType extends UriType implements IPrimitiveType, IId public String fhirType() { return "id"; } + + public IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart) { + if (isNotBlank(theVersionIdPart)) { + Validate.notBlank(theResourceType, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + Validate.notBlank(theIdPart, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + } + if (isNotBlank(theBaseUrl) && isNotBlank(theIdPart)) { + Validate.notBlank(theResourceType, "If theBaseUrl is populated and theIdPart is populated, theResourceType must be populated"); + } + + setValue(null); + + myBaseUrl = theBaseUrl; + myResourceType = theResourceType; + myUnqualifiedId = theIdPart; + myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionIdPart, null); + myHaveComponentParts = true; + + return this; + } + + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Identifier.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Identifier.java index 610e515c81e..b7a49b9c9cf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Identifier.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Identifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingObjectSelection.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingObjectSelection.java index 7659797d5f9..32e848979fb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingObjectSelection.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1621,30 +1621,138 @@ public class ImagingObjectSelection extends DomainResource { return ResourceType.ImagingObjectSelection; } + /** + * Search parameter: identifier + *

+ * Description: UID of key DICOM object selection
+ * Type: uri
+ * Path: ImagingObjectSelection.uid
+ *

+ */ @SearchParamDefinition(name="identifier", path="ImagingObjectSelection.uid", description="UID of key DICOM object selection", type="uri" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: UID of key DICOM object selection
+ * Type: uri
+ * Path: ImagingObjectSelection.uid
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_IDENTIFIER); + + /** + * Search parameter: authoring-time + *

+ * Description: Time of key DICOM object selection authoring
+ * Type: date
+ * Path: ImagingObjectSelection.authoringTime
+ *

+ */ @SearchParamDefinition(name="authoring-time", path="ImagingObjectSelection.authoringTime", description="Time of key DICOM object selection authoring", type="date" ) public static final String SP_AUTHORING_TIME = "authoring-time"; + /** + * Fluent Client search parameter constant for authoring-time + *

+ * Description: Time of key DICOM object selection authoring
+ * Type: date
+ * Path: ImagingObjectSelection.authoringTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam AUTHORING_TIME = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_AUTHORING_TIME); + + /** + * Search parameter: selected-study + *

+ * Description: Study selected in key DICOM object selection
+ * Type: uri
+ * Path: ImagingObjectSelection.study.uid
+ *

+ */ @SearchParamDefinition(name="selected-study", path="ImagingObjectSelection.study.uid", description="Study selected in key DICOM object selection", type="uri" ) public static final String SP_SELECTED_STUDY = "selected-study"; + /** + * Fluent Client search parameter constant for selected-study + *

+ * Description: Study selected in key DICOM object selection
+ * Type: uri
+ * Path: ImagingObjectSelection.study.uid
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SELECTED_STUDY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SELECTED_STUDY); + + /** + * Search parameter: author + *

+ * Description: Author of key DICOM object selection
+ * Type: reference
+ * Path: ImagingObjectSelection.author
+ *

+ */ @SearchParamDefinition(name="author", path="ImagingObjectSelection.author", description="Author of key DICOM object selection", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: Author of key DICOM object selection
+ * Type: reference
+ * Path: ImagingObjectSelection.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImagingObjectSelection:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("ImagingObjectSelection:author").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Subject of key DICOM object selection
+ * Type: reference
+ * Path: ImagingObjectSelection.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ImagingObjectSelection.patient", description="Subject of key DICOM object selection", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Subject of key DICOM object selection
+ * Type: reference
+ * Path: ImagingObjectSelection.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImagingObjectSelection:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ImagingObjectSelection:patient").toLocked(); + /** + * Search parameter: title + *

+ * Description: Title of key DICOM object selection
+ * Type: token
+ * Path: ImagingObjectSelection.title
+ *

+ */ @SearchParamDefinition(name="title", path="ImagingObjectSelection.title", description="Title of key DICOM object selection", type="token" ) public static final String SP_TITLE = "title"; + /** + * Fluent Client search parameter constant for title + *

+ * Description: Title of key DICOM object selection
+ * Type: token
+ * Path: ImagingObjectSelection.title
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TITLE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TITLE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingStudy.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingStudy.java index e4b8d285c62..ee0559c98bc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingStudy.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImagingStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2389,32 +2389,212 @@ public class ImagingStudy extends DomainResource { return ResourceType.ImagingStudy; } + /** + * Search parameter: uid + *

+ * Description: The instance unique identifier
+ * Type: uri
+ * Path: ImagingStudy.series.instance.uid
+ *

+ */ @SearchParamDefinition(name="uid", path="ImagingStudy.series.instance.uid", description="The instance unique identifier", type="uri" ) public static final String SP_UID = "uid"; + /** + * Fluent Client search parameter constant for uid + *

+ * Description: The instance unique identifier
+ * Type: uri
+ * Path: ImagingStudy.series.instance.uid
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam UID = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_UID); + + /** + * Search parameter: study + *

+ * Description: The study identifier for the image
+ * Type: uri
+ * Path: ImagingStudy.uid
+ *

+ */ @SearchParamDefinition(name="study", path="ImagingStudy.uid", description="The study identifier for the image", type="uri" ) public static final String SP_STUDY = "study"; + /** + * Fluent Client search parameter constant for study + *

+ * Description: The study identifier for the image
+ * Type: uri
+ * Path: ImagingStudy.uid
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam STUDY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_STUDY); + + /** + * Search parameter: dicom-class + *

+ * Description: The type of the instance
+ * Type: uri
+ * Path: ImagingStudy.series.instance.sopClass
+ *

+ */ @SearchParamDefinition(name="dicom-class", path="ImagingStudy.series.instance.sopClass", description="The type of the instance", type="uri" ) public static final String SP_DICOM_CLASS = "dicom-class"; + /** + * Fluent Client search parameter constant for dicom-class + *

+ * Description: The type of the instance
+ * Type: uri
+ * Path: ImagingStudy.series.instance.sopClass
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam DICOM_CLASS = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DICOM_CLASS); + + /** + * Search parameter: modality + *

+ * Description: The modality of the series
+ * Type: token
+ * Path: ImagingStudy.series.modality
+ *

+ */ @SearchParamDefinition(name="modality", path="ImagingStudy.series.modality", description="The modality of the series", type="token" ) public static final String SP_MODALITY = "modality"; + /** + * Fluent Client search parameter constant for modality + *

+ * Description: The modality of the series
+ * Type: token
+ * Path: ImagingStudy.series.modality
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODALITY); + + /** + * Search parameter: bodysite + *

+ * Description: The body site studied
+ * Type: token
+ * Path: ImagingStudy.series.bodySite
+ *

+ */ @SearchParamDefinition(name="bodysite", path="ImagingStudy.series.bodySite", description="The body site studied", type="token" ) public static final String SP_BODYSITE = "bodysite"; + /** + * Fluent Client search parameter constant for bodysite + *

+ * Description: The body site studied
+ * Type: token
+ * Path: ImagingStudy.series.bodySite
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODYSITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODYSITE); + + /** + * Search parameter: patient + *

+ * Description: Who the study is about
+ * Type: reference
+ * Path: ImagingStudy.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ImagingStudy.patient", description="Who the study is about", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who the study is about
+ * Type: reference
+ * Path: ImagingStudy.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImagingStudy:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ImagingStudy:patient").toLocked(); + /** + * Search parameter: series + *

+ * Description: The identifier of the series of images
+ * Type: uri
+ * Path: ImagingStudy.series.uid
+ *

+ */ @SearchParamDefinition(name="series", path="ImagingStudy.series.uid", description="The identifier of the series of images", type="uri" ) public static final String SP_SERIES = "series"; + /** + * Fluent Client search parameter constant for series + *

+ * Description: The identifier of the series of images
+ * Type: uri
+ * Path: ImagingStudy.series.uid
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SERIES = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SERIES); + + /** + * Search parameter: started + *

+ * Description: When the study was started
+ * Type: date
+ * Path: ImagingStudy.started
+ *

+ */ @SearchParamDefinition(name="started", path="ImagingStudy.started", description="When the study was started", type="date" ) public static final String SP_STARTED = "started"; + /** + * Fluent Client search parameter constant for started + *

+ * Description: When the study was started
+ * Type: date
+ * Path: ImagingStudy.started
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam STARTED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_STARTED); + + /** + * Search parameter: accession + *

+ * Description: The accession identifier for the study
+ * Type: token
+ * Path: ImagingStudy.accession
+ *

+ */ @SearchParamDefinition(name="accession", path="ImagingStudy.accession", description="The accession identifier for the study", type="token" ) public static final String SP_ACCESSION = "accession"; + /** + * Fluent Client search parameter constant for accession + *

+ * Description: The accession identifier for the study
+ * Type: token
+ * Path: ImagingStudy.accession
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACCESSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACCESSION); + + /** + * Search parameter: order + *

+ * Description: The order for the image
+ * Type: reference
+ * Path: ImagingStudy.order
+ *

+ */ @SearchParamDefinition(name="order", path="ImagingStudy.order", description="The order for the image", type="reference" ) public static final String SP_ORDER = "order"; + /** + * Fluent Client search parameter constant for order + *

+ * Description: The order for the image
+ * Type: reference
+ * Path: ImagingStudy.order
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImagingStudy:order". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Immunization.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Immunization.java index a05894215be..e234422c8da 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Immunization.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Immunization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2281,74 +2281,362 @@ public class Immunization extends DomainResource { return ResourceType.Immunization; } + /** + * Search parameter: date + *

+ * Description: Vaccination (non)-Administration Date
+ * Type: date
+ * Path: Immunization.date
+ *

+ */ @SearchParamDefinition(name="date", path="Immunization.date", description="Vaccination (non)-Administration Date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Vaccination (non)-Administration Date
+ * Type: date
+ * Path: Immunization.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: requester + *

+ * Description: The practitioner who ordered the vaccination
+ * Type: reference
+ * Path: Immunization.requester
+ *

+ */ @SearchParamDefinition(name="requester", path="Immunization.requester", description="The practitioner who ordered the vaccination", type="reference" ) public static final String SP_REQUESTER = "requester"; + /** + * Fluent Client search parameter constant for requester + *

+ * Description: The practitioner who ordered the vaccination
+ * Type: reference
+ * Path: Immunization.requester
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:requester". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTER = new ca.uhn.fhir.model.api.Include("Immunization:requester").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: Immunization.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Immunization.identifier", description="Business identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: Immunization.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: reason + *

+ * Description: Why immunization occurred
+ * Type: token
+ * Path: Immunization.explanation.reason
+ *

+ */ @SearchParamDefinition(name="reason", path="Immunization.explanation.reason", description="Why immunization occurred", type="token" ) public static final String SP_REASON = "reason"; + /** + * Fluent Client search parameter constant for reason + *

+ * Description: Why immunization occurred
+ * Type: token
+ * Path: Immunization.explanation.reason
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON); + + /** + * Search parameter: performer + *

+ * Description: The practitioner who administered the vaccination
+ * Type: reference
+ * Path: Immunization.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="Immunization.performer", description="The practitioner who administered the vaccination", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: The practitioner who administered the vaccination
+ * Type: reference
+ * Path: Immunization.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("Immunization:performer").toLocked(); + /** + * Search parameter: reaction + *

+ * Description: Additional information on reaction
+ * Type: reference
+ * Path: Immunization.reaction.detail
+ *

+ */ @SearchParamDefinition(name="reaction", path="Immunization.reaction.detail", description="Additional information on reaction", type="reference" ) public static final String SP_REACTION = "reaction"; + /** + * Fluent Client search parameter constant for reaction + *

+ * Description: Additional information on reaction
+ * Type: reference
+ * Path: Immunization.reaction.detail
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REACTION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REACTION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:reaction". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REACTION = new ca.uhn.fhir.model.api.Include("Immunization:reaction").toLocked(); + /** + * Search parameter: lot-number + *

+ * Description: Vaccine Lot Number
+ * Type: string
+ * Path: Immunization.lotNumber
+ *

+ */ @SearchParamDefinition(name="lot-number", path="Immunization.lotNumber", description="Vaccine Lot Number", type="string" ) public static final String SP_LOT_NUMBER = "lot-number"; + /** + * Fluent Client search parameter constant for lot-number + *

+ * Description: Vaccine Lot Number
+ * Type: string
+ * Path: Immunization.lotNumber
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam LOT_NUMBER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_LOT_NUMBER); + + /** + * Search parameter: notgiven + *

+ * Description: Administrations which were not given
+ * Type: token
+ * Path: Immunization.wasNotGiven
+ *

+ */ @SearchParamDefinition(name="notgiven", path="Immunization.wasNotGiven", description="Administrations which were not given", type="token" ) public static final String SP_NOTGIVEN = "notgiven"; + /** + * Fluent Client search parameter constant for notgiven + *

+ * Description: Administrations which were not given
+ * Type: token
+ * Path: Immunization.wasNotGiven
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam NOTGIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NOTGIVEN); + + /** + * Search parameter: manufacturer + *

+ * Description: Vaccine Manufacturer
+ * Type: reference
+ * Path: Immunization.manufacturer
+ *

+ */ @SearchParamDefinition(name="manufacturer", path="Immunization.manufacturer", description="Vaccine Manufacturer", type="reference" ) public static final String SP_MANUFACTURER = "manufacturer"; + /** + * Fluent Client search parameter constant for manufacturer + *

+ * Description: Vaccine Manufacturer
+ * Type: reference
+ * Path: Immunization.manufacturer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANUFACTURER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANUFACTURER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:manufacturer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MANUFACTURER = new ca.uhn.fhir.model.api.Include("Immunization:manufacturer").toLocked(); + /** + * Search parameter: dose-sequence + *

+ * Description: Dose number within series
+ * Type: number
+ * Path: Immunization.vaccinationProtocol.doseSequence
+ *

+ */ @SearchParamDefinition(name="dose-sequence", path="Immunization.vaccinationProtocol.doseSequence", description="Dose number within series", type="number" ) public static final String SP_DOSE_SEQUENCE = "dose-sequence"; + /** + * Fluent Client search parameter constant for dose-sequence + *

+ * Description: Dose number within series
+ * Type: number
+ * Path: Immunization.vaccinationProtocol.doseSequence
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam DOSE_SEQUENCE = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_DOSE_SEQUENCE); + + /** + * Search parameter: patient + *

+ * Description: The patient for the vaccination record
+ * Type: reference
+ * Path: Immunization.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="Immunization.patient", description="The patient for the vaccination record", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient for the vaccination record
+ * Type: reference
+ * Path: Immunization.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Immunization:patient").toLocked(); + /** + * Search parameter: vaccine-code + *

+ * Description: Vaccine Product Administered
+ * Type: token
+ * Path: Immunization.vaccineCode
+ *

+ */ @SearchParamDefinition(name="vaccine-code", path="Immunization.vaccineCode", description="Vaccine Product Administered", type="token" ) public static final String SP_VACCINE_CODE = "vaccine-code"; + /** + * Fluent Client search parameter constant for vaccine-code + *

+ * Description: Vaccine Product Administered
+ * Type: token
+ * Path: Immunization.vaccineCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VACCINE_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VACCINE_CODE); + + /** + * Search parameter: reason-not-given + *

+ * Description: Explanation of reason vaccination was not administered
+ * Type: token
+ * Path: Immunization.explanation.reasonNotGiven
+ *

+ */ @SearchParamDefinition(name="reason-not-given", path="Immunization.explanation.reasonNotGiven", description="Explanation of reason vaccination was not administered", type="token" ) public static final String SP_REASON_NOT_GIVEN = "reason-not-given"; + /** + * Fluent Client search parameter constant for reason-not-given + *

+ * Description: Explanation of reason vaccination was not administered
+ * Type: token
+ * Path: Immunization.explanation.reasonNotGiven
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON_NOT_GIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON_NOT_GIVEN); + + /** + * Search parameter: location + *

+ * Description: The service delivery location or facility in which the vaccine was / was to be administered
+ * Type: reference
+ * Path: Immunization.location
+ *

+ */ @SearchParamDefinition(name="location", path="Immunization.location", description="The service delivery location or facility in which the vaccine was / was to be administered", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: The service delivery location or facility in which the vaccine was / was to be administered
+ * Type: reference
+ * Path: Immunization.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Immunization:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Immunization:location").toLocked(); + /** + * Search parameter: reaction-date + *

+ * Description: When reaction started
+ * Type: date
+ * Path: Immunization.reaction.date
+ *

+ */ @SearchParamDefinition(name="reaction-date", path="Immunization.reaction.date", description="When reaction started", type="date" ) public static final String SP_REACTION_DATE = "reaction-date"; + /** + * Fluent Client search parameter constant for reaction-date + *

+ * Description: When reaction started
+ * Type: date
+ * Path: Immunization.reaction.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam REACTION_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_REACTION_DATE); + + /** + * Search parameter: status + *

+ * Description: Immunization event status
+ * Type: token
+ * Path: Immunization.status
+ *

+ */ @SearchParamDefinition(name="status", path="Immunization.status", description="Immunization event status", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Immunization event status
+ * Type: token
+ * Path: Immunization.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImmunizationRecommendation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImmunizationRecommendation.java index 8df7c317c26..b0a10263573 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImmunizationRecommendation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1324,42 +1324,204 @@ public class ImmunizationRecommendation extends DomainResource { return ResourceType.ImmunizationRecommendation; } + /** + * Search parameter: date + *

+ * Description: Date recommendation created
+ * Type: date
+ * Path: ImmunizationRecommendation.recommendation.date
+ *

+ */ @SearchParamDefinition(name="date", path="ImmunizationRecommendation.recommendation.date", description="Date recommendation created", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Date recommendation created
+ * Type: date
+ * Path: ImmunizationRecommendation.recommendation.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: ImmunizationRecommendation.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ImmunizationRecommendation.identifier", description="Business identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Business identifier
+ * Type: token
+ * Path: ImmunizationRecommendation.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: dose-sequence + *

+ * Description: Dose number within sequence
+ * Type: number
+ * Path: ImmunizationRecommendation.recommendation.protocol.doseSequence
+ *

+ */ @SearchParamDefinition(name="dose-sequence", path="ImmunizationRecommendation.recommendation.protocol.doseSequence", description="Dose number within sequence", type="number" ) public static final String SP_DOSE_SEQUENCE = "dose-sequence"; + /** + * Fluent Client search parameter constant for dose-sequence + *

+ * Description: Dose number within sequence
+ * Type: number
+ * Path: ImmunizationRecommendation.recommendation.protocol.doseSequence
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam DOSE_SEQUENCE = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_DOSE_SEQUENCE); + + /** + * Search parameter: patient + *

+ * Description: Who this profile is for
+ * Type: reference
+ * Path: ImmunizationRecommendation.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ImmunizationRecommendation.patient", description="Who this profile is for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who this profile is for
+ * Type: reference
+ * Path: ImmunizationRecommendation.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImmunizationRecommendation:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ImmunizationRecommendation:patient").toLocked(); + /** + * Search parameter: vaccine-type + *

+ * Description: Vaccine recommendation applies to
+ * Type: token
+ * Path: ImmunizationRecommendation.recommendation.vaccineCode
+ *

+ */ @SearchParamDefinition(name="vaccine-type", path="ImmunizationRecommendation.recommendation.vaccineCode", description="Vaccine recommendation applies to", type="token" ) public static final String SP_VACCINE_TYPE = "vaccine-type"; + /** + * Fluent Client search parameter constant for vaccine-type + *

+ * Description: Vaccine recommendation applies to
+ * Type: token
+ * Path: ImmunizationRecommendation.recommendation.vaccineCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VACCINE_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VACCINE_TYPE); + + /** + * Search parameter: dose-number + *

+ * Description: Recommended dose number
+ * Type: number
+ * Path: ImmunizationRecommendation.recommendation.doseNumber
+ *

+ */ @SearchParamDefinition(name="dose-number", path="ImmunizationRecommendation.recommendation.doseNumber", description="Recommended dose number", type="number" ) public static final String SP_DOSE_NUMBER = "dose-number"; + /** + * Fluent Client search parameter constant for dose-number + *

+ * Description: Recommended dose number
+ * Type: number
+ * Path: ImmunizationRecommendation.recommendation.doseNumber
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam DOSE_NUMBER = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_DOSE_NUMBER); + + /** + * Search parameter: information + *

+ * Description: Patient observations supporting recommendation
+ * Type: reference
+ * Path: ImmunizationRecommendation.recommendation.supportingPatientInformation
+ *

+ */ @SearchParamDefinition(name="information", path="ImmunizationRecommendation.recommendation.supportingPatientInformation", description="Patient observations supporting recommendation", type="reference" ) public static final String SP_INFORMATION = "information"; + /** + * Fluent Client search parameter constant for information + *

+ * Description: Patient observations supporting recommendation
+ * Type: reference
+ * Path: ImmunizationRecommendation.recommendation.supportingPatientInformation
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INFORMATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INFORMATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImmunizationRecommendation:information". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INFORMATION = new ca.uhn.fhir.model.api.Include("ImmunizationRecommendation:information").toLocked(); + /** + * Search parameter: support + *

+ * Description: Past immunizations supporting recommendation
+ * Type: reference
+ * Path: ImmunizationRecommendation.recommendation.supportingImmunization
+ *

+ */ @SearchParamDefinition(name="support", path="ImmunizationRecommendation.recommendation.supportingImmunization", description="Past immunizations supporting recommendation", type="reference" ) public static final String SP_SUPPORT = "support"; + /** + * Fluent Client search parameter constant for support + *

+ * Description: Past immunizations supporting recommendation
+ * Type: reference
+ * Path: ImmunizationRecommendation.recommendation.supportingImmunization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPORT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPORT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ImmunizationRecommendation:support". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORT = new ca.uhn.fhir.model.api.Include("ImmunizationRecommendation:support").toLocked(); + /** + * Search parameter: status + *

+ * Description: Vaccine administration status
+ * Type: token
+ * Path: ImmunizationRecommendation.recommendation.forecastStatus
+ *

+ */ @SearchParamDefinition(name="status", path="ImmunizationRecommendation.recommendation.forecastStatus", description="Vaccine administration status", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Vaccine administration status
+ * Type: token
+ * Path: ImmunizationRecommendation.recommendation.forecastStatus
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImplementationGuide.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImplementationGuide.java index a00bf777acb..cd8b9de8863 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImplementationGuide.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ImplementationGuide.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -3384,26 +3384,206 @@ public class ImplementationGuide extends DomainResource { return ResourceType.ImplementationGuide; } + /** + * Search parameter: date + *

+ * Description: The implementation guide publication date
+ * Type: date
+ * Path: ImplementationGuide.date
+ *

+ */ @SearchParamDefinition(name="date", path="ImplementationGuide.date", description="The implementation guide publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The implementation guide publication date
+ * Type: date
+ * Path: ImplementationGuide.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: dependency + *

+ * Description: Where to find dependency
+ * Type: uri
+ * Path: ImplementationGuide.dependency.uri
+ *

+ */ @SearchParamDefinition(name="dependency", path="ImplementationGuide.dependency.uri", description="Where to find dependency", type="uri" ) public static final String SP_DEPENDENCY = "dependency"; + /** + * Fluent Client search parameter constant for dependency + *

+ * Description: Where to find dependency
+ * Type: uri
+ * Path: ImplementationGuide.dependency.uri
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam DEPENDENCY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DEPENDENCY); + + /** + * Search parameter: name + *

+ * Description: Name of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.name
+ *

+ */ @SearchParamDefinition(name="name", path="ImplementationGuide.name", description="Name of the implementation guide", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Name of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the structure
+ * Type: token
+ * Path: ImplementationGuide.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="ImplementationGuide.useContext", description="A use context assigned to the structure", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the structure
+ * Type: token
+ * Path: ImplementationGuide.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="ImplementationGuide.publisher", description="Name of the publisher of the implementation guide", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.description
+ *

+ */ @SearchParamDefinition(name="description", path="ImplementationGuide.description", description="Text search in the description of the implementation guide", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the implementation guide
+ * Type: string
+ * Path: ImplementationGuide.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: experimental + *

+ * Description: If for testing purposes, not real usage
+ * Type: token
+ * Path: ImplementationGuide.experimental
+ *

+ */ @SearchParamDefinition(name="experimental", path="ImplementationGuide.experimental", description="If for testing purposes, not real usage", type="token" ) public static final String SP_EXPERIMENTAL = "experimental"; + /** + * Fluent Client search parameter constant for experimental + *

+ * Description: If for testing purposes, not real usage
+ * Type: token
+ * Path: ImplementationGuide.experimental
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EXPERIMENTAL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EXPERIMENTAL); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the implementation guide
+ * Type: token
+ * Path: ImplementationGuide.version
+ *

+ */ @SearchParamDefinition(name="version", path="ImplementationGuide.version", description="The version identifier of the implementation guide", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the implementation guide
+ * Type: token
+ * Path: ImplementationGuide.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: Absolute URL used to reference this Implementation Guide
+ * Type: uri
+ * Path: ImplementationGuide.url
+ *

+ */ @SearchParamDefinition(name="url", path="ImplementationGuide.url", description="Absolute URL used to reference this Implementation Guide", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Absolute URL used to reference this Implementation Guide
+ * Type: uri
+ * Path: ImplementationGuide.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: status + *

+ * Description: The current status of the implementation guide
+ * Type: token
+ * Path: ImplementationGuide.status
+ *

+ */ @SearchParamDefinition(name="status", path="ImplementationGuide.status", description="The current status of the implementation guide", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the implementation guide
+ * Type: token
+ * Path: ImplementationGuide.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Library.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Library.java index eec3e2c4f36..d6880dd768b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Library.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Library.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ListResource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ListResource.java index 5c7a1ae5989..3c4c26d200b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ListResource.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ListResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1356,58 +1356,256 @@ public class ListResource extends DomainResource { return ResourceType.List; } + /** + * Search parameter: date + *

+ * Description: When the list was prepared
+ * Type: date
+ * Path: List.date
+ *

+ */ @SearchParamDefinition(name="date", path="List.date", description="When the list was prepared", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the list was prepared
+ * Type: date
+ * Path: List.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: item + *

+ * Description: Actual entry
+ * Type: reference
+ * Path: List.entry.item
+ *

+ */ @SearchParamDefinition(name="item", path="List.entry.item", description="Actual entry", type="reference" ) public static final String SP_ITEM = "item"; + /** + * Fluent Client search parameter constant for item + *

+ * Description: Actual entry
+ * Type: reference
+ * Path: List.entry.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ITEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ITEM); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ListResource:item". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ITEM = new ca.uhn.fhir.model.api.Include("ListResource:item").toLocked(); + /** + * Search parameter: empty-reason + *

+ * Description: Why list is empty
+ * Type: token
+ * Path: List.emptyReason
+ *

+ */ @SearchParamDefinition(name="empty-reason", path="List.emptyReason", description="Why list is empty", type="token" ) public static final String SP_EMPTY_REASON = "empty-reason"; + /** + * Fluent Client search parameter constant for empty-reason + *

+ * Description: Why list is empty
+ * Type: token
+ * Path: List.emptyReason
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EMPTY_REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EMPTY_REASON); + + /** + * Search parameter: code + *

+ * Description: What the purpose of this list is
+ * Type: token
+ * Path: List.code
+ *

+ */ @SearchParamDefinition(name="code", path="List.code", description="What the purpose of this list is", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: What the purpose of this list is
+ * Type: token
+ * Path: List.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: notes + *

+ * Description: Comments about the list
+ * Type: string
+ * Path: List.note
+ *

+ */ @SearchParamDefinition(name="notes", path="List.note", description="Comments about the list", type="string" ) public static final String SP_NOTES = "notes"; + /** + * Fluent Client search parameter constant for notes + *

+ * Description: Comments about the list
+ * Type: string
+ * Path: List.note
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NOTES = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NOTES); + + /** + * Search parameter: subject + *

+ * Description: If all resources have the same subject
+ * Type: reference
+ * Path: List.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="List.subject", description="If all resources have the same subject", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: If all resources have the same subject
+ * Type: reference
+ * Path: List.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ListResource:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("ListResource:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: If all resources have the same subject
+ * Type: reference
+ * Path: List.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="List.subject", description="If all resources have the same subject", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: If all resources have the same subject
+ * Type: reference
+ * Path: List.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ListResource:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ListResource:patient").toLocked(); + /** + * Search parameter: source + *

+ * Description: Who and/or what defined the list contents (aka Author)
+ * Type: reference
+ * Path: List.source
+ *

+ */ @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents (aka Author)", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Who and/or what defined the list contents (aka Author)
+ * Type: reference
+ * Path: List.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ListResource:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("ListResource:source").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Context in which list created
+ * Type: reference
+ * Path: List.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="List.encounter", description="Context in which list created", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Context in which list created
+ * Type: reference
+ * Path: List.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ListResource:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("ListResource:encounter").toLocked(); + /** + * Search parameter: title + *

+ * Description: Descriptive name for the list
+ * Type: string
+ * Path: List.title
+ *

+ */ @SearchParamDefinition(name="title", path="List.title", description="Descriptive name for the list", type="string" ) public static final String SP_TITLE = "title"; + /** + * Fluent Client search parameter constant for title + *

+ * Description: Descriptive name for the list
+ * Type: string
+ * Path: List.title
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE); + + /** + * Search parameter: status + *

+ * Description: current | retired | entered-in-error
+ * Type: token
+ * Path: List.status
+ *

+ */ @SearchParamDefinition(name="status", path="List.status", description="current | retired | entered-in-error", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: current | retired | entered-in-error
+ * Type: token
+ * Path: List.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Location.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Location.java index 307944ed863..fec3e680720 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Location.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1280,46 +1280,298 @@ public class Location extends DomainResource { return ResourceType.Location; } + /** + * Search parameter: identifier + *

+ * Description: Unique code or number identifying the location to its users
+ * Type: token
+ * Path: Location.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Location.identifier", description="Unique code or number identifying the location to its users", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique code or number identifying the location to its users
+ * Type: token
+ * Path: Location.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: partof + *

+ * Description: The location of which this location is a part
+ * Type: reference
+ * Path: Location.partOf
+ *

+ */ @SearchParamDefinition(name="partof", path="Location.partOf", description="The location of which this location is a part", type="reference" ) public static final String SP_PARTOF = "partof"; + /** + * Fluent Client search parameter constant for partof + *

+ * Description: The location of which this location is a part
+ * Type: reference
+ * Path: Location.partOf
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTOF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTOF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Location:partof". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTOF = new ca.uhn.fhir.model.api.Include("Location:partof").toLocked(); + /** + * Search parameter: near-distance + *

+ * Description: A distance quantity to limit the near search to locations within a specific distance
+ * Type: token
+ * Path: Location.position
+ *

+ */ @SearchParamDefinition(name="near-distance", path="Location.position", description="A distance quantity to limit the near search to locations within a specific distance", type="token" ) public static final String SP_NEAR_DISTANCE = "near-distance"; + /** + * Fluent Client search parameter constant for near-distance + *

+ * Description: A distance quantity to limit the near search to locations within a specific distance
+ * Type: token
+ * Path: Location.position
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam NEAR_DISTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NEAR_DISTANCE); + + /** + * Search parameter: address + *

+ * Description: A (part of the) address of the location
+ * Type: string
+ * Path: Location.address
+ *

+ */ @SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: A (part of the) address of the location
+ * Type: string
+ * Path: Location.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Location.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="Location.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Location.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: type + *

+ * Description: A code for the type of location
+ * Type: token
+ * Path: Location.type
+ *

+ */ @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: A code for the type of location
+ * Type: token
+ * Path: Location.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Location.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="Location.address.postalCode", description="A postal code specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Location.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Location.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="Location.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Location.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + + /** + * Search parameter: organization + *

+ * Description: Searches for locations that are managed by the provided organization
+ * Type: reference
+ * Path: Location.managingOrganization
+ *

+ */ @SearchParamDefinition(name="organization", path="Location.managingOrganization", description="Searches for locations that are managed by the provided organization", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: Searches for locations that are managed by the provided organization
+ * Type: reference
+ * Path: Location.managingOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Location:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Location:organization").toLocked(); + /** + * Search parameter: name + *

+ * Description: A (portion of the) name of the location
+ * Type: string
+ * Path: Location.name
+ *

+ */ @SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A (portion of the) name of the location
+ * Type: string
+ * Path: Location.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Location.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="Location.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Location.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: near + *

+ * Description: The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)
+ * Type: token
+ * Path: Location.position
+ *

+ */ @SearchParamDefinition(name="near", path="Location.position", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)", type="token" ) public static final String SP_NEAR = "near"; + /** + * Fluent Client search parameter constant for near + *

+ * Description: The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)
+ * Type: token
+ * Path: Location.position
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam NEAR = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NEAR); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Location.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="Location.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Location.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: status + *

+ * Description: Searches for locations with a specific kind of status
+ * Type: token
+ * Path: Location.status
+ *

+ */ @SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Searches for locations with a specific kind of status
+ * Type: token
+ * Path: Location.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Measure.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Measure.java index 246a12de587..35ff6bc7125 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Measure.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Measure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Media.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Media.java index 9f5acb9b4ee..da1b5a5d6ce 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Media.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Media.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -894,34 +894,178 @@ public class Media extends DomainResource { return ResourceType.Media; } + /** + * Search parameter: identifier + *

+ * Description: Identifier(s) for the image
+ * Type: token
+ * Path: Media.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Media.identifier", description="Identifier(s) for the image", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifier(s) for the image
+ * Type: token
+ * Path: Media.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: view + *

+ * Description: Imaging view, e.g. Lateral or Antero-posterior
+ * Type: token
+ * Path: Media.view
+ *

+ */ @SearchParamDefinition(name="view", path="Media.view", description="Imaging view, e.g. Lateral or Antero-posterior", type="token" ) public static final String SP_VIEW = "view"; + /** + * Fluent Client search parameter constant for view + *

+ * Description: Imaging view, e.g. Lateral or Antero-posterior
+ * Type: token
+ * Path: Media.view
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VIEW = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VIEW); + + /** + * Search parameter: subtype + *

+ * Description: The type of acquisition equipment/process
+ * Type: token
+ * Path: Media.subtype
+ *

+ */ @SearchParamDefinition(name="subtype", path="Media.subtype", description="The type of acquisition equipment/process", type="token" ) public static final String SP_SUBTYPE = "subtype"; + /** + * Fluent Client search parameter constant for subtype + *

+ * Description: The type of acquisition equipment/process
+ * Type: token
+ * Path: Media.subtype
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBTYPE); + + /** + * Search parameter: created + *

+ * Description: Date attachment was first created
+ * Type: date
+ * Path: Media.content.creation
+ *

+ */ @SearchParamDefinition(name="created", path="Media.content.creation", description="Date attachment was first created", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: Date attachment was first created
+ * Type: date
+ * Path: Media.content.creation
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: subject + *

+ * Description: Who/What this Media is a record of
+ * Type: reference
+ * Path: Media.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Media.subject", description="Who/What this Media is a record of", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who/What this Media is a record of
+ * Type: reference
+ * Path: Media.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Media:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Media:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Who/What this Media is a record of
+ * Type: reference
+ * Path: Media.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Media.subject", description="Who/What this Media is a record of", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who/What this Media is a record of
+ * Type: reference
+ * Path: Media.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Media:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Media:patient").toLocked(); + /** + * Search parameter: type + *

+ * Description: photo | video | audio
+ * Type: token
+ * Path: Media.type
+ *

+ */ @SearchParamDefinition(name="type", path="Media.type", description="photo | video | audio", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: photo | video | audio
+ * Type: token
+ * Path: Media.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: operator + *

+ * Description: The person who generated the image
+ * Type: reference
+ * Path: Media.operator
+ *

+ */ @SearchParamDefinition(name="operator", path="Media.operator", description="The person who generated the image", type="reference" ) public static final String SP_OPERATOR = "operator"; + /** + * Fluent Client search parameter constant for operator + *

+ * Description: The person who generated the image
+ * Type: reference
+ * Path: Media.operator
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam OPERATOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_OPERATOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Media:operator". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Medication.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Medication.java index a617aff6a66..8211b6ffbf0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Medication.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Medication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1282,30 +1282,138 @@ public class Medication extends DomainResource { return ResourceType.Medication; } + /** + * Search parameter: container + *

+ * Description: E.g. box, vial, blister-pack
+ * Type: token
+ * Path: Medication.package.container
+ *

+ */ @SearchParamDefinition(name="container", path="Medication.package.container", description="E.g. box, vial, blister-pack", type="token" ) public static final String SP_CONTAINER = "container"; + /** + * Fluent Client search parameter constant for container + *

+ * Description: E.g. box, vial, blister-pack
+ * Type: token
+ * Path: Medication.package.container
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTAINER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTAINER); + + /** + * Search parameter: code + *

+ * Description: Codes that identify this medication
+ * Type: token
+ * Path: Medication.code
+ *

+ */ @SearchParamDefinition(name="code", path="Medication.code", description="Codes that identify this medication", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Codes that identify this medication
+ * Type: token
+ * Path: Medication.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: ingredient + *

+ * Description: The product contained
+ * Type: reference
+ * Path: Medication.product.ingredient.item
+ *

+ */ @SearchParamDefinition(name="ingredient", path="Medication.product.ingredient.item", description="The product contained", type="reference" ) public static final String SP_INGREDIENT = "ingredient"; + /** + * Fluent Client search parameter constant for ingredient + *

+ * Description: The product contained
+ * Type: reference
+ * Path: Medication.product.ingredient.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INGREDIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INGREDIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Medication:ingredient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_INGREDIENT = new ca.uhn.fhir.model.api.Include("Medication:ingredient").toLocked(); + /** + * Search parameter: form + *

+ * Description: powder | tablets | carton +
+ * Type: token
+ * Path: Medication.product.form
+ *

+ */ @SearchParamDefinition(name="form", path="Medication.product.form", description="powder | tablets | carton +", type="token" ) public static final String SP_FORM = "form"; + /** + * Fluent Client search parameter constant for form + *

+ * Description: powder | tablets | carton +
+ * Type: token
+ * Path: Medication.product.form
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORM); + + /** + * Search parameter: content + *

+ * Description: A product in the package
+ * Type: reference
+ * Path: Medication.package.content.item
+ *

+ */ @SearchParamDefinition(name="content", path="Medication.package.content.item", description="A product in the package", type="reference" ) public static final String SP_CONTENT = "content"; + /** + * Fluent Client search parameter constant for content + *

+ * Description: A product in the package
+ * Type: reference
+ * Path: Medication.package.content.item
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Medication:content". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTENT = new ca.uhn.fhir.model.api.Include("Medication:content").toLocked(); + /** + * Search parameter: manufacturer + *

+ * Description: Manufacturer of the item
+ * Type: reference
+ * Path: Medication.manufacturer
+ *

+ */ @SearchParamDefinition(name="manufacturer", path="Medication.manufacturer", description="Manufacturer of the item", type="reference" ) public static final String SP_MANUFACTURER = "manufacturer"; + /** + * Fluent Client search parameter constant for manufacturer + *

+ * Description: Manufacturer of the item
+ * Type: reference
+ * Path: Medication.manufacturer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANUFACTURER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANUFACTURER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Medication:manufacturer". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationAdministration.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationAdministration.java index 4cd3af09130..74c43dfbde5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationAdministration.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1508,64 +1508,262 @@ public class MedicationAdministration extends DomainResource { return ResourceType.MedicationAdministration; } + /** + * Search parameter: identifier + *

+ * Description: Return administrations with this external identifier
+ * Type: token
+ * Path: MedicationAdministration.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="MedicationAdministration.identifier", description="Return administrations with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return administrations with this external identifier
+ * Type: token
+ * Path: MedicationAdministration.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationAdministration.medicationCodeableConcept
+ *

+ */ @SearchParamDefinition(name="code", path="MedicationAdministration.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationAdministration.medicationCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: prescription + *

+ * Description: The identity of a prescription to list administrations from
+ * Type: reference
+ * Path: MedicationAdministration.prescription
+ *

+ */ @SearchParamDefinition(name="prescription", path="MedicationAdministration.prescription", description="The identity of a prescription to list administrations from", type="reference" ) public static final String SP_PRESCRIPTION = "prescription"; + /** + * Fluent Client search parameter constant for prescription + *

+ * Description: The identity of a prescription to list administrations from
+ * Type: reference
+ * Path: MedicationAdministration.prescription
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRESCRIPTION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRESCRIPTION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:prescription". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRESCRIPTION = new ca.uhn.fhir.model.api.Include("MedicationAdministration:prescription").toLocked(); + /** + * Search parameter: effectivetime + *

+ * Description: Date administration happened (or did not happen)
+ * Type: date
+ * Path: MedicationAdministration.effectiveTime[x]
+ *

+ */ @SearchParamDefinition(name="effectivetime", path="MedicationAdministration.effectiveTime[x]", description="Date administration happened (or did not happen)", type="date" ) public static final String SP_EFFECTIVETIME = "effectivetime"; + /** + * Fluent Client search parameter constant for effectivetime + *

+ * Description: Date administration happened (or did not happen)
+ * Type: date
+ * Path: MedicationAdministration.effectiveTime[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam EFFECTIVETIME = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EFFECTIVETIME); + + /** + * Search parameter: practitioner + *

+ * Description: Who administered substance
+ * Type: reference
+ * Path: MedicationAdministration.practitioner
+ *

+ */ @SearchParamDefinition(name="practitioner", path="MedicationAdministration.practitioner", description="Who administered substance", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + /** + * Fluent Client search parameter constant for practitioner + *

+ * Description: Who administered substance
+ * Type: reference
+ * Path: MedicationAdministration.practitioner
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:practitioner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("MedicationAdministration:practitioner").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The identity of a patient to list administrations for
+ * Type: reference
+ * Path: MedicationAdministration.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="MedicationAdministration.patient", description="The identity of a patient to list administrations for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a patient to list administrations for
+ * Type: reference
+ * Path: MedicationAdministration.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationAdministration:patient").toLocked(); + /** + * Search parameter: medication + *

+ * Description: Return administrations of this medication resource
+ * Type: reference
+ * Path: MedicationAdministration.medicationReference
+ *

+ */ @SearchParamDefinition(name="medication", path="MedicationAdministration.medicationReference", description="Return administrations of this medication resource", type="reference" ) public static final String SP_MEDICATION = "medication"; + /** + * Fluent Client search parameter constant for medication + *

+ * Description: Return administrations of this medication resource
+ * Type: reference
+ * Path: MedicationAdministration.medicationReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEDICATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:medication". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MEDICATION = new ca.uhn.fhir.model.api.Include("MedicationAdministration:medication").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Return administrations that share this encounter
+ * Type: reference
+ * Path: MedicationAdministration.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="MedicationAdministration.encounter", description="Return administrations that share this encounter", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Return administrations that share this encounter
+ * Type: reference
+ * Path: MedicationAdministration.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("MedicationAdministration:encounter").toLocked(); + /** + * Search parameter: device + *

+ * Description: Return administrations with this administration device identity
+ * Type: reference
+ * Path: MedicationAdministration.device
+ *

+ */ @SearchParamDefinition(name="device", path="MedicationAdministration.device", description="Return administrations with this administration device identity", type="reference" ) public static final String SP_DEVICE = "device"; + /** + * Fluent Client search parameter constant for device + *

+ * Description: Return administrations with this administration device identity
+ * Type: reference
+ * Path: MedicationAdministration.device
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationAdministration:device". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DEVICE = new ca.uhn.fhir.model.api.Include("MedicationAdministration:device").toLocked(); + /** + * Search parameter: notgiven + *

+ * Description: Administrations that were not made
+ * Type: token
+ * Path: MedicationAdministration.wasNotGiven
+ *

+ */ @SearchParamDefinition(name="notgiven", path="MedicationAdministration.wasNotGiven", description="Administrations that were not made", type="token" ) public static final String SP_NOTGIVEN = "notgiven"; + /** + * Fluent Client search parameter constant for notgiven + *

+ * Description: Administrations that were not made
+ * Type: token
+ * Path: MedicationAdministration.wasNotGiven
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam NOTGIVEN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_NOTGIVEN); + + /** + * Search parameter: status + *

+ * Description: MedicationAdministration event status (for example one of active/paused/completed/nullified)
+ * Type: token
+ * Path: MedicationAdministration.status
+ *

+ */ @SearchParamDefinition(name="status", path="MedicationAdministration.status", description="MedicationAdministration event status (for example one of active/paused/completed/nullified)", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: MedicationAdministration event status (for example one of active/paused/completed/nullified)
+ * Type: token
+ * Path: MedicationAdministration.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationDispense.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationDispense.java index 9bc66d1590c..fad0ce379f8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationDispense.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2039,74 +2039,308 @@ Specifically if 'boolean' datatype is selected, then the following logic applies return ResourceType.MedicationDispense; } + /** + * Search parameter: identifier + *

+ * Description: Return dispenses with this external identifier
+ * Type: token
+ * Path: MedicationDispense.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="MedicationDispense.identifier", description="Return dispenses with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return dispenses with this external identifier
+ * Type: token
+ * Path: MedicationDispense.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Return dispenses of this medicine code
+ * Type: token
+ * Path: MedicationDispense.medicationCodeableConcept
+ *

+ */ @SearchParamDefinition(name="code", path="MedicationDispense.medicationCodeableConcept", description="Return dispenses of this medicine code", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Return dispenses of this medicine code
+ * Type: token
+ * Path: MedicationDispense.medicationCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: receiver + *

+ * Description: Who collected the medication
+ * Type: reference
+ * Path: MedicationDispense.receiver
+ *

+ */ @SearchParamDefinition(name="receiver", path="MedicationDispense.receiver", description="Who collected the medication", type="reference" ) public static final String SP_RECEIVER = "receiver"; + /** + * Fluent Client search parameter constant for receiver + *

+ * Description: Who collected the medication
+ * Type: reference
+ * Path: MedicationDispense.receiver
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECEIVER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECEIVER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:receiver". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECEIVER = new ca.uhn.fhir.model.api.Include("MedicationDispense:receiver").toLocked(); + /** + * Search parameter: destination + *

+ * Description: Return dispenses that should be sent to a specific destination
+ * Type: reference
+ * Path: MedicationDispense.destination
+ *

+ */ @SearchParamDefinition(name="destination", path="MedicationDispense.destination", description="Return dispenses that should be sent to a specific destination", type="reference" ) public static final String SP_DESTINATION = "destination"; + /** + * Fluent Client search parameter constant for destination + *

+ * Description: Return dispenses that should be sent to a specific destination
+ * Type: reference
+ * Path: MedicationDispense.destination
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DESTINATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DESTINATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:destination". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DESTINATION = new ca.uhn.fhir.model.api.Include("MedicationDispense:destination").toLocked(); + /** + * Search parameter: medication + *

+ * Description: Return dispenses of this medicine resource
+ * Type: reference
+ * Path: MedicationDispense.medicationReference
+ *

+ */ @SearchParamDefinition(name="medication", path="MedicationDispense.medicationReference", description="Return dispenses of this medicine resource", type="reference" ) public static final String SP_MEDICATION = "medication"; + /** + * Fluent Client search parameter constant for medication + *

+ * Description: Return dispenses of this medicine resource
+ * Type: reference
+ * Path: MedicationDispense.medicationReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEDICATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:medication". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MEDICATION = new ca.uhn.fhir.model.api.Include("MedicationDispense:medication").toLocked(); + /** + * Search parameter: responsibleparty + *

+ * Description: Return all dispenses with the specified responsible party
+ * Type: reference
+ * Path: MedicationDispense.substitution.responsibleParty
+ *

+ */ @SearchParamDefinition(name="responsibleparty", path="MedicationDispense.substitution.responsibleParty", description="Return all dispenses with the specified responsible party", type="reference" ) public static final String SP_RESPONSIBLEPARTY = "responsibleparty"; + /** + * Fluent Client search parameter constant for responsibleparty + *

+ * Description: Return all dispenses with the specified responsible party
+ * Type: reference
+ * Path: MedicationDispense.substitution.responsibleParty
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESPONSIBLEPARTY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESPONSIBLEPARTY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:responsibleparty". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESPONSIBLEPARTY = new ca.uhn.fhir.model.api.Include("MedicationDispense:responsibleparty").toLocked(); + /** + * Search parameter: type + *

+ * Description: Return all dispenses of a specific type
+ * Type: token
+ * Path: MedicationDispense.type
+ *

+ */ @SearchParamDefinition(name="type", path="MedicationDispense.type", description="Return all dispenses of a specific type", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Return all dispenses of a specific type
+ * Type: token
+ * Path: MedicationDispense.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: whenhandedover + *

+ * Description: Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)
+ * Type: date
+ * Path: MedicationDispense.whenHandedOver
+ *

+ */ @SearchParamDefinition(name="whenhandedover", path="MedicationDispense.whenHandedOver", description="Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)", type="date" ) public static final String SP_WHENHANDEDOVER = "whenhandedover"; + /** + * Fluent Client search parameter constant for whenhandedover + *

+ * Description: Date when medication handed over to patient (outpatient setting), or supplied to ward or clinic (inpatient setting)
+ * Type: date
+ * Path: MedicationDispense.whenHandedOver
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam WHENHANDEDOVER = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_WHENHANDEDOVER); + + /** + * Search parameter: whenprepared + *

+ * Description: Date when medication prepared
+ * Type: date
+ * Path: MedicationDispense.whenPrepared
+ *

+ */ @SearchParamDefinition(name="whenprepared", path="MedicationDispense.whenPrepared", description="Date when medication prepared", type="date" ) public static final String SP_WHENPREPARED = "whenprepared"; + /** + * Fluent Client search parameter constant for whenprepared + *

+ * Description: Date when medication prepared
+ * Type: date
+ * Path: MedicationDispense.whenPrepared
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam WHENPREPARED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_WHENPREPARED); + + /** + * Search parameter: dispenser + *

+ * Description: Return all dispenses performed by a specific individual
+ * Type: reference
+ * Path: MedicationDispense.dispenser
+ *

+ */ @SearchParamDefinition(name="dispenser", path="MedicationDispense.dispenser", description="Return all dispenses performed by a specific individual", type="reference" ) public static final String SP_DISPENSER = "dispenser"; + /** + * Fluent Client search parameter constant for dispenser + *

+ * Description: Return all dispenses performed by a specific individual
+ * Type: reference
+ * Path: MedicationDispense.dispenser
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DISPENSER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DISPENSER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:dispenser". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DISPENSER = new ca.uhn.fhir.model.api.Include("MedicationDispense:dispenser").toLocked(); + /** + * Search parameter: prescription + *

+ * Description: The identity of a prescription to list dispenses from
+ * Type: reference
+ * Path: MedicationDispense.authorizingPrescription
+ *

+ */ @SearchParamDefinition(name="prescription", path="MedicationDispense.authorizingPrescription", description="The identity of a prescription to list dispenses from", type="reference" ) public static final String SP_PRESCRIPTION = "prescription"; + /** + * Fluent Client search parameter constant for prescription + *

+ * Description: The identity of a prescription to list dispenses from
+ * Type: reference
+ * Path: MedicationDispense.authorizingPrescription
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRESCRIPTION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRESCRIPTION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:prescription". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRESCRIPTION = new ca.uhn.fhir.model.api.Include("MedicationDispense:prescription").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The identity of a patient to list dispenses for
+ * Type: reference
+ * Path: MedicationDispense.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="MedicationDispense.patient", description="The identity of a patient to list dispenses for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a patient to list dispenses for
+ * Type: reference
+ * Path: MedicationDispense.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationDispense:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationDispense:patient").toLocked(); + /** + * Search parameter: status + *

+ * Description: Status of the dispense
+ * Type: token
+ * Path: MedicationDispense.status
+ *

+ */ @SearchParamDefinition(name="status", path="MedicationDispense.status", description="Status of the dispense", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Status of the dispense
+ * Type: token
+ * Path: MedicationDispense.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationOrder.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationOrder.java index 9fce0792acd..53ac3c1d945 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationOrder.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2201,46 +2201,190 @@ public class MedicationOrder extends DomainResource { return ResourceType.MedicationOrder; } + /** + * Search parameter: prescriber + *

+ * Description: Who ordered the medication(s)
+ * Type: reference
+ * Path: MedicationOrder.prescriber
+ *

+ */ @SearchParamDefinition(name="prescriber", path="MedicationOrder.prescriber", description="Who ordered the medication(s)", type="reference" ) public static final String SP_PRESCRIBER = "prescriber"; + /** + * Fluent Client search parameter constant for prescriber + *

+ * Description: Who ordered the medication(s)
+ * Type: reference
+ * Path: MedicationOrder.prescriber
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRESCRIBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRESCRIBER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationOrder:prescriber". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRESCRIBER = new ca.uhn.fhir.model.api.Include("MedicationOrder:prescriber").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Return prescriptions with this external identifier
+ * Type: token
+ * Path: MedicationOrder.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="MedicationOrder.identifier", description="Return prescriptions with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return prescriptions with this external identifier
+ * Type: token
+ * Path: MedicationOrder.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationOrder.medicationCodeableConcept
+ *

+ */ @SearchParamDefinition(name="code", path="MedicationOrder.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationOrder.medicationCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: patient + *

+ * Description: The identity of a patient to list orders for
+ * Type: reference
+ * Path: MedicationOrder.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="MedicationOrder.patient", description="The identity of a patient to list orders for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a patient to list orders for
+ * Type: reference
+ * Path: MedicationOrder.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationOrder:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationOrder:patient").toLocked(); + /** + * Search parameter: datewritten + *

+ * Description: Return prescriptions written on this date
+ * Type: date
+ * Path: MedicationOrder.dateWritten
+ *

+ */ @SearchParamDefinition(name="datewritten", path="MedicationOrder.dateWritten", description="Return prescriptions written on this date", type="date" ) public static final String SP_DATEWRITTEN = "datewritten"; + /** + * Fluent Client search parameter constant for datewritten + *

+ * Description: Return prescriptions written on this date
+ * Type: date
+ * Path: MedicationOrder.dateWritten
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATEWRITTEN = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATEWRITTEN); + + /** + * Search parameter: medication + *

+ * Description: Return administrations of this medication reference
+ * Type: reference
+ * Path: MedicationOrder.medicationReference
+ *

+ */ @SearchParamDefinition(name="medication", path="MedicationOrder.medicationReference", description="Return administrations of this medication reference", type="reference" ) public static final String SP_MEDICATION = "medication"; + /** + * Fluent Client search parameter constant for medication + *

+ * Description: Return administrations of this medication reference
+ * Type: reference
+ * Path: MedicationOrder.medicationReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEDICATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationOrder:medication". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MEDICATION = new ca.uhn.fhir.model.api.Include("MedicationOrder:medication").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Return prescriptions with this encounter identifier
+ * Type: reference
+ * Path: MedicationOrder.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="MedicationOrder.encounter", description="Return prescriptions with this encounter identifier", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Return prescriptions with this encounter identifier
+ * Type: reference
+ * Path: MedicationOrder.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationOrder:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("MedicationOrder:encounter").toLocked(); + /** + * Search parameter: status + *

+ * Description: Status of the prescription
+ * Type: token
+ * Path: MedicationOrder.status
+ *

+ */ @SearchParamDefinition(name="status", path="MedicationOrder.status", description="Status of the prescription", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Status of the prescription
+ * Type: token
+ * Path: MedicationOrder.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationStatement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationStatement.java index 21f5cad54d7..eb150f482c0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationStatement.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MedicationStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1615,38 +1615,164 @@ Specifically if 'boolean' datatype is selected, then the following logic applies return ResourceType.MedicationStatement; } + /** + * Search parameter: identifier + *

+ * Description: Return statements with this external identifier
+ * Type: token
+ * Path: MedicationStatement.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="MedicationStatement.identifier", description="Return statements with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return statements with this external identifier
+ * Type: token
+ * Path: MedicationStatement.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationStatement.medicationCodeableConcept
+ *

+ */ @SearchParamDefinition(name="code", path="MedicationStatement.medicationCodeableConcept", description="Return administrations of this medication code", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Return administrations of this medication code
+ * Type: token
+ * Path: MedicationStatement.medicationCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: patient + *

+ * Description: The identity of a patient to list statements for
+ * Type: reference
+ * Path: MedicationStatement.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="MedicationStatement.patient", description="The identity of a patient to list statements for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a patient to list statements for
+ * Type: reference
+ * Path: MedicationStatement.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationStatement:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("MedicationStatement:patient").toLocked(); + /** + * Search parameter: medication + *

+ * Description: Return administrations of this medication reference
+ * Type: reference
+ * Path: MedicationStatement.medicationReference
+ *

+ */ @SearchParamDefinition(name="medication", path="MedicationStatement.medicationReference", description="Return administrations of this medication reference", type="reference" ) public static final String SP_MEDICATION = "medication"; + /** + * Fluent Client search parameter constant for medication + *

+ * Description: Return administrations of this medication reference
+ * Type: reference
+ * Path: MedicationStatement.medicationReference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MEDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MEDICATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationStatement:medication". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_MEDICATION = new ca.uhn.fhir.model.api.Include("MedicationStatement:medication").toLocked(); + /** + * Search parameter: source + *

+ * Description: Who the information in the statement came from
+ * Type: reference
+ * Path: MedicationStatement.informationSource
+ *

+ */ @SearchParamDefinition(name="source", path="MedicationStatement.informationSource", description="Who the information in the statement came from", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Who the information in the statement came from
+ * Type: reference
+ * Path: MedicationStatement.informationSource
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MedicationStatement:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("MedicationStatement:source").toLocked(); + /** + * Search parameter: effectivedate + *

+ * Description: Date when patient was taking (or not taking) the medication
+ * Type: date
+ * Path: MedicationStatement.effective[x]
+ *

+ */ @SearchParamDefinition(name="effectivedate", path="MedicationStatement.effective[x]", description="Date when patient was taking (or not taking) the medication", type="date" ) public static final String SP_EFFECTIVEDATE = "effectivedate"; + /** + * Fluent Client search parameter constant for effectivedate + *

+ * Description: Date when patient was taking (or not taking) the medication
+ * Type: date
+ * Path: MedicationStatement.effective[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam EFFECTIVEDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EFFECTIVEDATE); + + /** + * Search parameter: status + *

+ * Description: Return statements that match the given status
+ * Type: token
+ * Path: MedicationStatement.status
+ *

+ */ @SearchParamDefinition(name="status", path="MedicationStatement.status", description="Return statements that match the given status", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Return statements that match the given status
+ * Type: token
+ * Path: MedicationStatement.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MessageHeader.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MessageHeader.java index f69ac7d5b3b..ddc61304dec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MessageHeader.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/MessageHeader.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1708,70 +1708,322 @@ public class MessageHeader extends DomainResource { return ResourceType.MessageHeader; } + /** + * Search parameter: code + *

+ * Description: ok | transient-error | fatal-error
+ * Type: token
+ * Path: MessageHeader.response.code
+ *

+ */ @SearchParamDefinition(name="code", path="MessageHeader.response.code", description="ok | transient-error | fatal-error", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: ok | transient-error | fatal-error
+ * Type: token
+ * Path: MessageHeader.response.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: data + *

+ * Description: The actual content of the message
+ * Type: reference
+ * Path: MessageHeader.data
+ *

+ */ @SearchParamDefinition(name="data", path="MessageHeader.data", description="The actual content of the message", type="reference" ) public static final String SP_DATA = "data"; + /** + * Fluent Client search parameter constant for data + *

+ * Description: The actual content of the message
+ * Type: reference
+ * Path: MessageHeader.data
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DATA = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DATA); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:data". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DATA = new ca.uhn.fhir.model.api.Include("MessageHeader:data").toLocked(); + /** + * Search parameter: receiver + *

+ * Description: Intended "real-world" recipient for the data
+ * Type: reference
+ * Path: MessageHeader.receiver
+ *

+ */ @SearchParamDefinition(name="receiver", path="MessageHeader.receiver", description="Intended \"real-world\" recipient for the data", type="reference" ) public static final String SP_RECEIVER = "receiver"; + /** + * Fluent Client search parameter constant for receiver + *

+ * Description: Intended "real-world" recipient for the data
+ * Type: reference
+ * Path: MessageHeader.receiver
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECEIVER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECEIVER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:receiver". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECEIVER = new ca.uhn.fhir.model.api.Include("MessageHeader:receiver").toLocked(); + /** + * Search parameter: author + *

+ * Description: The source of the decision
+ * Type: reference
+ * Path: MessageHeader.author
+ *

+ */ @SearchParamDefinition(name="author", path="MessageHeader.author", description="The source of the decision", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: The source of the decision
+ * Type: reference
+ * Path: MessageHeader.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("MessageHeader:author").toLocked(); + /** + * Search parameter: destination + *

+ * Description: Name of system
+ * Type: string
+ * Path: MessageHeader.destination.name
+ *

+ */ @SearchParamDefinition(name="destination", path="MessageHeader.destination.name", description="Name of system", type="string" ) public static final String SP_DESTINATION = "destination"; + /** + * Fluent Client search parameter constant for destination + *

+ * Description: Name of system
+ * Type: string
+ * Path: MessageHeader.destination.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESTINATION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESTINATION); + + /** + * Search parameter: source + *

+ * Description: Name of system
+ * Type: string
+ * Path: MessageHeader.source.name
+ *

+ */ @SearchParamDefinition(name="source", path="MessageHeader.source.name", description="Name of system", type="string" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Name of system
+ * Type: string
+ * Path: MessageHeader.source.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam SOURCE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_SOURCE); + + /** + * Search parameter: target + *

+ * Description: Particular delivery destination within the destination
+ * Type: reference
+ * Path: MessageHeader.destination.target
+ *

+ */ @SearchParamDefinition(name="target", path="MessageHeader.destination.target", description="Particular delivery destination within the destination", type="reference" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: Particular delivery destination within the destination
+ * Type: reference
+ * Path: MessageHeader.destination.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:target". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("MessageHeader:target").toLocked(); + /** + * Search parameter: destination-uri + *

+ * Description: Actual destination address or id
+ * Type: uri
+ * Path: MessageHeader.destination.endpoint
+ *

+ */ @SearchParamDefinition(name="destination-uri", path="MessageHeader.destination.endpoint", description="Actual destination address or id", type="uri" ) public static final String SP_DESTINATION_URI = "destination-uri"; + /** + * Fluent Client search parameter constant for destination-uri + *

+ * Description: Actual destination address or id
+ * Type: uri
+ * Path: MessageHeader.destination.endpoint
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam DESTINATION_URI = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DESTINATION_URI); + + /** + * Search parameter: source-uri + *

+ * Description: Actual message source address or id
+ * Type: uri
+ * Path: MessageHeader.source.endpoint
+ *

+ */ @SearchParamDefinition(name="source-uri", path="MessageHeader.source.endpoint", description="Actual message source address or id", type="uri" ) public static final String SP_SOURCE_URI = "source-uri"; + /** + * Fluent Client search parameter constant for source-uri + *

+ * Description: Actual message source address or id
+ * Type: uri
+ * Path: MessageHeader.source.endpoint
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SOURCE_URI = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SOURCE_URI); + + /** + * Search parameter: responsible + *

+ * Description: Final responsibility for event
+ * Type: reference
+ * Path: MessageHeader.responsible
+ *

+ */ @SearchParamDefinition(name="responsible", path="MessageHeader.responsible", description="Final responsibility for event", type="reference" ) public static final String SP_RESPONSIBLE = "responsible"; + /** + * Fluent Client search parameter constant for responsible + *

+ * Description: Final responsibility for event
+ * Type: reference
+ * Path: MessageHeader.responsible
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESPONSIBLE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESPONSIBLE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:responsible". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESPONSIBLE = new ca.uhn.fhir.model.api.Include("MessageHeader:responsible").toLocked(); + /** + * Search parameter: response-id + *

+ * Description: Id of original message
+ * Type: token
+ * Path: MessageHeader.response.identifier
+ *

+ */ @SearchParamDefinition(name="response-id", path="MessageHeader.response.identifier", description="Id of original message", type="token" ) public static final String SP_RESPONSE_ID = "response-id"; + /** + * Fluent Client search parameter constant for response-id + *

+ * Description: Id of original message
+ * Type: token
+ * Path: MessageHeader.response.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESPONSE_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESPONSE_ID); + + /** + * Search parameter: enterer + *

+ * Description: The source of the data entry
+ * Type: reference
+ * Path: MessageHeader.enterer
+ *

+ */ @SearchParamDefinition(name="enterer", path="MessageHeader.enterer", description="The source of the data entry", type="reference" ) public static final String SP_ENTERER = "enterer"; + /** + * Fluent Client search parameter constant for enterer + *

+ * Description: The source of the data entry
+ * Type: reference
+ * Path: MessageHeader.enterer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENTERER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENTERER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "MessageHeader:enterer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENTERER = new ca.uhn.fhir.model.api.Include("MessageHeader:enterer").toLocked(); + /** + * Search parameter: event + *

+ * Description: Code for the event this message represents
+ * Type: token
+ * Path: MessageHeader.event
+ *

+ */ @SearchParamDefinition(name="event", path="MessageHeader.event", description="Code for the event this message represents", type="token" ) public static final String SP_EVENT = "event"; + /** + * Fluent Client search parameter constant for event + *

+ * Description: Code for the event this message represents
+ * Type: token
+ * Path: MessageHeader.event
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT); + + /** + * Search parameter: timestamp + *

+ * Description: Time that the message was sent
+ * Type: date
+ * Path: MessageHeader.timestamp
+ *

+ */ @SearchParamDefinition(name="timestamp", path="MessageHeader.timestamp", description="Time that the message was sent", type="date" ) public static final String SP_TIMESTAMP = "timestamp"; + /** + * Fluent Client search parameter constant for timestamp + *

+ * Description: Time that the message was sent
+ * Type: date
+ * Path: MessageHeader.timestamp
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam TIMESTAMP = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_TIMESTAMP); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Meta.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Meta.java index b4a5d65e14a..f0343dea0ab 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Meta.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Meta.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -292,33 +292,6 @@ public class Meta extends Type implements IBaseMetaType { return this.tag; } - /** - * Returns the first tag (if any) that has the given system and code, or returns - * null if none - */ - public Coding getTag(String theSystem, String theCode) { - for (Coding next : getTag()) { - if (ca.uhn.fhir.util.ObjectUtil.equals(next.getSystem(), theSystem) && ca.uhn.fhir.util.ObjectUtil.equals(next.getCode(), theCode)) { - return next; - } - } - return null; - } - - /** - * Returns the first security label (if any) that has the given system and code, or returns - * null if none - */ - public Coding getSecurity(String theSystem, String theCode) { - for (Coding next : getTag()) { - if (ca.uhn.fhir.util.ObjectUtil.equals(next.getSystem(), theSystem) && ca.uhn.fhir.util.ObjectUtil.equals(next.getCode(), theCode)) { - return next; - } - } - return null; - } - - public boolean hasTag() { if (this.tag == null) return false; @@ -374,6 +347,31 @@ public class Meta extends Type implements IBaseMetaType { addSecurity().setSystem(theSystem).setCode(theCode).setDisplay(theDisplay); return this; } + /** + * Returns the first tag (if any) that has the given system and code, or returns + * null if none + */ + public Coding getTag(String theSystem, String theCode) { + for (Coding next : getTag()) { + if (ca.uhn.fhir.util.ObjectUtil.equals(next.getSystem(), theSystem) && ca.uhn.fhir.util.ObjectUtil.equals(next.getCode(), theCode)) { + return next; + } + } + return null; + } + + /** + * Returns the first security label (if any) that has the given system and code, or returns + * null if none + */ + public Coding getSecurity(String theSystem, String theCode) { + for (Coding next : getTag()) { + if (ca.uhn.fhir.util.ObjectUtil.equals(next.getSystem(), theSystem) && ca.uhn.fhir.util.ObjectUtil.equals(next.getCode(), theCode)) { + return next; + } + } + return null; + } protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("versionId", "id", "The version specific identifier, as it appears in the version portion of the URL. This values changes when the resource is created, updated, or deleted.", 0, java.lang.Integer.MAX_VALUE, versionId)); diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleDefinition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleDefinition.java index b9f23aea999..aef43451be8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleDefinition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleMetadata.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleMetadata.java index ae6ce77361e..d179ef2f7f1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleMetadata.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ModuleMetadata.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2713,20 +2713,146 @@ public class ModuleMetadata extends DomainResource { return ResourceType.ModuleMetadata; } + /** + * Search parameter: identifier + *

+ * Description: Logical identifier for the module (e.g. CMS-143)
+ * Type: token
+ * Path: ModuleMetadata.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ModuleMetadata.identifier", description="Logical identifier for the module (e.g. CMS-143)", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Logical identifier for the module (e.g. CMS-143)
+ * Type: token
+ * Path: ModuleMetadata.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: topic + *

+ * Description: Topics associated with the module
+ * Type: token
+ * Path: ModuleMetadata.topic
+ *

+ */ @SearchParamDefinition(name="topic", path="ModuleMetadata.topic", description="Topics associated with the module", type="token" ) public static final String SP_TOPIC = "topic"; + /** + * Fluent Client search parameter constant for topic + *

+ * Description: Topics associated with the module
+ * Type: token
+ * Path: ModuleMetadata.topic
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TOPIC = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TOPIC); + + /** + * Search parameter: description + *

+ * Description: Text search against the description
+ * Type: string
+ * Path: ModuleMetadata.description
+ *

+ */ @SearchParamDefinition(name="description", path="ModuleMetadata.description", description="Text search against the description", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search against the description
+ * Type: string
+ * Path: ModuleMetadata.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: keyword + *

+ * Description: Keywords associated with the module
+ * Type: string
+ * Path: ModuleMetadata.keyword
+ *

+ */ @SearchParamDefinition(name="keyword", path="ModuleMetadata.keyword", description="Keywords associated with the module", type="string" ) public static final String SP_KEYWORD = "keyword"; + /** + * Fluent Client search parameter constant for keyword + *

+ * Description: Keywords associated with the module
+ * Type: string
+ * Path: ModuleMetadata.keyword
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam KEYWORD = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_KEYWORD); + + /** + * Search parameter: title + *

+ * Description: Text search against the title
+ * Type: string
+ * Path: ModuleMetadata.title
+ *

+ */ @SearchParamDefinition(name="title", path="ModuleMetadata.title", description="Text search against the title", type="string" ) public static final String SP_TITLE = "title"; + /** + * Fluent Client search parameter constant for title + *

+ * Description: Text search against the title
+ * Type: string
+ * Path: ModuleMetadata.title
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE); + + /** + * Search parameter: version + *

+ * Description: Version of the module (e.g. 1.0.0)
+ * Type: string
+ * Path: ModuleMetadata.version
+ *

+ */ @SearchParamDefinition(name="version", path="ModuleMetadata.version", description="Version of the module (e.g. 1.0.0)", type="string" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: Version of the module (e.g. 1.0.0)
+ * Type: string
+ * Path: ModuleMetadata.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam VERSION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VERSION); + + /** + * Search parameter: status + *

+ * Description: Status of the module
+ * Type: token
+ * Path: ModuleMetadata.status
+ *

+ */ @SearchParamDefinition(name="status", path="ModuleMetadata.status", description="Status of the module", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Status of the module
+ * Type: token
+ * Path: ModuleMetadata.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Money.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Money.java index f1944edba86..1ead41c7d8e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Money.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Money.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NamingSystem.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NamingSystem.java index 983438e9b60..f66d3eb633e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NamingSystem.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1604,40 +1604,292 @@ public class NamingSystem extends DomainResource { return ResourceType.NamingSystem; } + /** + * Search parameter: date + *

+ * Description: Publication Date(/time)
+ * Type: date
+ * Path: NamingSystem.date
+ *

+ */ @SearchParamDefinition(name="date", path="NamingSystem.date", description="Publication Date(/time)", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Publication Date(/time)
+ * Type: date
+ * Path: NamingSystem.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: period + *

+ * Description: When is identifier valid?
+ * Type: date
+ * Path: NamingSystem.uniqueId.period
+ *

+ */ @SearchParamDefinition(name="period", path="NamingSystem.uniqueId.period", description="When is identifier valid?", type="date" ) public static final String SP_PERIOD = "period"; + /** + * Fluent Client search parameter constant for period + *

+ * Description: When is identifier valid?
+ * Type: date
+ * Path: NamingSystem.uniqueId.period
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD); + + /** + * Search parameter: kind + *

+ * Description: codesystem | identifier | root
+ * Type: token
+ * Path: NamingSystem.kind
+ *

+ */ @SearchParamDefinition(name="kind", path="NamingSystem.kind", description="codesystem | identifier | root", type="token" ) public static final String SP_KIND = "kind"; + /** + * Fluent Client search parameter constant for kind + *

+ * Description: codesystem | identifier | root
+ * Type: token
+ * Path: NamingSystem.kind
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam KIND = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_KIND); + + /** + * Search parameter: type + *

+ * Description: e.g. driver, provider, patient, bank etc.
+ * Type: token
+ * Path: NamingSystem.type
+ *

+ */ @SearchParamDefinition(name="type", path="NamingSystem.type", description="e.g. driver, provider, patient, bank etc.", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: e.g. driver, provider, patient, bank etc.
+ * Type: token
+ * Path: NamingSystem.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: id-type + *

+ * Description: oid | uuid | uri | other
+ * Type: token
+ * Path: NamingSystem.uniqueId.type
+ *

+ */ @SearchParamDefinition(name="id-type", path="NamingSystem.uniqueId.type", description="oid | uuid | uri | other", type="token" ) public static final String SP_ID_TYPE = "id-type"; + /** + * Fluent Client search parameter constant for id-type + *

+ * Description: oid | uuid | uri | other
+ * Type: token
+ * Path: NamingSystem.uniqueId.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ID_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ID_TYPE); + + /** + * Search parameter: responsible + *

+ * Description: Who maintains system namespace?
+ * Type: string
+ * Path: NamingSystem.responsible
+ *

+ */ @SearchParamDefinition(name="responsible", path="NamingSystem.responsible", description="Who maintains system namespace?", type="string" ) public static final String SP_RESPONSIBLE = "responsible"; + /** + * Fluent Client search parameter constant for responsible + *

+ * Description: Who maintains system namespace?
+ * Type: string
+ * Path: NamingSystem.responsible
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam RESPONSIBLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_RESPONSIBLE); + + /** + * Search parameter: contact + *

+ * Description: Name of a individual to contact
+ * Type: string
+ * Path: NamingSystem.contact.name
+ *

+ */ @SearchParamDefinition(name="contact", path="NamingSystem.contact.name", description="Name of a individual to contact", type="string" ) public static final String SP_CONTACT = "contact"; + /** + * Fluent Client search parameter constant for contact + *

+ * Description: Name of a individual to contact
+ * Type: string
+ * Path: NamingSystem.contact.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam CONTACT = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_CONTACT); + + /** + * Search parameter: name + *

+ * Description: Human-readable label
+ * Type: string
+ * Path: NamingSystem.name
+ *

+ */ @SearchParamDefinition(name="name", path="NamingSystem.name", description="Human-readable label", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Human-readable label
+ * Type: string
+ * Path: NamingSystem.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: Content intends to support these contexts
+ * Type: token
+ * Path: NamingSystem.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="NamingSystem.useContext", description="Content intends to support these contexts", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: Content intends to support these contexts
+ * Type: token
+ * Path: NamingSystem.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher (Organization or individual)
+ * Type: string
+ * Path: NamingSystem.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="NamingSystem.publisher", description="Name of the publisher (Organization or individual)", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher (Organization or individual)
+ * Type: string
+ * Path: NamingSystem.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: telecom + *

+ * Description: Contact details for individual or publisher
+ * Type: token
+ * Path: NamingSystem.contact.telecom
+ *

+ */ @SearchParamDefinition(name="telecom", path="NamingSystem.contact.telecom", description="Contact details for individual or publisher", type="token" ) public static final String SP_TELECOM = "telecom"; + /** + * Fluent Client search parameter constant for telecom + *

+ * Description: Contact details for individual or publisher
+ * Type: token
+ * Path: NamingSystem.contact.telecom
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); + + /** + * Search parameter: value + *

+ * Description: The unique identifier
+ * Type: string
+ * Path: NamingSystem.uniqueId.value
+ *

+ */ @SearchParamDefinition(name="value", path="NamingSystem.uniqueId.value", description="The unique identifier", type="string" ) public static final String SP_VALUE = "value"; + /** + * Fluent Client search parameter constant for value + *

+ * Description: The unique identifier
+ * Type: string
+ * Path: NamingSystem.uniqueId.value
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam VALUE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VALUE); + + /** + * Search parameter: replaced-by + *

+ * Description: Use this instead
+ * Type: reference
+ * Path: NamingSystem.replacedBy
+ *

+ */ @SearchParamDefinition(name="replaced-by", path="NamingSystem.replacedBy", description="Use this instead", type="reference" ) public static final String SP_REPLACED_BY = "replaced-by"; + /** + * Fluent Client search parameter constant for replaced-by + *

+ * Description: Use this instead
+ * Type: reference
+ * Path: NamingSystem.replacedBy
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REPLACED_BY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REPLACED_BY); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "NamingSystem:replaced-by". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REPLACED_BY = new ca.uhn.fhir.model.api.Include("NamingSystem:replaced-by").toLocked(); + /** + * Search parameter: status + *

+ * Description: draft | active | retired
+ * Type: token
+ * Path: NamingSystem.status
+ *

+ */ @SearchParamDefinition(name="status", path="NamingSystem.status", description="draft | active | retired", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: draft | active | retired
+ * Type: token
+ * Path: NamingSystem.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Narrative.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Narrative.java index 94b634142de..5e87904ce5c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Narrative.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Narrative.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; import org.hl7.fhir.utilities.xhtml.XhtmlNode; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NutritionOrder.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NutritionOrder.java index ae34694acaa..c976e325d92 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NutritionOrder.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/NutritionOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2786,44 +2786,224 @@ public class NutritionOrder extends DomainResource { return ResourceType.NutritionOrder; } + /** + * Search parameter: identifier + *

+ * Description: Return nutrition orders with this external identifier
+ * Type: token
+ * Path: NutritionOrder.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="NutritionOrder.identifier", description="Return nutrition orders with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return nutrition orders with this external identifier
+ * Type: token
+ * Path: NutritionOrder.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: datetime + *

+ * Description: Return nutrition orders requested on this date
+ * Type: date
+ * Path: NutritionOrder.dateTime
+ *

+ */ @SearchParamDefinition(name="datetime", path="NutritionOrder.dateTime", description="Return nutrition orders requested on this date", type="date" ) public static final String SP_DATETIME = "datetime"; + /** + * Fluent Client search parameter constant for datetime + *

+ * Description: Return nutrition orders requested on this date
+ * Type: date
+ * Path: NutritionOrder.dateTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATETIME = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATETIME); + + /** + * Search parameter: provider + *

+ * Description: The identify of the provider who placed the nutrition order
+ * Type: reference
+ * Path: NutritionOrder.orderer
+ *

+ */ @SearchParamDefinition(name="provider", path="NutritionOrder.orderer", description="The identify of the provider who placed the nutrition order", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: The identify of the provider who placed the nutrition order
+ * Type: reference
+ * Path: NutritionOrder.orderer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "NutritionOrder:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("NutritionOrder:provider").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The identity of the person who requires the diet, formula or nutritional supplement
+ * Type: reference
+ * Path: NutritionOrder.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="NutritionOrder.patient", description="The identity of the person who requires the diet, formula or nutritional supplement", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of the person who requires the diet, formula or nutritional supplement
+ * Type: reference
+ * Path: NutritionOrder.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "NutritionOrder:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("NutritionOrder:patient").toLocked(); + /** + * Search parameter: supplement + *

+ * Description: Type of supplement product requested
+ * Type: token
+ * Path: NutritionOrder.supplement.type
+ *

+ */ @SearchParamDefinition(name="supplement", path="NutritionOrder.supplement.type", description="Type of supplement product requested", type="token" ) public static final String SP_SUPPLEMENT = "supplement"; + /** + * Fluent Client search parameter constant for supplement + *

+ * Description: Type of supplement product requested
+ * Type: token
+ * Path: NutritionOrder.supplement.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUPPLEMENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUPPLEMENT); + + /** + * Search parameter: formula + *

+ * Description: Type of enteral or infant formula
+ * Type: token
+ * Path: NutritionOrder.enteralFormula.baseFormulaType
+ *

+ */ @SearchParamDefinition(name="formula", path="NutritionOrder.enteralFormula.baseFormulaType", description="Type of enteral or infant formula", type="token" ) public static final String SP_FORMULA = "formula"; + /** + * Fluent Client search parameter constant for formula + *

+ * Description: Type of enteral or infant formula
+ * Type: token
+ * Path: NutritionOrder.enteralFormula.baseFormulaType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMULA = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMULA); + + /** + * Search parameter: encounter + *

+ * Description: Return nutrition orders with this encounter identifier
+ * Type: reference
+ * Path: NutritionOrder.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="NutritionOrder.encounter", description="Return nutrition orders with this encounter identifier", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Return nutrition orders with this encounter identifier
+ * Type: reference
+ * Path: NutritionOrder.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "NutritionOrder:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("NutritionOrder:encounter").toLocked(); + /** + * Search parameter: oraldiet + *

+ * Description: Type of diet that can be consumed orally (i.e., take via the mouth).
+ * Type: token
+ * Path: NutritionOrder.oralDiet.type
+ *

+ */ @SearchParamDefinition(name="oraldiet", path="NutritionOrder.oralDiet.type", description="Type of diet that can be consumed orally (i.e., take via the mouth).", type="token" ) public static final String SP_ORALDIET = "oraldiet"; + /** + * Fluent Client search parameter constant for oraldiet + *

+ * Description: Type of diet that can be consumed orally (i.e., take via the mouth).
+ * Type: token
+ * Path: NutritionOrder.oralDiet.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ORALDIET = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ORALDIET); + + /** + * Search parameter: status + *

+ * Description: Status of the nutrition order.
+ * Type: token
+ * Path: NutritionOrder.status
+ *

+ */ @SearchParamDefinition(name="status", path="NutritionOrder.status", description="Status of the nutrition order.", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: Status of the nutrition order.
+ * Type: token
+ * Path: NutritionOrder.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + + /** + * Search parameter: additive + *

+ * Description: Type of module component to add to the feeding
+ * Type: token
+ * Path: NutritionOrder.enteralFormula.additiveType
+ *

+ */ @SearchParamDefinition(name="additive", path="NutritionOrder.enteralFormula.additiveType", description="Type of module component to add to the feeding", type="token" ) public static final String SP_ADDITIVE = "additive"; + /** + * Fluent Client search parameter constant for additive + *

+ * Description: Type of module component to add to the feeding
+ * Type: token
+ * Path: NutritionOrder.enteralFormula.additiveType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDITIVE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDITIVE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Observation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Observation.java index 2e090cafa7a..892b924f3bf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Observation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Observation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2583,112 +2583,688 @@ public class Observation extends DomainResource { return ResourceType.Observation; } + /** + * Search parameter: date + *

+ * Description: Obtained date/time. If the obtained element is a period, a date that falls in the period
+ * Type: date
+ * Path: Observation.effective[x]
+ *

+ */ @SearchParamDefinition(name="date", path="Observation.effective[x]", description="Obtained date/time. If the obtained element is a period, a date that falls in the period", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Obtained date/time. If the obtained element is a period, a date that falls in the period
+ * Type: date
+ * Path: Observation.effective[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: code + *

+ * Description: The code of the observation type
+ * Type: token
+ * Path: Observation.code
+ *

+ */ @SearchParamDefinition(name="code", path="Observation.code", description="The code of the observation type", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: The code of the observation type
+ * Type: token
+ * Path: Observation.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: subject + *

+ * Description: The subject that the observation is about
+ * Type: reference
+ * Path: Observation.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Observation.subject", description="The subject that the observation is about", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The subject that the observation is about
+ * Type: reference
+ * Path: Observation.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Observation:subject").toLocked(); + /** + * Search parameter: component-data-absent-reason + *

+ * Description: The reason why the expected value in the element Observation.component.value[x] is missing.
+ * Type: token
+ * Path: Observation.component.dataAbsentReason
+ *

+ */ @SearchParamDefinition(name="component-data-absent-reason", path="Observation.component.dataAbsentReason", description="The reason why the expected value in the element Observation.component.value[x] is missing.", type="token" ) public static final String SP_COMPONENT_DATA_ABSENT_REASON = "component-data-absent-reason"; + /** + * Fluent Client search parameter constant for component-data-absent-reason + *

+ * Description: The reason why the expected value in the element Observation.component.value[x] is missing.
+ * Type: token
+ * Path: Observation.component.dataAbsentReason
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam COMPONENT_DATA_ABSENT_REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_COMPONENT_DATA_ABSENT_REASON); + + /** + * Search parameter: value-concept + *

+ * Description: The value of the observation, if the value is a CodeableConcept
+ * Type: token
+ * Path: Observation.valueCodeableConcept
+ *

+ */ @SearchParamDefinition(name="value-concept", path="Observation.valueCodeableConcept", description="The value of the observation, if the value is a CodeableConcept", type="token" ) public static final String SP_VALUE_CONCEPT = "value-concept"; + /** + * Fluent Client search parameter constant for value-concept + *

+ * Description: The value of the observation, if the value is a CodeableConcept
+ * Type: token
+ * Path: Observation.valueCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VALUE_CONCEPT); + + /** + * Search parameter: value-date + *

+ * Description: The value of the observation, if the value is a date or period of time
+ * Type: date
+ * Path: Observation.valueDateTime, Observation.valuePeriod
+ *

+ */ @SearchParamDefinition(name="value-date", path="Observation.valueDateTime|Observation.valuePeriod", description="The value of the observation, if the value is a date or period of time", type="date" ) public static final String SP_VALUE_DATE = "value-date"; + /** + * Fluent Client search parameter constant for value-date + *

+ * Description: The value of the observation, if the value is a date or period of time
+ * Type: date
+ * Path: Observation.valueDateTime, Observation.valuePeriod
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam VALUE_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_VALUE_DATE); + + /** + * Search parameter: related + *

+ * Description: Related Observations - search on related-type and related-target together
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="related", path="", description="Related Observations - search on related-type and related-target together", type="composite" ) public static final String SP_RELATED = "related"; + /** + * Fluent Client search parameter constant for related + *

+ * Description: Related Observations - search on related-type and related-target together
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATED); + + /** + * Search parameter: patient + *

+ * Description: The subject that the observation is about (if patient)
+ * Type: reference
+ * Path: Observation.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Observation.subject", description="The subject that the observation is about (if patient)", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The subject that the observation is about (if patient)
+ * Type: reference
+ * Path: Observation.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Observation:patient").toLocked(); + /** + * Search parameter: specimen + *

+ * Description: Specimen used for this observation
+ * Type: reference
+ * Path: Observation.specimen
+ *

+ */ @SearchParamDefinition(name="specimen", path="Observation.specimen", description="Specimen used for this observation", type="reference" ) public static final String SP_SPECIMEN = "specimen"; + /** + * Fluent Client search parameter constant for specimen + *

+ * Description: Specimen used for this observation
+ * Type: reference
+ * Path: Observation.specimen
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIMEN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIMEN); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:specimen". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIMEN = new ca.uhn.fhir.model.api.Include("Observation:specimen").toLocked(); + /** + * Search parameter: component-code + *

+ * Description: The component code of the observation type
+ * Type: token
+ * Path: Observation.component.code
+ *

+ */ @SearchParamDefinition(name="component-code", path="Observation.component.code", description="The component code of the observation type", type="token" ) public static final String SP_COMPONENT_CODE = "component-code"; + /** + * Fluent Client search parameter constant for component-code + *

+ * Description: The component code of the observation type
+ * Type: token
+ * Path: Observation.component.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam COMPONENT_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_COMPONENT_CODE); + + /** + * Search parameter: value-string + *

+ * Description: The value of the observation, if the value is a string, and also searches in CodeableConcept.text
+ * Type: string
+ * Path: Observation.valueString
+ *

+ */ @SearchParamDefinition(name="value-string", path="Observation.valueString", description="The value of the observation, if the value is a string, and also searches in CodeableConcept.text", type="string" ) public static final String SP_VALUE_STRING = "value-string"; + /** + * Fluent Client search parameter constant for value-string + *

+ * Description: The value of the observation, if the value is a string, and also searches in CodeableConcept.text
+ * Type: string
+ * Path: Observation.valueString
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam VALUE_STRING = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VALUE_STRING); + + /** + * Search parameter: identifier + *

+ * Description: The unique id for a particular observation
+ * Type: token
+ * Path: Observation.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Observation.identifier", description="The unique id for a particular observation", type="token" ) public static final String SP_IDENTIFIER = "identifier"; - @SearchParamDefinition(name="component-code-value-concept", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "component-code-value-concept"} ) + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The unique id for a particular observation
+ * Type: token
+ * Path: Observation.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: component-code-value-concept + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="component-code-value-concept", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-concept"} ) public static final String SP_COMPONENT_CODE_VALUE_CONCEPT = "component-code-value-concept"; - @SearchParamDefinition(name="component-code-value-date", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "component-code-value-date"} ) + /** + * Fluent Client search parameter constant for component-code-value-concept + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_CONCEPT); + + /** + * Search parameter: component-code-value-date + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="component-code-value-date", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-date"} ) public static final String SP_COMPONENT_CODE_VALUE_DATE = "component-code-value-date"; - @SearchParamDefinition(name="component-code-value-string", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "component-code-value-string"} ) + /** + * Fluent Client search parameter constant for component-code-value-date + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_DATE); + + /** + * Search parameter: component-code-value-string + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="component-code-value-string", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-string"} ) public static final String SP_COMPONENT_CODE_VALUE_STRING = "component-code-value-string"; - @SearchParamDefinition(name="component-code-value-quantity", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "component-code-value-quantity"} ) + /** + * Fluent Client search parameter constant for component-code-value-string + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_STRING); + + /** + * Search parameter: component-code-value-quantity + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="component-code-value-quantity", path="", description="Both component code and one of the component value parameters", type="composite", compositeOf={"component-code", "value-quantity"} ) public static final String SP_COMPONENT_CODE_VALUE_QUANTITY = "component-code-value-quantity"; - @SearchParamDefinition(name="code-value-concept", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "code-value-concept"} ) + /** + * Fluent Client search parameter constant for component-code-value-quantity + *

+ * Description: Both component code and one of the component value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COMPONENT_CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COMPONENT_CODE_VALUE_QUANTITY); + + /** + * Search parameter: code-value-concept + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="code-value-concept", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-concept"} ) public static final String SP_CODE_VALUE_CONCEPT = "code-value-concept"; - @SearchParamDefinition(name="code-value-date", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "code-value-date"} ) + /** + * Fluent Client search parameter constant for code-value-concept + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_CONCEPT); + + /** + * Search parameter: code-value-date + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="code-value-date", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-date"} ) public static final String SP_CODE_VALUE_DATE = "code-value-date"; - @SearchParamDefinition(name="code-value-string", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "code-value-string"} ) + /** + * Fluent Client search parameter constant for code-value-date + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_DATE); + + /** + * Search parameter: code-value-string + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="code-value-string", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-string"} ) public static final String SP_CODE_VALUE_STRING = "code-value-string"; - @SearchParamDefinition(name="code-value-quantity", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "code-value-quantity"} ) + /** + * Fluent Client search parameter constant for code-value-string + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_STRING = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_STRING); + + /** + * Search parameter: code-value-quantity + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + @SearchParamDefinition(name="code-value-quantity", path="", description="Both code and one of the value parameters", type="composite", compositeOf={"code", "value-quantity"} ) public static final String SP_CODE_VALUE_QUANTITY = "code-value-quantity"; + /** + * Fluent Client search parameter constant for code-value-quantity + *

+ * Description: Both code and one of the value parameters
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CODE_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CODE_VALUE_QUANTITY); + + /** + * Search parameter: performer + *

+ * Description: Who performed the observation
+ * Type: reference
+ * Path: Observation.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="Observation.performer", description="Who performed the observation", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: Who performed the observation
+ * Type: reference
+ * Path: Observation.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("Observation:performer").toLocked(); + /** + * Search parameter: value-quantity + *

+ * Description: The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)
+ * Type: quantity
+ * Path: Observation.valueQuantity
+ *

+ */ @SearchParamDefinition(name="value-quantity", path="Observation.valueQuantity", description="The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity" ) public static final String SP_VALUE_QUANTITY = "value-quantity"; + /** + * Fluent Client search parameter constant for value-quantity + *

+ * Description: The value of the observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)
+ * Type: quantity
+ * Path: Observation.valueQuantity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_VALUE_QUANTITY); + + /** + * Search parameter: component-value-quantity + *

+ * Description: The value of the component observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)
+ * Type: quantity
+ * Path: Observation.component.valueQuantity
+ *

+ */ @SearchParamDefinition(name="component-value-quantity", path="Observation.component.valueQuantity", description="The value of the component observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)", type="quantity" ) public static final String SP_COMPONENT_VALUE_QUANTITY = "component-value-quantity"; + /** + * Fluent Client search parameter constant for component-value-quantity + *

+ * Description: The value of the component observation, if the value is a Quantity, or a SampledData (just search on the bounds of the values in sampled data)
+ * Type: quantity
+ * Path: Observation.component.valueQuantity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam COMPONENT_VALUE_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_COMPONENT_VALUE_QUANTITY); + + /** + * Search parameter: data-absent-reason + *

+ * Description: The reason why the expected value in the element Observation.value[x] is missing.
+ * Type: token
+ * Path: Observation.dataAbsentReason
+ *

+ */ @SearchParamDefinition(name="data-absent-reason", path="Observation.dataAbsentReason", description="The reason why the expected value in the element Observation.value[x] is missing.", type="token" ) public static final String SP_DATA_ABSENT_REASON = "data-absent-reason"; + /** + * Fluent Client search parameter constant for data-absent-reason + *

+ * Description: The reason why the expected value in the element Observation.value[x] is missing.
+ * Type: token
+ * Path: Observation.dataAbsentReason
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam DATA_ABSENT_REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DATA_ABSENT_REASON); + + /** + * Search parameter: encounter + *

+ * Description: Healthcare event related to the observation
+ * Type: reference
+ * Path: Observation.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Observation.encounter", description="Healthcare event related to the observation", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Healthcare event related to the observation
+ * Type: reference
+ * Path: Observation.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Observation:encounter").toLocked(); + /** + * Search parameter: related-type + *

+ * Description: has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by
+ * Type: token
+ * Path: Observation.related.type
+ *

+ */ @SearchParamDefinition(name="related-type", path="Observation.related.type", description="has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by", type="token" ) public static final String SP_RELATED_TYPE = "related-type"; + /** + * Fluent Client search parameter constant for related-type + *

+ * Description: has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by
+ * Type: token
+ * Path: Observation.related.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATED_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATED_TYPE); + + /** + * Search parameter: related-target + *

+ * Description: Resource that is related to this one
+ * Type: reference
+ * Path: Observation.related.target
+ *

+ */ @SearchParamDefinition(name="related-target", path="Observation.related.target", description="Resource that is related to this one", type="reference" ) public static final String SP_RELATED_TARGET = "related-target"; + /** + * Fluent Client search parameter constant for related-target + *

+ * Description: Resource that is related to this one
+ * Type: reference
+ * Path: Observation.related.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED_TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:related-target". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATED_TARGET = new ca.uhn.fhir.model.api.Include("Observation:related-target").toLocked(); + /** + * Search parameter: component-value-string + *

+ * Description: The value of the component observation, if the value is a string, and also searches in CodeableConcept.text
+ * Type: string
+ * Path: Observation.component.valueString
+ *

+ */ @SearchParamDefinition(name="component-value-string", path="Observation.component.valueString", description="The value of the component observation, if the value is a string, and also searches in CodeableConcept.text", type="string" ) public static final String SP_COMPONENT_VALUE_STRING = "component-value-string"; + /** + * Fluent Client search parameter constant for component-value-string + *

+ * Description: The value of the component observation, if the value is a string, and also searches in CodeableConcept.text
+ * Type: string
+ * Path: Observation.component.valueString
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam COMPONENT_VALUE_STRING = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_COMPONENT_VALUE_STRING); + + /** + * Search parameter: component-value-concept + *

+ * Description: The value of the component observation, if the value is a CodeableConcept
+ * Type: token
+ * Path: Observation.component.valueCodeableConcept
+ *

+ */ @SearchParamDefinition(name="component-value-concept", path="Observation.component.valueCodeableConcept", description="The value of the component observation, if the value is a CodeableConcept", type="token" ) public static final String SP_COMPONENT_VALUE_CONCEPT = "component-value-concept"; + /** + * Fluent Client search parameter constant for component-value-concept + *

+ * Description: The value of the component observation, if the value is a CodeableConcept
+ * Type: token
+ * Path: Observation.component.valueCodeableConcept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam COMPONENT_VALUE_CONCEPT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_COMPONENT_VALUE_CONCEPT); + + /** + * Search parameter: category + *

+ * Description: The classification of the type of observation
+ * Type: token
+ * Path: Observation.category
+ *

+ */ @SearchParamDefinition(name="category", path="Observation.category", description="The classification of the type of observation", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: The classification of the type of observation
+ * Type: token
+ * Path: Observation.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + + /** + * Search parameter: device + *

+ * Description: The Device that generated the observation data.
+ * Type: reference
+ * Path: Observation.device
+ *

+ */ @SearchParamDefinition(name="device", path="Observation.device", description="The Device that generated the observation data.", type="reference" ) public static final String SP_DEVICE = "device"; + /** + * Fluent Client search parameter constant for device + *

+ * Description: The Device that generated the observation data.
+ * Type: reference
+ * Path: Observation.device
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Observation:device". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DEVICE = new ca.uhn.fhir.model.api.Include("Observation:device").toLocked(); + /** + * Search parameter: status + *

+ * Description: The status of the observation
+ * Type: token
+ * Path: Observation.status
+ *

+ */ @SearchParamDefinition(name="status", path="Observation.status", description="The status of the observation", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the observation
+ * Type: token
+ * Path: Observation.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationDefinition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationDefinition.java index f1837e4512b..9affe3e99ac 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationDefinition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2476,38 +2476,272 @@ public class OperationDefinition extends DomainResource { return ResourceType.OperationDefinition; } + /** + * Search parameter: date + *

+ * Description: Date for this version of the operation definition
+ * Type: date
+ * Path: OperationDefinition.date
+ *

+ */ @SearchParamDefinition(name="date", path="OperationDefinition.date", description="Date for this version of the operation definition", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Date for this version of the operation definition
+ * Type: date
+ * Path: OperationDefinition.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: code + *

+ * Description: Name used to invoke the operation
+ * Type: token
+ * Path: OperationDefinition.code
+ *

+ */ @SearchParamDefinition(name="code", path="OperationDefinition.code", description="Name used to invoke the operation", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Name used to invoke the operation
+ * Type: token
+ * Path: OperationDefinition.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: instance + *

+ * Description: Invoke on an instance?
+ * Type: token
+ * Path: OperationDefinition.instance
+ *

+ */ @SearchParamDefinition(name="instance", path="OperationDefinition.instance", description="Invoke on an instance?", type="token" ) public static final String SP_INSTANCE = "instance"; + /** + * Fluent Client search parameter constant for instance + *

+ * Description: Invoke on an instance?
+ * Type: token
+ * Path: OperationDefinition.instance
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam INSTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_INSTANCE); + + /** + * Search parameter: kind + *

+ * Description: operation | query
+ * Type: token
+ * Path: OperationDefinition.kind
+ *

+ */ @SearchParamDefinition(name="kind", path="OperationDefinition.kind", description="operation | query", type="token" ) public static final String SP_KIND = "kind"; + /** + * Fluent Client search parameter constant for kind + *

+ * Description: operation | query
+ * Type: token
+ * Path: OperationDefinition.kind
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam KIND = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_KIND); + + /** + * Search parameter: profile + *

+ * Description: Profile on the type
+ * Type: reference
+ * Path: OperationDefinition.parameter.profile
+ *

+ */ @SearchParamDefinition(name="profile", path="OperationDefinition.parameter.profile", description="Profile on the type", type="reference" ) public static final String SP_PROFILE = "profile"; + /** + * Fluent Client search parameter constant for profile + *

+ * Description: Profile on the type
+ * Type: reference
+ * Path: OperationDefinition.parameter.profile
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROFILE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "OperationDefinition:profile". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROFILE = new ca.uhn.fhir.model.api.Include("OperationDefinition:profile").toLocked(); + /** + * Search parameter: type + *

+ * Description: Invoke at resource level for these type
+ * Type: token
+ * Path: OperationDefinition.type
+ *

+ */ @SearchParamDefinition(name="type", path="OperationDefinition.type", description="Invoke at resource level for these type", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Invoke at resource level for these type
+ * Type: token
+ * Path: OperationDefinition.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: version + *

+ * Description: Logical id for this version of the operation definition
+ * Type: token
+ * Path: OperationDefinition.version
+ *

+ */ @SearchParamDefinition(name="version", path="OperationDefinition.version", description="Logical id for this version of the operation definition", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: Logical id for this version of the operation definition
+ * Type: token
+ * Path: OperationDefinition.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: Logical URL to reference this operation definition
+ * Type: uri
+ * Path: OperationDefinition.url
+ *

+ */ @SearchParamDefinition(name="url", path="OperationDefinition.url", description="Logical URL to reference this operation definition", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Logical URL to reference this operation definition
+ * Type: uri
+ * Path: OperationDefinition.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: system + *

+ * Description: Invoke at the system level?
+ * Type: token
+ * Path: OperationDefinition.system
+ *

+ */ @SearchParamDefinition(name="system", path="OperationDefinition.system", description="Invoke at the system level?", type="token" ) public static final String SP_SYSTEM = "system"; + /** + * Fluent Client search parameter constant for system + *

+ * Description: Invoke at the system level?
+ * Type: token
+ * Path: OperationDefinition.system
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SYSTEM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SYSTEM); + + /** + * Search parameter: name + *

+ * Description: Informal name for this operation
+ * Type: string
+ * Path: OperationDefinition.name
+ *

+ */ @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this operation", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Informal name for this operation
+ * Type: string
+ * Path: OperationDefinition.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher (Organization or individual)
+ * Type: string
+ * Path: OperationDefinition.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="OperationDefinition.publisher", description="Name of the publisher (Organization or individual)", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher (Organization or individual)
+ * Type: string
+ * Path: OperationDefinition.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: status + *

+ * Description: draft | active | retired
+ * Type: token
+ * Path: OperationDefinition.status
+ *

+ */ @SearchParamDefinition(name="status", path="OperationDefinition.status", description="draft | active | retired", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: draft | active | retired
+ * Type: token
+ * Path: OperationDefinition.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + + /** + * Search parameter: base + *

+ * Description: Marks this as a profile of the base
+ * Type: reference
+ * Path: OperationDefinition.base
+ *

+ */ @SearchParamDefinition(name="base", path="OperationDefinition.base", description="Marks this as a profile of the base", type="reference" ) public static final String SP_BASE = "base"; + /** + * Fluent Client search parameter constant for base + *

+ * Description: Marks this as a profile of the base
+ * Type: reference
+ * Path: OperationDefinition.base
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam BASE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_BASE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "OperationDefinition:base". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationOutcome.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationOutcome.java index 2d435fe6c1c..657eda02242 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationOutcome.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Order.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Order.java index 31fbcaf8d38..d9a12f74cc0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Order.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Order.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -736,54 +736,216 @@ public class Order extends DomainResource { return ResourceType.Order; } + /** + * Search parameter: date + *

+ * Description: When the order was made
+ * Type: date
+ * Path: Order.date
+ *

+ */ @SearchParamDefinition(name="date", path="Order.date", description="When the order was made", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the order was made
+ * Type: date
+ * Path: Order.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Instance id from source, target, and/or others
+ * Type: token
+ * Path: Order.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Order.identifier", description="Instance id from source, target, and/or others", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Instance id from source, target, and/or others
+ * Type: token
+ * Path: Order.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: subject + *

+ * Description: Patient this order is about
+ * Type: reference
+ * Path: Order.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Order.subject", description="Patient this order is about", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Patient this order is about
+ * Type: reference
+ * Path: Order.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Order:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Order:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Patient this order is about
+ * Type: reference
+ * Path: Order.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Order.subject", description="Patient this order is about", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient this order is about
+ * Type: reference
+ * Path: Order.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Order:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Order:patient").toLocked(); + /** + * Search parameter: source + *

+ * Description: Who initiated the order
+ * Type: reference
+ * Path: Order.source
+ *

+ */ @SearchParamDefinition(name="source", path="Order.source", description="Who initiated the order", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Who initiated the order
+ * Type: reference
+ * Path: Order.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Order:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("Order:source").toLocked(); + /** + * Search parameter: detail + *

+ * Description: What action is being ordered
+ * Type: reference
+ * Path: Order.detail
+ *

+ */ @SearchParamDefinition(name="detail", path="Order.detail", description="What action is being ordered", type="reference" ) public static final String SP_DETAIL = "detail"; + /** + * Fluent Client search parameter constant for detail + *

+ * Description: What action is being ordered
+ * Type: reference
+ * Path: Order.detail
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DETAIL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DETAIL); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Order:detail". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_DETAIL = new ca.uhn.fhir.model.api.Include("Order:detail").toLocked(); + /** + * Search parameter: when + *

+ * Description: A formal schedule
+ * Type: date
+ * Path: Order.when.schedule
+ *

+ */ @SearchParamDefinition(name="when", path="Order.when.schedule", description="A formal schedule", type="date" ) public static final String SP_WHEN = "when"; + /** + * Fluent Client search parameter constant for when + *

+ * Description: A formal schedule
+ * Type: date
+ * Path: Order.when.schedule
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam WHEN = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_WHEN); + + /** + * Search parameter: target + *

+ * Description: Who is intended to fulfill the order
+ * Type: reference
+ * Path: Order.target
+ *

+ */ @SearchParamDefinition(name="target", path="Order.target", description="Who is intended to fulfill the order", type="reference" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: Who is intended to fulfill the order
+ * Type: reference
+ * Path: Order.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Order:target". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("Order:target").toLocked(); + /** + * Search parameter: when_code + *

+ * Description: Code specifies when request should be done. The code may simply be a priority code
+ * Type: token
+ * Path: Order.when.code
+ *

+ */ @SearchParamDefinition(name="when_code", path="Order.when.code", description="Code specifies when request should be done. The code may simply be a priority code", type="token" ) public static final String SP_WHENCODE = "when_code"; + /** + * Fluent Client search parameter constant for when_code + *

+ * Description: Code specifies when request should be done. The code may simply be a priority code
+ * Type: token
+ * Path: Order.when.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam WHENCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_WHENCODE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderResponse.java index 3f57b42b8de..b45b775f476 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -768,30 +768,138 @@ public class OrderResponse extends DomainResource { return ResourceType.OrderResponse; } + /** + * Search parameter: date + *

+ * Description: When the response was made
+ * Type: date
+ * Path: OrderResponse.date
+ *

+ */ @SearchParamDefinition(name="date", path="OrderResponse.date", description="When the response was made", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the response was made
+ * Type: date
+ * Path: OrderResponse.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: request + *

+ * Description: The order that this is a response to
+ * Type: reference
+ * Path: OrderResponse.request
+ *

+ */ @SearchParamDefinition(name="request", path="OrderResponse.request", description="The order that this is a response to", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The order that this is a response to
+ * Type: reference
+ * Path: OrderResponse.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "OrderResponse:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("OrderResponse:request").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Identifiers assigned to this order by the orderer or by the receiver
+ * Type: token
+ * Path: OrderResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="OrderResponse.identifier", description="Identifiers assigned to this order by the orderer or by the receiver", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Identifiers assigned to this order by the orderer or by the receiver
+ * Type: token
+ * Path: OrderResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed
+ * Type: token
+ * Path: OrderResponse.orderStatus
+ *

+ */ @SearchParamDefinition(name="code", path="OrderResponse.orderStatus", description="pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed
+ * Type: token
+ * Path: OrderResponse.orderStatus
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: fulfillment + *

+ * Description: Details of the outcome of performing the order
+ * Type: reference
+ * Path: OrderResponse.fulfillment
+ *

+ */ @SearchParamDefinition(name="fulfillment", path="OrderResponse.fulfillment", description="Details of the outcome of performing the order", type="reference" ) public static final String SP_FULFILLMENT = "fulfillment"; + /** + * Fluent Client search parameter constant for fulfillment + *

+ * Description: Details of the outcome of performing the order
+ * Type: reference
+ * Path: OrderResponse.fulfillment
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FULFILLMENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FULFILLMENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "OrderResponse:fulfillment". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_FULFILLMENT = new ca.uhn.fhir.model.api.Include("OrderResponse:fulfillment").toLocked(); + /** + * Search parameter: who + *

+ * Description: Who made the response
+ * Type: reference
+ * Path: OrderResponse.who
+ *

+ */ @SearchParamDefinition(name="who", path="OrderResponse.who", description="Who made the response", type="reference" ) public static final String SP_WHO = "who"; + /** + * Fluent Client search parameter constant for who + *

+ * Description: Who made the response
+ * Type: reference
+ * Path: OrderResponse.who
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam WHO = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_WHO); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "OrderResponse:who". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderSet.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderSet.java index 4b72ecd0b1c..cc2a2017b0b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderSet.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/OrderSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Organization.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Organization.java index cca64e98927..5f3e7432aa8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Organization.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Organization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -819,36 +819,252 @@ public class Organization extends DomainResource { return ResourceType.Organization; } + /** + * Search parameter: identifier + *

+ * Description: Any identifier for the organization (not the accreditation issuer's identifier)
+ * Type: token
+ * Path: Organization.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Organization.identifier", description="Any identifier for the organization (not the accreditation issuer's identifier)", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Any identifier for the organization (not the accreditation issuer's identifier)
+ * Type: token
+ * Path: Organization.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: partof + *

+ * Description: Search all organizations that are part of the given organization
+ * Type: reference
+ * Path: Organization.partOf
+ *

+ */ @SearchParamDefinition(name="partof", path="Organization.partOf", description="Search all organizations that are part of the given organization", type="reference" ) public static final String SP_PARTOF = "partof"; + /** + * Fluent Client search parameter constant for partof + *

+ * Description: Search all organizations that are part of the given organization
+ * Type: reference
+ * Path: Organization.partOf
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTOF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTOF); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Organization:partof". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTOF = new ca.uhn.fhir.model.api.Include("Organization:partof").toLocked(); + /** + * Search parameter: phonetic + *

+ * Description: A portion of the organization's name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Organization.name
+ *

+ */ @SearchParamDefinition(name="phonetic", path="Organization.name", description="A portion of the organization's name using some kind of phonetic matching algorithm", type="string" ) public static final String SP_PHONETIC = "phonetic"; + /** + * Fluent Client search parameter constant for phonetic + *

+ * Description: A portion of the organization's name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Organization.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PHONETIC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PHONETIC); + + /** + * Search parameter: address + *

+ * Description: A (part of the) address of the Organization
+ * Type: string
+ * Path: Organization.address
+ *

+ */ @SearchParamDefinition(name="address", path="Organization.address", description="A (part of the) address of the Organization", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: A (part of the) address of the Organization
+ * Type: string
+ * Path: Organization.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Organization.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="Organization.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Organization.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: name + *

+ * Description: A portion of the organization's name
+ * Type: string
+ * Path: Organization.name
+ *

+ */ @SearchParamDefinition(name="name", path="Organization.name", description="A portion of the organization's name", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of the organization's name
+ * Type: string
+ * Path: Organization.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Organization.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="Organization.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Organization.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: active + *

+ * Description: Whether the organization's record is active
+ * Type: token
+ * Path: Organization.active
+ *

+ */ @SearchParamDefinition(name="active", path="Organization.active", description="Whether the organization's record is active", type="token" ) public static final String SP_ACTIVE = "active"; + /** + * Fluent Client search parameter constant for active + *

+ * Description: Whether the organization's record is active
+ * Type: token
+ * Path: Organization.active
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTIVE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTIVE); + + /** + * Search parameter: type + *

+ * Description: A code for the type of organization
+ * Type: token
+ * Path: Organization.type
+ *

+ */ @SearchParamDefinition(name="type", path="Organization.type", description="A code for the type of organization", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: A code for the type of organization
+ * Type: token
+ * Path: Organization.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Organization.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="Organization.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Organization.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Organization.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="Organization.address.postalCode", description="A postal code specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Organization.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Organization.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="Organization.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Organization.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Parameters.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Parameters.java index 66953c55015..d84b9e68b34 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Parameters.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Parameters.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Patient.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Patient.java index 7a3ed2acaf4..92a04c61714 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Patient.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Patient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2213,74 +2213,524 @@ public class Patient extends DomainResource { return ResourceType.Patient; } + /** + * Search parameter: birthdate + *

+ * Description: The patient's date of birth
+ * Type: date
+ * Path: Patient.birthDate
+ *

+ */ @SearchParamDefinition(name="birthdate", path="Patient.birthDate", description="The patient's date of birth", type="date" ) public static final String SP_BIRTHDATE = "birthdate"; + /** + * Fluent Client search parameter constant for birthdate + *

+ * Description: The patient's date of birth
+ * Type: date
+ * Path: Patient.birthDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam BIRTHDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_BIRTHDATE); + + /** + * Search parameter: deceased + *

+ * Description: This patient has been marked as deceased, or as a death date entered
+ * Type: token
+ * Path: Patient.deceased[x]
+ *

+ */ @SearchParamDefinition(name="deceased", path="Patient.deceased[x]", description="This patient has been marked as deceased, or as a death date entered", type="token" ) public static final String SP_DECEASED = "deceased"; + /** + * Fluent Client search parameter constant for deceased + *

+ * Description: This patient has been marked as deceased, or as a death date entered
+ * Type: token
+ * Path: Patient.deceased[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam DECEASED = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DECEASED); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Patient.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="Patient.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Patient.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: gender + *

+ * Description: Gender of the patient
+ * Type: token
+ * Path: Patient.gender
+ *

+ */ @SearchParamDefinition(name="gender", path="Patient.gender", description="Gender of the patient", type="token" ) public static final String SP_GENDER = "gender"; + /** + * Fluent Client search parameter constant for gender + *

+ * Description: Gender of the patient
+ * Type: token
+ * Path: Patient.gender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENDER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENDER); + + /** + * Search parameter: animal-species + *

+ * Description: The species for animal patients
+ * Type: token
+ * Path: Patient.animal.species
+ *

+ */ @SearchParamDefinition(name="animal-species", path="Patient.animal.species", description="The species for animal patients", type="token" ) public static final String SP_ANIMAL_SPECIES = "animal-species"; + /** + * Fluent Client search parameter constant for animal-species + *

+ * Description: The species for animal patients
+ * Type: token
+ * Path: Patient.animal.species
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ANIMAL_SPECIES = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ANIMAL_SPECIES); + + /** + * Search parameter: link + *

+ * Description: All patients linked to the given patient
+ * Type: reference
+ * Path: Patient.link.other
+ *

+ */ @SearchParamDefinition(name="link", path="Patient.link.other", description="All patients linked to the given patient", type="reference" ) public static final String SP_LINK = "link"; + /** + * Fluent Client search parameter constant for link + *

+ * Description: All patients linked to the given patient
+ * Type: reference
+ * Path: Patient.link.other
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LINK = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LINK); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Patient:link". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LINK = new ca.uhn.fhir.model.api.Include("Patient:link").toLocked(); + /** + * Search parameter: language + *

+ * Description: Language code (irrespective of use value)
+ * Type: token
+ * Path: Patient.communication.language
+ *

+ */ @SearchParamDefinition(name="language", path="Patient.communication.language", description="Language code (irrespective of use value)", type="token" ) public static final String SP_LANGUAGE = "language"; + /** + * Fluent Client search parameter constant for language + *

+ * Description: Language code (irrespective of use value)
+ * Type: token
+ * Path: Patient.communication.language
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam LANGUAGE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_LANGUAGE); + + /** + * Search parameter: deathdate + *

+ * Description: The date of death has been provided and satisfies this search value
+ * Type: date
+ * Path: Patient.deceasedDateTime
+ *

+ */ @SearchParamDefinition(name="deathdate", path="Patient.deceasedDateTime", description="The date of death has been provided and satisfies this search value", type="date" ) public static final String SP_DEATHDATE = "deathdate"; + /** + * Fluent Client search parameter constant for deathdate + *

+ * Description: The date of death has been provided and satisfies this search value
+ * Type: date
+ * Path: Patient.deceasedDateTime
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DEATHDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DEATHDATE); + + /** + * Search parameter: animal-breed + *

+ * Description: The breed for animal patients
+ * Type: token
+ * Path: Patient.animal.breed
+ *

+ */ @SearchParamDefinition(name="animal-breed", path="Patient.animal.breed", description="The breed for animal patients", type="token" ) public static final String SP_ANIMAL_BREED = "animal-breed"; + /** + * Fluent Client search parameter constant for animal-breed + *

+ * Description: The breed for animal patients
+ * Type: token
+ * Path: Patient.animal.breed
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ANIMAL_BREED = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ANIMAL_BREED); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Patient.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="Patient.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Patient.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + + /** + * Search parameter: phonetic + *

+ * Description: A portion of either family or given name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Patient.name
+ *

+ */ @SearchParamDefinition(name="phonetic", path="Patient.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string" ) public static final String SP_PHONETIC = "phonetic"; + /** + * Fluent Client search parameter constant for phonetic + *

+ * Description: A portion of either family or given name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Patient.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PHONETIC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PHONETIC); + + /** + * Search parameter: telecom + *

+ * Description: The value in any kind of telecom details of the patient
+ * Type: token
+ * Path: Patient.telecom
+ *

+ */ @SearchParamDefinition(name="telecom", path="Patient.telecom", description="The value in any kind of telecom details of the patient", type="token" ) public static final String SP_TELECOM = "telecom"; + /** + * Fluent Client search parameter constant for telecom + *

+ * Description: The value in any kind of telecom details of the patient
+ * Type: token
+ * Path: Patient.telecom
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Patient.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="Patient.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Patient.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Patient.telecom(system=email)
+ *

+ */ @SearchParamDefinition(name="email", path="Patient.telecom.where(system='email')", description="A value in an email contact", type="token" ) public static final String SP_EMAIL = "email"; + /** + * Fluent Client search parameter constant for email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Patient.telecom(system=email)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EMAIL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EMAIL); + + /** + * Search parameter: identifier + *

+ * Description: A patient identifier
+ * Type: token
+ * Path: Patient.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Patient.identifier", description="A patient identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A patient identifier
+ * Type: token
+ * Path: Patient.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: given + *

+ * Description: A portion of the given name of the patient
+ * Type: string
+ * Path: Patient.name.given
+ *

+ */ @SearchParamDefinition(name="given", path="Patient.name.given", description="A portion of the given name of the patient", type="string" ) public static final String SP_GIVEN = "given"; + /** + * Fluent Client search parameter constant for given + *

+ * Description: A portion of the given name of the patient
+ * Type: string
+ * Path: Patient.name.given
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam GIVEN = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_GIVEN); + + /** + * Search parameter: address + *

+ * Description: An address in any kind of address/part of the patient
+ * Type: string
+ * Path: Patient.address
+ *

+ */ @SearchParamDefinition(name="address", path="Patient.address", description="An address in any kind of address/part of the patient", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: An address in any kind of address/part of the patient
+ * Type: string
+ * Path: Patient.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: active + *

+ * Description: Whether the patient record is active
+ * Type: token
+ * Path: Patient.active
+ *

+ */ @SearchParamDefinition(name="active", path="Patient.active", description="Whether the patient record is active", type="token" ) public static final String SP_ACTIVE = "active"; + /** + * Fluent Client search parameter constant for active + *

+ * Description: Whether the patient record is active
+ * Type: token
+ * Path: Patient.active
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTIVE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTIVE); + + /** + * Search parameter: address-postalcode + *

+ * Description: A postalCode specified in an address
+ * Type: string
+ * Path: Patient.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="Patient.address.postalCode", description="A postalCode specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postalCode specified in an address
+ * Type: string
+ * Path: Patient.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: careprovider + *

+ * Description: Patient's nominated care provider, could be a care manager, not the organization that manages the record
+ * Type: reference
+ * Path: Patient.careProvider
+ *

+ */ @SearchParamDefinition(name="careprovider", path="Patient.careProvider", description="Patient's nominated care provider, could be a care manager, not the organization that manages the record", type="reference" ) public static final String SP_CAREPROVIDER = "careprovider"; + /** + * Fluent Client search parameter constant for careprovider + *

+ * Description: Patient's nominated care provider, could be a care manager, not the organization that manages the record
+ * Type: reference
+ * Path: Patient.careProvider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CAREPROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CAREPROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Patient:careprovider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CAREPROVIDER = new ca.uhn.fhir.model.api.Include("Patient:careprovider").toLocked(); + /** + * Search parameter: phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Patient.telecom(system=phone)
+ *

+ */ @SearchParamDefinition(name="phone", path="Patient.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) public static final String SP_PHONE = "phone"; + /** + * Fluent Client search parameter constant for phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Patient.telecom(system=phone)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PHONE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PHONE); + + /** + * Search parameter: organization + *

+ * Description: The organization at which this person is a patient
+ * Type: reference
+ * Path: Patient.managingOrganization
+ *

+ */ @SearchParamDefinition(name="organization", path="Patient.managingOrganization", description="The organization at which this person is a patient", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization at which this person is a patient
+ * Type: reference
+ * Path: Patient.managingOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Patient:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Patient:organization").toLocked(); + /** + * Search parameter: name + *

+ * Description: A portion of either family or given name of the patient
+ * Type: string
+ * Path: Patient.name
+ *

+ */ @SearchParamDefinition(name="name", path="Patient.name", description="A portion of either family or given name of the patient", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of either family or given name of the patient
+ * Type: string
+ * Path: Patient.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Patient.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="Patient.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Patient.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: family + *

+ * Description: A portion of the family name of the patient
+ * Type: string
+ * Path: Patient.name.family
+ *

+ */ @SearchParamDefinition(name="family", path="Patient.name.family", description="A portion of the family name of the patient", type="string" ) public static final String SP_FAMILY = "family"; + /** + * Fluent Client search parameter constant for family + *

+ * Description: A portion of the family name of the patient
+ * Type: string
+ * Path: Patient.name.family
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam FAMILY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_FAMILY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentNotice.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentNotice.java index 59f84bb6010..801afa299da 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentNotice.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentNotice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -743,46 +743,190 @@ public class PaymentNotice extends DomainResource { return ResourceType.PaymentNotice; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the notice
+ * Type: token
+ * Path: PaymentNotice.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="PaymentNotice.identifier", description="The business identifier of the notice", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the notice
+ * Type: token
+ * Path: PaymentNotice.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: The Claim
+ * Type: reference
+ * Path: PaymentNotice.request
+ *

+ */ @SearchParamDefinition(name="request", path="PaymentNotice.request", description="The Claim", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The Claim
+ * Type: reference
+ * Path: PaymentNotice.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentNotice:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("PaymentNotice:request").toLocked(); + /** + * Search parameter: provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: PaymentNotice.provider
+ *

+ */ @SearchParamDefinition(name="provider", path="PaymentNotice.provider", description="The reference to the provider", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: The reference to the provider
+ * Type: reference
+ * Path: PaymentNotice.provider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentNotice:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("PaymentNotice:provider").toLocked(); + /** + * Search parameter: created + *

+ * Description: Creation date fro the notice
+ * Type: date
+ * Path: PaymentNotice.created
+ *

+ */ @SearchParamDefinition(name="created", path="PaymentNotice.created", description="Creation date fro the notice", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: Creation date fro the notice
+ * Type: date
+ * Path: PaymentNotice.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: response + *

+ * Description: The ClaimResponse
+ * Type: reference
+ * Path: PaymentNotice.response
+ *

+ */ @SearchParamDefinition(name="response", path="PaymentNotice.response", description="The ClaimResponse", type="reference" ) public static final String SP_RESPONSE = "response"; + /** + * Fluent Client search parameter constant for response + *

+ * Description: The ClaimResponse
+ * Type: reference
+ * Path: PaymentNotice.response
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESPONSE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESPONSE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentNotice:response". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESPONSE = new ca.uhn.fhir.model.api.Include("PaymentNotice:response").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentNotice.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="PaymentNotice.organization", description="The organization who generated this resource", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentNotice.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentNotice:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("PaymentNotice:organization").toLocked(); + /** + * Search parameter: paymentstatus + *

+ * Description: The type of payment notice
+ * Type: token
+ * Path: PaymentNotice.paymentStatus
+ *

+ */ @SearchParamDefinition(name="paymentstatus", path="PaymentNotice.paymentStatus", description="The type of payment notice", type="token" ) public static final String SP_PAYMENTSTATUS = "paymentstatus"; + /** + * Fluent Client search parameter constant for paymentstatus + *

+ * Description: The type of payment notice
+ * Type: token
+ * Path: PaymentNotice.paymentStatus
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PAYMENTSTATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PAYMENTSTATUS); + + /** + * Search parameter: statusdate + *

+ * Description: The date of the payment action
+ * Type: date
+ * Path: PaymentNotice.statusDate
+ *

+ */ @SearchParamDefinition(name="statusdate", path="PaymentNotice.statusDate", description="The date of the payment action", type="date" ) public static final String SP_STATUSDATE = "statusdate"; + /** + * Fluent Client search parameter constant for statusdate + *

+ * Description: The date of the payment action
+ * Type: date
+ * Path: PaymentNotice.statusDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam STATUSDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_STATUSDATE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentReconciliation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentReconciliation.java index 3c0446313d0..67018a8d923 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/PaymentReconciliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1582,46 +1582,190 @@ public class PaymentReconciliation extends DomainResource { return ResourceType.PaymentReconciliation; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: PaymentReconciliation.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="PaymentReconciliation.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: PaymentReconciliation.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: PaymentReconciliation.request
+ *

+ */ @SearchParamDefinition(name="request", path="PaymentReconciliation.request", description="The reference to the claim", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: PaymentReconciliation.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentReconciliation:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("PaymentReconciliation:request").toLocked(); + /** + * Search parameter: disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: PaymentReconciliation.disposition
+ *

+ */ @SearchParamDefinition(name="disposition", path="PaymentReconciliation.disposition", description="The contents of the disposition message", type="string" ) public static final String SP_DISPOSITION = "disposition"; + /** + * Fluent Client search parameter constant for disposition + *

+ * Description: The contents of the disposition message
+ * Type: string
+ * Path: PaymentReconciliation.disposition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION); + + /** + * Search parameter: created + *

+ * Description: The creation date
+ * Type: date
+ * Path: PaymentReconciliation.created
+ *

+ */ @SearchParamDefinition(name="created", path="PaymentReconciliation.created", description="The creation date", type="date" ) public static final String SP_CREATED = "created"; + /** + * Fluent Client search parameter constant for created + *

+ * Description: The creation date
+ * Type: date
+ * Path: PaymentReconciliation.created
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED); + + /** + * Search parameter: organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentReconciliation.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="PaymentReconciliation.organization", description="The organization who generated this resource", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentReconciliation.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentReconciliation:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("PaymentReconciliation:organization").toLocked(); + /** + * Search parameter: requestprovider + *

+ * Description: The reference to the provider who sumbitted the claim
+ * Type: reference
+ * Path: PaymentReconciliation.requestProvider
+ *

+ */ @SearchParamDefinition(name="requestprovider", path="PaymentReconciliation.requestProvider", description="The reference to the provider who sumbitted the claim", type="reference" ) public static final String SP_REQUESTPROVIDER = "requestprovider"; + /** + * Fluent Client search parameter constant for requestprovider + *

+ * Description: The reference to the provider who sumbitted the claim
+ * Type: reference
+ * Path: PaymentReconciliation.requestProvider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTPROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTPROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentReconciliation:requestprovider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTPROVIDER = new ca.uhn.fhir.model.api.Include("PaymentReconciliation:requestprovider").toLocked(); + /** + * Search parameter: requestorganization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentReconciliation.requestOrganization
+ *

+ */ @SearchParamDefinition(name="requestorganization", path="PaymentReconciliation.requestOrganization", description="The organization who generated this resource", type="reference" ) public static final String SP_REQUESTORGANIZATION = "requestorganization"; + /** + * Fluent Client search parameter constant for requestorganization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: PaymentReconciliation.requestOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "PaymentReconciliation:requestorganization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTORGANIZATION = new ca.uhn.fhir.model.api.Include("PaymentReconciliation:requestorganization").toLocked(); + /** + * Search parameter: outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: PaymentReconciliation.outcome
+ *

+ */ @SearchParamDefinition(name="outcome", path="PaymentReconciliation.outcome", description="The processing outcome", type="token" ) public static final String SP_OUTCOME = "outcome"; + /** + * Fluent Client search parameter constant for outcome + *

+ * Description: The processing outcome
+ * Type: token
+ * Path: PaymentReconciliation.outcome
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam OUTCOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OUTCOME); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Period.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Period.java index 7d1c0d89d4c..70cd4bfd777 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Period.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Period.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 20:18-0500 for FHIR v1.2.0 import java.util.*; @@ -166,6 +166,32 @@ public class Period extends Type implements ICompositeType { return this; } + /** + * Sets the value for start () + * + *

+ * Definition: + * The start of the period. The boundary is inclusive. + *

+ */ + public Period setStart( Date theDate, TemporalPrecisionEnum thePrecision) { + start = new DateTimeType(theDate, thePrecision); + return this; + } + + /** + * Sets the value for end () + * + *

+ * Definition: + * The end of the period. The boundary is inclusive. + *

+ */ + public Period setEnd( Date theDate, TemporalPrecisionEnum thePrecision) { + end = new DateTimeType(theDate, thePrecision); + return this; + } + protected void listChildren(List childrenList) { super.listChildren(childrenList); childrenList.add(new Property("start", "dateTime", "The start of the period. The boundary is inclusive.", 0, java.lang.Integer.MAX_VALUE, start)); diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Person.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Person.java index 4ea7684b3a1..85e2701af24 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Person.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Person.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1016,74 +1016,416 @@ public class Person extends DomainResource { return ResourceType.Person; } + /** + * Search parameter: identifier + *

+ * Description: A person Identifier
+ * Type: token
+ * Path: Person.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Person.identifier", description="A person Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A person Identifier
+ * Type: token
+ * Path: Person.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: Person.address
+ *

+ */ @SearchParamDefinition(name="address", path="Person.address", description="An address in any kind of address/part", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: Person.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: birthdate + *

+ * Description: The person's date of birth
+ * Type: date
+ * Path: Person.birthDate
+ *

+ */ @SearchParamDefinition(name="birthdate", path="Person.birthDate", description="The person's date of birth", type="date" ) public static final String SP_BIRTHDATE = "birthdate"; + /** + * Fluent Client search parameter constant for birthdate + *

+ * Description: The person's date of birth
+ * Type: date
+ * Path: Person.birthDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam BIRTHDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_BIRTHDATE); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Person.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="Person.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Person.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: gender + *

+ * Description: The gender of the person
+ * Type: token
+ * Path: Person.gender
+ *

+ */ @SearchParamDefinition(name="gender", path="Person.gender", description="The gender of the person", type="token" ) public static final String SP_GENDER = "gender"; + /** + * Fluent Client search parameter constant for gender + *

+ * Description: The gender of the person
+ * Type: token
+ * Path: Person.gender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENDER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENDER); + + /** + * Search parameter: practitioner + *

+ * Description: The Person links to this Practitioner
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ @SearchParamDefinition(name="practitioner", path="Person.link.target", description="The Person links to this Practitioner", type="reference" ) public static final String SP_PRACTITIONER = "practitioner"; + /** + * Fluent Client search parameter constant for practitioner + *

+ * Description: The Person links to this Practitioner
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Person:practitioner". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("Person:practitioner").toLocked(); + /** + * Search parameter: link + *

+ * Description: Any link has this Patient, Person, RelatedPerson or Practitioner reference
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ @SearchParamDefinition(name="link", path="Person.link.target", description="Any link has this Patient, Person, RelatedPerson or Practitioner reference", type="reference" ) public static final String SP_LINK = "link"; + /** + * Fluent Client search parameter constant for link + *

+ * Description: Any link has this Patient, Person, RelatedPerson or Practitioner reference
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LINK = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LINK); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Person:link". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LINK = new ca.uhn.fhir.model.api.Include("Person:link").toLocked(); + /** + * Search parameter: relatedperson + *

+ * Description: The Person links to this RelatedPerson
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ @SearchParamDefinition(name="relatedperson", path="Person.link.target", description="The Person links to this RelatedPerson", type="reference" ) public static final String SP_RELATEDPERSON = "relatedperson"; + /** + * Fluent Client search parameter constant for relatedperson + *

+ * Description: The Person links to this RelatedPerson
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATEDPERSON = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATEDPERSON); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Person:relatedperson". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATEDPERSON = new ca.uhn.fhir.model.api.Include("Person:relatedperson").toLocked(); + /** + * Search parameter: address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Person.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="Person.address.postalCode", description="A postal code specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: Person.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Person.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="Person.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Person.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + + /** + * Search parameter: phonetic + *

+ * Description: A portion of name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Person.name
+ *

+ */ @SearchParamDefinition(name="phonetic", path="Person.name", description="A portion of name using some kind of phonetic matching algorithm", type="string" ) public static final String SP_PHONETIC = "phonetic"; + /** + * Fluent Client search parameter constant for phonetic + *

+ * Description: A portion of name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Person.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PHONETIC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PHONETIC); + + /** + * Search parameter: phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Person.telecom(system=phone)
+ *

+ */ @SearchParamDefinition(name="phone", path="Person.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) public static final String SP_PHONE = "phone"; + /** + * Fluent Client search parameter constant for phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Person.telecom(system=phone)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PHONE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PHONE); + + /** + * Search parameter: patient + *

+ * Description: The Person links to this Patient
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ @SearchParamDefinition(name="patient", path="Person.link.target", description="The Person links to this Patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The Person links to this Patient
+ * Type: reference
+ * Path: Person.link.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Person:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Person:patient").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization at which this person record is being managed
+ * Type: reference
+ * Path: Person.managingOrganization
+ *

+ */ @SearchParamDefinition(name="organization", path="Person.managingOrganization", description="The organization at which this person record is being managed", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization at which this person record is being managed
+ * Type: reference
+ * Path: Person.managingOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Person:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Person:organization").toLocked(); + /** + * Search parameter: name + *

+ * Description: A portion of name in any name part
+ * Type: string
+ * Path: Person.name
+ *

+ */ @SearchParamDefinition(name="name", path="Person.name", description="A portion of name in any name part", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of name in any name part
+ * Type: string
+ * Path: Person.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Person.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="Person.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Person.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: Person.telecom
+ *

+ */ @SearchParamDefinition(name="telecom", path="Person.telecom", description="The value in any kind of contact", type="token" ) public static final String SP_TELECOM = "telecom"; + /** + * Fluent Client search parameter constant for telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: Person.telecom
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Person.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="Person.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Person.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Person.telecom(system=email)
+ *

+ */ @SearchParamDefinition(name="email", path="Person.telecom.where(system='email')", description="A value in an email contact", type="token" ) public static final String SP_EMAIL = "email"; + /** + * Fluent Client search parameter constant for email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Person.telecom(system=email)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EMAIL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EMAIL); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Practitioner.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Practitioner.java index e43d50c4abf..1bf303e82ba 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Practitioner.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Practitioner.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1466,58 +1466,418 @@ public class Practitioner extends DomainResource { return ResourceType.Practitioner; } + /** + * Search parameter: identifier + *

+ * Description: A practitioner's Identifier
+ * Type: token
+ * Path: Practitioner.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Practitioner.identifier", description="A practitioner's Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A practitioner's Identifier
+ * Type: token
+ * Path: Practitioner.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: given + *

+ * Description: A portion of the given name
+ * Type: string
+ * Path: Practitioner.name.given
+ *

+ */ @SearchParamDefinition(name="given", path="Practitioner.name.given", description="A portion of the given name", type="string" ) public static final String SP_GIVEN = "given"; + /** + * Fluent Client search parameter constant for given + *

+ * Description: A portion of the given name
+ * Type: string
+ * Path: Practitioner.name.given
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam GIVEN = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_GIVEN); + + /** + * Search parameter: specialty + *

+ * Description: The practitioner has this specialty at an organization
+ * Type: token
+ * Path: Practitioner.practitionerRole.specialty
+ *

+ */ @SearchParamDefinition(name="specialty", path="Practitioner.practitionerRole.specialty", description="The practitioner has this specialty at an organization", type="token" ) public static final String SP_SPECIALTY = "specialty"; + /** + * Fluent Client search parameter constant for specialty + *

+ * Description: The practitioner has this specialty at an organization
+ * Type: token
+ * Path: Practitioner.practitionerRole.specialty
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIALTY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIALTY); + + /** + * Search parameter: address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: Practitioner.address
+ *

+ */ @SearchParamDefinition(name="address", path="Practitioner.address", description="An address in any kind of address/part", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: Practitioner.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: role + *

+ * Description: The practitioner can perform this role at for the organization
+ * Type: token
+ * Path: Practitioner.practitionerRole.role
+ *

+ */ @SearchParamDefinition(name="role", path="Practitioner.practitionerRole.role", description="The practitioner can perform this role at for the organization", type="token" ) public static final String SP_ROLE = "role"; + /** + * Fluent Client search parameter constant for role + *

+ * Description: The practitioner can perform this role at for the organization
+ * Type: token
+ * Path: Practitioner.practitionerRole.role
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROLE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROLE); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Practitioner.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="Practitioner.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: Practitioner.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: gender + *

+ * Description: Gender of the practitioner
+ * Type: token
+ * Path: Practitioner.gender
+ *

+ */ @SearchParamDefinition(name="gender", path="Practitioner.gender", description="Gender of the practitioner", type="token" ) public static final String SP_GENDER = "gender"; + /** + * Fluent Client search parameter constant for gender + *

+ * Description: Gender of the practitioner
+ * Type: token
+ * Path: Practitioner.gender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENDER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENDER); + + /** + * Search parameter: address-postalcode + *

+ * Description: A postalCode specified in an address
+ * Type: string
+ * Path: Practitioner.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="Practitioner.address.postalCode", description="A postalCode specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postalCode specified in an address
+ * Type: string
+ * Path: Practitioner.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Practitioner.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="Practitioner.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: Practitioner.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + + /** + * Search parameter: phonetic + *

+ * Description: A portion of either family or given name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Practitioner.name
+ *

+ */ @SearchParamDefinition(name="phonetic", path="Practitioner.name", description="A portion of either family or given name using some kind of phonetic matching algorithm", type="string" ) public static final String SP_PHONETIC = "phonetic"; + /** + * Fluent Client search parameter constant for phonetic + *

+ * Description: A portion of either family or given name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: Practitioner.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PHONETIC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PHONETIC); + + /** + * Search parameter: phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Practitioner.telecom(system=phone)
+ *

+ */ @SearchParamDefinition(name="phone", path="Practitioner.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) public static final String SP_PHONE = "phone"; + /** + * Fluent Client search parameter constant for phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: Practitioner.telecom(system=phone)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PHONE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PHONE); + + /** + * Search parameter: organization + *

+ * Description: The identity of the organization the practitioner represents / acts on behalf of
+ * Type: reference
+ * Path: Practitioner.practitionerRole.managingOrganization
+ *

+ */ @SearchParamDefinition(name="organization", path="Practitioner.practitionerRole.managingOrganization", description="The identity of the organization the practitioner represents / acts on behalf of", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The identity of the organization the practitioner represents / acts on behalf of
+ * Type: reference
+ * Path: Practitioner.practitionerRole.managingOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Practitioner:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Practitioner:organization").toLocked(); + /** + * Search parameter: name + *

+ * Description: A portion of either family or given name
+ * Type: string
+ * Path: Practitioner.name
+ *

+ */ @SearchParamDefinition(name="name", path="Practitioner.name", description="A portion of either family or given name", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of either family or given name
+ * Type: string
+ * Path: Practitioner.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Practitioner.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="Practitioner.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: Practitioner.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: Practitioner.telecom
+ *

+ */ @SearchParamDefinition(name="telecom", path="Practitioner.telecom", description="The value in any kind of contact", type="token" ) public static final String SP_TELECOM = "telecom"; + /** + * Fluent Client search parameter constant for telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: Practitioner.telecom
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); + + /** + * Search parameter: location + *

+ * Description: One of the locations at which this practitioner provides care
+ * Type: reference
+ * Path: Practitioner.practitionerRole.location
+ *

+ */ @SearchParamDefinition(name="location", path="Practitioner.practitionerRole.location", description="One of the locations at which this practitioner provides care", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: One of the locations at which this practitioner provides care
+ * Type: reference
+ * Path: Practitioner.practitionerRole.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Practitioner:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Practitioner:location").toLocked(); + /** + * Search parameter: family + *

+ * Description: A portion of the family name
+ * Type: string
+ * Path: Practitioner.name.family
+ *

+ */ @SearchParamDefinition(name="family", path="Practitioner.name.family", description="A portion of the family name", type="string" ) public static final String SP_FAMILY = "family"; + /** + * Fluent Client search parameter constant for family + *

+ * Description: A portion of the family name
+ * Type: string
+ * Path: Practitioner.name.family
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam FAMILY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_FAMILY); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Practitioner.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="Practitioner.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: Practitioner.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: communication + *

+ * Description: One of the languages that the practitioner can communicate with
+ * Type: token
+ * Path: Practitioner.communication
+ *

+ */ @SearchParamDefinition(name="communication", path="Practitioner.communication", description="One of the languages that the practitioner can communicate with", type="token" ) public static final String SP_COMMUNICATION = "communication"; + /** + * Fluent Client search parameter constant for communication + *

+ * Description: One of the languages that the practitioner can communicate with
+ * Type: token
+ * Path: Practitioner.communication
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam COMMUNICATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_COMMUNICATION); + + /** + * Search parameter: email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Practitioner.telecom(system=email)
+ *

+ */ @SearchParamDefinition(name="email", path="Practitioner.telecom.where(system='email')", description="A value in an email contact", type="token" ) public static final String SP_EMAIL = "email"; + /** + * Fluent Client search parameter constant for email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: Practitioner.telecom(system=email)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EMAIL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EMAIL); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Procedure.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Procedure.java index c0b05ee136d..a641f3da1e4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Procedure.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Procedure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1828,46 +1828,190 @@ public class Procedure extends DomainResource { return ResourceType.Procedure; } + /** + * Search parameter: date + *

+ * Description: Date/Period the procedure was performed
+ * Type: date
+ * Path: Procedure.performed[x]
+ *

+ */ @SearchParamDefinition(name="date", path="Procedure.performed[x]", description="Date/Period the procedure was performed", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Date/Period the procedure was performed
+ * Type: date
+ * Path: Procedure.performed[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: A unique identifier for a procedure
+ * Type: token
+ * Path: Procedure.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Procedure.identifier", description="A unique identifier for a procedure", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A unique identifier for a procedure
+ * Type: token
+ * Path: Procedure.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A code to identify a procedure
+ * Type: token
+ * Path: Procedure.code
+ *

+ */ @SearchParamDefinition(name="code", path="Procedure.code", description="A code to identify a procedure", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A code to identify a procedure
+ * Type: token
+ * Path: Procedure.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: performer + *

+ * Description: The reference to the practitioner
+ * Type: reference
+ * Path: Procedure.performer.actor
+ *

+ */ @SearchParamDefinition(name="performer", path="Procedure.performer.actor", description="The reference to the practitioner", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: The reference to the practitioner
+ * Type: reference
+ * Path: Procedure.performer.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Procedure:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("Procedure:performer").toLocked(); + /** + * Search parameter: subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: Procedure.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Procedure.subject", description="Search by subject", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: Procedure.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Procedure:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Procedure:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: Procedure.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Procedure.subject", description="Search by subject - a patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: Procedure.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Procedure:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Procedure:patient").toLocked(); + /** + * Search parameter: location + *

+ * Description: Where the procedure happened
+ * Type: reference
+ * Path: Procedure.location
+ *

+ */ @SearchParamDefinition(name="location", path="Procedure.location", description="Where the procedure happened", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: Where the procedure happened
+ * Type: reference
+ * Path: Procedure.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Procedure:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Procedure:location").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: The encounter associated with the procedure
+ * Type: reference
+ * Path: Procedure.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="Procedure.encounter", description="The encounter associated with the procedure", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: The encounter associated with the procedure
+ * Type: reference
+ * Path: Procedure.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Procedure:encounter". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcedureRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcedureRequest.java index 84e70de650c..f072d181e71 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcedureRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcedureRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1321,42 +1321,150 @@ public class ProcedureRequest extends DomainResource { return ResourceType.ProcedureRequest; } + /** + * Search parameter: identifier + *

+ * Description: A unique identifier of the Procedure Request
+ * Type: token
+ * Path: ProcedureRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ProcedureRequest.identifier", description="A unique identifier of the Procedure Request", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A unique identifier of the Procedure Request
+ * Type: token
+ * Path: ProcedureRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: performer + *

+ * Description: Who should perform the procedure
+ * Type: reference
+ * Path: ProcedureRequest.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="ProcedureRequest.performer", description="Who should perform the procedure", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: Who should perform the procedure
+ * Type: reference
+ * Path: ProcedureRequest.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcedureRequest:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("ProcedureRequest:performer").toLocked(); + /** + * Search parameter: subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: ProcedureRequest.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="ProcedureRequest.subject", description="Search by subject", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Search by subject
+ * Type: reference
+ * Path: ProcedureRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcedureRequest:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("ProcedureRequest:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: ProcedureRequest.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="ProcedureRequest.subject", description="Search by subject - a patient", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Search by subject - a patient
+ * Type: reference
+ * Path: ProcedureRequest.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcedureRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ProcedureRequest:patient").toLocked(); + /** + * Search parameter: orderer + *

+ * Description: Who made request
+ * Type: reference
+ * Path: ProcedureRequest.orderer
+ *

+ */ @SearchParamDefinition(name="orderer", path="ProcedureRequest.orderer", description="Who made request", type="reference" ) public static final String SP_ORDERER = "orderer"; + /** + * Fluent Client search parameter constant for orderer + *

+ * Description: Who made request
+ * Type: reference
+ * Path: ProcedureRequest.orderer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORDERER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORDERER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcedureRequest:orderer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORDERER = new ca.uhn.fhir.model.api.Include("ProcedureRequest:orderer").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Encounter request created during
+ * Type: reference
+ * Path: ProcedureRequest.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="ProcedureRequest.encounter", description="Encounter request created during", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Encounter request created during
+ * Type: reference
+ * Path: ProcedureRequest.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcedureRequest:encounter". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessRequest.java index b3d8973327b..b7ba0edd1dd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1319,26 +1319,98 @@ public class ProcessRequest extends DomainResource { return ResourceType.ProcessRequest; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the ProcessRequest
+ * Type: token
+ * Path: ProcessRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ProcessRequest.identifier", description="The business identifier of the ProcessRequest", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the ProcessRequest
+ * Type: token
+ * Path: ProcessRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: provider + *

+ * Description: The provider who regenerated this request
+ * Type: reference
+ * Path: ProcessRequest.provider
+ *

+ */ @SearchParamDefinition(name="provider", path="ProcessRequest.provider", description="The provider who regenerated this request", type="reference" ) public static final String SP_PROVIDER = "provider"; + /** + * Fluent Client search parameter constant for provider + *

+ * Description: The provider who regenerated this request
+ * Type: reference
+ * Path: ProcessRequest.provider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessRequest:provider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("ProcessRequest:provider").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization who generated this request
+ * Type: reference
+ * Path: ProcessRequest.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="ProcessRequest.organization", description="The organization who generated this request", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization who generated this request
+ * Type: reference
+ * Path: ProcessRequest.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessRequest:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("ProcessRequest:organization").toLocked(); + /** + * Search parameter: action + *

+ * Description: The action requested by this resource
+ * Type: token
+ * Path: ProcessRequest.action
+ *

+ */ @SearchParamDefinition(name="action", path="ProcessRequest.action", description="The action requested by this resource", type="token" ) public static final String SP_ACTION = "action"; + /** + * Fluent Client search parameter constant for action + *

+ * Description: The action requested by this resource
+ * Type: token
+ * Path: ProcessRequest.action
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTION); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessResponse.java index 498f672981d..ca0ab767974 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ProcessResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1001,34 +1001,124 @@ public class ProcessResponse extends DomainResource { return ResourceType.ProcessResponse; } + /** + * Search parameter: identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: ProcessResponse.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ProcessResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The business identifier of the Explanation of Benefit
+ * Type: token
+ * Path: ProcessResponse.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: request + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: ProcessResponse.request
+ *

+ */ @SearchParamDefinition(name="request", path="ProcessResponse.request", description="The reference to the claim", type="reference" ) public static final String SP_REQUEST = "request"; + /** + * Fluent Client search parameter constant for request + *

+ * Description: The reference to the claim
+ * Type: reference
+ * Path: ProcessResponse.request
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessResponse:request". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("ProcessResponse:request").toLocked(); + /** + * Search parameter: organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: ProcessResponse.organization
+ *

+ */ @SearchParamDefinition(name="organization", path="ProcessResponse.organization", description="The organization who generated this resource", type="reference" ) public static final String SP_ORGANIZATION = "organization"; + /** + * Fluent Client search parameter constant for organization + *

+ * Description: The organization who generated this resource
+ * Type: reference
+ * Path: ProcessResponse.organization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessResponse:organization". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("ProcessResponse:organization").toLocked(); + /** + * Search parameter: requestprovider + *

+ * Description: The Provider who is responsible the request transaction
+ * Type: reference
+ * Path: ProcessResponse.requestProvider
+ *

+ */ @SearchParamDefinition(name="requestprovider", path="ProcessResponse.requestProvider", description="The Provider who is responsible the request transaction", type="reference" ) public static final String SP_REQUESTPROVIDER = "requestprovider"; + /** + * Fluent Client search parameter constant for requestprovider + *

+ * Description: The Provider who is responsible the request transaction
+ * Type: reference
+ * Path: ProcessResponse.requestProvider
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTPROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTPROVIDER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessResponse:requestprovider". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTPROVIDER = new ca.uhn.fhir.model.api.Include("ProcessResponse:requestprovider").toLocked(); + /** + * Search parameter: requestorganization + *

+ * Description: The Organization who is responsible the request transaction
+ * Type: reference
+ * Path: ProcessResponse.requestOrganization
+ *

+ */ @SearchParamDefinition(name="requestorganization", path="ProcessResponse.requestOrganization", description="The Organization who is responsible the request transaction", type="reference" ) public static final String SP_REQUESTORGANIZATION = "requestorganization"; + /** + * Fluent Client search parameter constant for requestorganization + *

+ * Description: The Organization who is responsible the request transaction
+ * Type: reference
+ * Path: ProcessResponse.requestOrganization
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTORGANIZATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ProcessResponse:requestorganization". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Provenance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Provenance.java index 83dcd2da3c1..758d762d941 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Provenance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Provenance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1605,44 +1605,224 @@ public class Provenance extends DomainResource { return ResourceType.Provenance; } + /** + * Search parameter: sigtype + *

+ * Description: Indication of the reason the entity signed the object(s)
+ * Type: token
+ * Path: Provenance.signature.type
+ *

+ */ @SearchParamDefinition(name="sigtype", path="Provenance.signature.type", description="Indication of the reason the entity signed the object(s)", type="token" ) public static final String SP_SIGTYPE = "sigtype"; + /** + * Fluent Client search parameter constant for sigtype + *

+ * Description: Indication of the reason the entity signed the object(s)
+ * Type: token
+ * Path: Provenance.signature.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SIGTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SIGTYPE); + + /** + * Search parameter: agent + *

+ * Description: Individual, device or organization playing role
+ * Type: reference
+ * Path: Provenance.agent.actor
+ *

+ */ @SearchParamDefinition(name="agent", path="Provenance.agent.actor", description="Individual, device or organization playing role", type="reference" ) public static final String SP_AGENT = "agent"; + /** + * Fluent Client search parameter constant for agent + *

+ * Description: Individual, device or organization playing role
+ * Type: reference
+ * Path: Provenance.agent.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AGENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AGENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Provenance:agent". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AGENT = new ca.uhn.fhir.model.api.Include("Provenance:agent").toLocked(); + /** + * Search parameter: entitytype + *

+ * Description: The type of resource in this entity
+ * Type: token
+ * Path: Provenance.entity.type
+ *

+ */ @SearchParamDefinition(name="entitytype", path="Provenance.entity.type", description="The type of resource in this entity", type="token" ) public static final String SP_ENTITYTYPE = "entitytype"; + /** + * Fluent Client search parameter constant for entitytype + *

+ * Description: The type of resource in this entity
+ * Type: token
+ * Path: Provenance.entity.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ENTITYTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ENTITYTYPE); + + /** + * Search parameter: patient + *

+ * Description: Target Reference(s) (usually version specific)
+ * Type: reference
+ * Path: Provenance.target
+ *

+ */ @SearchParamDefinition(name="patient", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Target Reference(s) (usually version specific)
+ * Type: reference
+ * Path: Provenance.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Provenance:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Provenance:patient").toLocked(); + /** + * Search parameter: start + *

+ * Description: Starting time with inclusive boundary
+ * Type: date
+ * Path: Provenance.period.start
+ *

+ */ @SearchParamDefinition(name="start", path="Provenance.period.start", description="Starting time with inclusive boundary", type="date" ) public static final String SP_START = "start"; + /** + * Fluent Client search parameter constant for start + *

+ * Description: Starting time with inclusive boundary
+ * Type: date
+ * Path: Provenance.period.start
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam START = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_START); + + /** + * Search parameter: end + *

+ * Description: End time with inclusive boundary, if not ongoing
+ * Type: date
+ * Path: Provenance.period.end
+ *

+ */ @SearchParamDefinition(name="end", path="Provenance.period.end", description="End time with inclusive boundary, if not ongoing", type="date" ) public static final String SP_END = "end"; + /** + * Fluent Client search parameter constant for end + *

+ * Description: End time with inclusive boundary, if not ongoing
+ * Type: date
+ * Path: Provenance.period.end
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam END = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_END); + + /** + * Search parameter: location + *

+ * Description: Where the activity occurred, if relevant
+ * Type: reference
+ * Path: Provenance.location
+ *

+ */ @SearchParamDefinition(name="location", path="Provenance.location", description="Where the activity occurred, if relevant", type="reference" ) public static final String SP_LOCATION = "location"; + /** + * Fluent Client search parameter constant for location + *

+ * Description: Where the activity occurred, if relevant
+ * Type: reference
+ * Path: Provenance.location
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Provenance:location". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Provenance:location").toLocked(); + /** + * Search parameter: userid + *

+ * Description: Authorization-system identifier for the agent
+ * Type: token
+ * Path: Provenance.agent.userId
+ *

+ */ @SearchParamDefinition(name="userid", path="Provenance.agent.userId", description="Authorization-system identifier for the agent", type="token" ) public static final String SP_USERID = "userid"; + /** + * Fluent Client search parameter constant for userid + *

+ * Description: Authorization-system identifier for the agent
+ * Type: token
+ * Path: Provenance.agent.userId
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam USERID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USERID); + + /** + * Search parameter: entity + *

+ * Description: Identity of entity
+ * Type: uri
+ * Path: Provenance.entity.reference
+ *

+ */ @SearchParamDefinition(name="entity", path="Provenance.entity.reference", description="Identity of entity", type="uri" ) public static final String SP_ENTITY = "entity"; + /** + * Fluent Client search parameter constant for entity + *

+ * Description: Identity of entity
+ * Type: uri
+ * Path: Provenance.entity.reference
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam ENTITY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_ENTITY); + + /** + * Search parameter: target + *

+ * Description: Target Reference(s) (usually version specific)
+ * Type: reference
+ * Path: Provenance.target
+ *

+ */ @SearchParamDefinition(name="target", path="Provenance.target", description="Target Reference(s) (usually version specific)", type="reference" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: Target Reference(s) (usually version specific)
+ * Type: reference
+ * Path: Provenance.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Provenance:target". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Quantity.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Quantity.java index 04ab308710f..23e95d430bd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Quantity.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Quantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Questionnaire.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Questionnaire.java index d33e7a41c91..41c24f3033e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Questionnaire.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Questionnaire.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1814,20 +1814,146 @@ public class Questionnaire extends DomainResource { return ResourceType.Questionnaire; } + /** + * Search parameter: date + *

+ * Description: When the questionnaire was last changed
+ * Type: date
+ * Path: Questionnaire.date
+ *

+ */ @SearchParamDefinition(name="date", path="Questionnaire.date", description="When the questionnaire was last changed", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the questionnaire was last changed
+ * Type: date
+ * Path: Questionnaire.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: An identifier for the questionnaire
+ * Type: token
+ * Path: Questionnaire.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Questionnaire.identifier", description="An identifier for the questionnaire", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: An identifier for the questionnaire
+ * Type: token
+ * Path: Questionnaire.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A code that corresponds to the questionnaire or one of its groups
+ * Type: token
+ * Path: Questionnaire.item.concept
+ *

+ */ @SearchParamDefinition(name="code", path="Questionnaire.item.concept", description="A code that corresponds to the questionnaire or one of its groups", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A code that corresponds to the questionnaire or one of its groups
+ * Type: token
+ * Path: Questionnaire.item.concept
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: publisher + *

+ * Description: The author of the questionnaire
+ * Type: string
+ * Path: Questionnaire.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="Questionnaire.publisher", description="The author of the questionnaire", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: The author of the questionnaire
+ * Type: string
+ * Path: Questionnaire.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: title + *

+ * Description: All or part of the name of the questionnaire
+ * Type: string
+ * Path: Questionnaire.title
+ *

+ */ @SearchParamDefinition(name="title", path="Questionnaire.title", description="All or part of the name of the questionnaire", type="string" ) public static final String SP_TITLE = "title"; + /** + * Fluent Client search parameter constant for title + *

+ * Description: All or part of the name of the questionnaire
+ * Type: string
+ * Path: Questionnaire.title
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE); + + /** + * Search parameter: version + *

+ * Description: The business version of the questionnaire
+ * Type: string
+ * Path: Questionnaire.version
+ *

+ */ @SearchParamDefinition(name="version", path="Questionnaire.version", description="The business version of the questionnaire", type="string" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The business version of the questionnaire
+ * Type: string
+ * Path: Questionnaire.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam VERSION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VERSION); + + /** + * Search parameter: status + *

+ * Description: The status of the questionnaire
+ * Type: token
+ * Path: Questionnaire.status
+ *

+ */ @SearchParamDefinition(name="status", path="Questionnaire.status", description="The status of the questionnaire", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the questionnaire
+ * Type: token
+ * Path: Questionnaire.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/QuestionnaireResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/QuestionnaireResponse.java index fc0182d490a..3e16598b074 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/QuestionnaireResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1499,58 +1499,202 @@ public class QuestionnaireResponse extends DomainResource { return ResourceType.QuestionnaireResponse; } + /** + * Search parameter: authored + *

+ * Description: When the questionnaire was authored
+ * Type: date
+ * Path: QuestionnaireResponse.authored
+ *

+ */ @SearchParamDefinition(name="authored", path="QuestionnaireResponse.authored", description="When the questionnaire was authored", type="date" ) public static final String SP_AUTHORED = "authored"; + /** + * Fluent Client search parameter constant for authored + *

+ * Description: When the questionnaire was authored
+ * Type: date
+ * Path: QuestionnaireResponse.authored
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam AUTHORED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_AUTHORED); + + /** + * Search parameter: questionnaire + *

+ * Description: The questionnaire the answers are provided for
+ * Type: reference
+ * Path: QuestionnaireResponse.questionnaire
+ *

+ */ @SearchParamDefinition(name="questionnaire", path="QuestionnaireResponse.questionnaire", description="The questionnaire the answers are provided for", type="reference" ) public static final String SP_QUESTIONNAIRE = "questionnaire"; + /** + * Fluent Client search parameter constant for questionnaire + *

+ * Description: The questionnaire the answers are provided for
+ * Type: reference
+ * Path: QuestionnaireResponse.questionnaire
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam QUESTIONNAIRE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_QUESTIONNAIRE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:questionnaire". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_QUESTIONNAIRE = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:questionnaire").toLocked(); + /** + * Search parameter: subject + *

+ * Description: The subject of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="QuestionnaireResponse.subject", description="The subject of the questionnaire", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The subject of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:subject").toLocked(); + /** + * Search parameter: author + *

+ * Description: The author of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.author
+ *

+ */ @SearchParamDefinition(name="author", path="QuestionnaireResponse.author", description="The author of the questionnaire", type="reference" ) public static final String SP_AUTHOR = "author"; + /** + * Fluent Client search parameter constant for author + *

+ * Description: The author of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.author
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:author". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:author").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The patient that is the subject of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="QuestionnaireResponse.subject", description="The patient that is the subject of the questionnaire", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient that is the subject of the questionnaire
+ * Type: reference
+ * Path: QuestionnaireResponse.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:patient").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Encounter during which questionnaire was authored
+ * Type: reference
+ * Path: QuestionnaireResponse.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="QuestionnaireResponse.encounter", description="Encounter during which questionnaire was authored", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Encounter during which questionnaire was authored
+ * Type: reference
+ * Path: QuestionnaireResponse.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:encounter". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:encounter").toLocked(); + /** + * Search parameter: source + *

+ * Description: The person who answered the questions
+ * Type: reference
+ * Path: QuestionnaireResponse.source
+ *

+ */ @SearchParamDefinition(name="source", path="QuestionnaireResponse.source", description="The person who answered the questions", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: The person who answered the questions
+ * Type: reference
+ * Path: QuestionnaireResponse.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "QuestionnaireResponse:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("QuestionnaireResponse:source").toLocked(); + /** + * Search parameter: status + *

+ * Description: The status of the questionnaire response
+ * Type: token
+ * Path: QuestionnaireResponse.status
+ *

+ */ @SearchParamDefinition(name="status", path="QuestionnaireResponse.status", description="The status of the questionnaire response", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the questionnaire response
+ * Type: token
+ * Path: QuestionnaireResponse.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Range.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Range.java index 93cf0196ed6..1299117adc2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Range.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Range.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Ratio.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Ratio.java index c96bd32d43b..6d261dfd499 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Ratio.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Ratio.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Reference.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Reference.java index 4dcf72d186b..7831020ff49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Reference.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Reference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ReferralRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ReferralRequest.java index 2c065045334..d54bc20b38e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ReferralRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ReferralRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1194,40 +1194,184 @@ public class ReferralRequest extends DomainResource { return ResourceType.ReferralRequest; } + /** + * Search parameter: date + *

+ * Description: Creation or activation date
+ * Type: date
+ * Path: ReferralRequest.date
+ *

+ */ @SearchParamDefinition(name="date", path="ReferralRequest.date", description="Creation or activation date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Creation or activation date
+ * Type: date
+ * Path: ReferralRequest.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: requester + *

+ * Description: Requester of referral / transfer of care
+ * Type: reference
+ * Path: ReferralRequest.requester
+ *

+ */ @SearchParamDefinition(name="requester", path="ReferralRequest.requester", description="Requester of referral / transfer of care", type="reference" ) public static final String SP_REQUESTER = "requester"; + /** + * Fluent Client search parameter constant for requester + *

+ * Description: Requester of referral / transfer of care
+ * Type: reference
+ * Path: ReferralRequest.requester
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ReferralRequest:requester". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTER = new ca.uhn.fhir.model.api.Include("ReferralRequest:requester").toLocked(); + /** + * Search parameter: specialty + *

+ * Description: The specialty that the referral is for
+ * Type: token
+ * Path: ReferralRequest.specialty
+ *

+ */ @SearchParamDefinition(name="specialty", path="ReferralRequest.specialty", description="The specialty that the referral is for", type="token" ) public static final String SP_SPECIALTY = "specialty"; + /** + * Fluent Client search parameter constant for specialty + *

+ * Description: The specialty that the referral is for
+ * Type: token
+ * Path: ReferralRequest.specialty
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIALTY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIALTY); + + /** + * Search parameter: patient + *

+ * Description: Who the referral is about
+ * Type: reference
+ * Path: ReferralRequest.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="ReferralRequest.patient", description="Who the referral is about", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who the referral is about
+ * Type: reference
+ * Path: ReferralRequest.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ReferralRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ReferralRequest:patient").toLocked(); + /** + * Search parameter: recipient + *

+ * Description: The person that the referral was sent to
+ * Type: reference
+ * Path: ReferralRequest.recipient
+ *

+ */ @SearchParamDefinition(name="recipient", path="ReferralRequest.recipient", description="The person that the referral was sent to", type="reference" ) public static final String SP_RECIPIENT = "recipient"; + /** + * Fluent Client search parameter constant for recipient + *

+ * Description: The person that the referral was sent to
+ * Type: reference
+ * Path: ReferralRequest.recipient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "ReferralRequest:recipient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("ReferralRequest:recipient").toLocked(); + /** + * Search parameter: type + *

+ * Description: The type of the referral
+ * Type: token
+ * Path: ReferralRequest.type
+ *

+ */ @SearchParamDefinition(name="type", path="ReferralRequest.type", description="The type of the referral", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The type of the referral
+ * Type: token
+ * Path: ReferralRequest.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: priority + *

+ * Description: The priority assigned to the referral
+ * Type: token
+ * Path: ReferralRequest.priority
+ *

+ */ @SearchParamDefinition(name="priority", path="ReferralRequest.priority", description="The priority assigned to the referral", type="token" ) public static final String SP_PRIORITY = "priority"; + /** + * Fluent Client search parameter constant for priority + *

+ * Description: The priority assigned to the referral
+ * Type: token
+ * Path: ReferralRequest.priority
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRIORITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRIORITY); + + /** + * Search parameter: status + *

+ * Description: The status of the referral
+ * Type: token
+ * Path: ReferralRequest.status
+ *

+ */ @SearchParamDefinition(name="status", path="ReferralRequest.status", description="The status of the referral", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the referral
+ * Type: token
+ * Path: ReferralRequest.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RelatedPerson.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RelatedPerson.java index 4518fd32f02..a281616d775 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RelatedPerson.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RelatedPerson.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -670,42 +670,312 @@ public class RelatedPerson extends DomainResource { return ResourceType.RelatedPerson; } + /** + * Search parameter: identifier + *

+ * Description: A patient Identifier
+ * Type: token
+ * Path: RelatedPerson.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="RelatedPerson.identifier", description="A patient Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A patient Identifier
+ * Type: token
+ * Path: RelatedPerson.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: RelatedPerson.address
+ *

+ */ @SearchParamDefinition(name="address", path="RelatedPerson.address", description="An address in any kind of address/part", type="string" ) public static final String SP_ADDRESS = "address"; + /** + * Fluent Client search parameter constant for address + *

+ * Description: An address in any kind of address/part
+ * Type: string
+ * Path: RelatedPerson.address
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS); + + /** + * Search parameter: birthdate + *

+ * Description: The Related Person's date of birth
+ * Type: date
+ * Path: RelatedPerson.birthDate
+ *

+ */ @SearchParamDefinition(name="birthdate", path="RelatedPerson.birthDate", description="The Related Person's date of birth", type="date" ) public static final String SP_BIRTHDATE = "birthdate"; + /** + * Fluent Client search parameter constant for birthdate + *

+ * Description: The Related Person's date of birth
+ * Type: date
+ * Path: RelatedPerson.birthDate
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam BIRTHDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_BIRTHDATE); + + /** + * Search parameter: address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.state
+ *

+ */ @SearchParamDefinition(name="address-state", path="RelatedPerson.address.state", description="A state specified in an address", type="string" ) public static final String SP_ADDRESS_STATE = "address-state"; + /** + * Fluent Client search parameter constant for address-state + *

+ * Description: A state specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.state
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_STATE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_STATE); + + /** + * Search parameter: gender + *

+ * Description: Gender of the person
+ * Type: token
+ * Path: RelatedPerson.gender
+ *

+ */ @SearchParamDefinition(name="gender", path="RelatedPerson.gender", description="Gender of the person", type="token" ) public static final String SP_GENDER = "gender"; + /** + * Fluent Client search parameter constant for gender + *

+ * Description: Gender of the person
+ * Type: token
+ * Path: RelatedPerson.gender
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam GENDER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GENDER); + + /** + * Search parameter: address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.postalCode
+ *

+ */ @SearchParamDefinition(name="address-postalcode", path="RelatedPerson.address.postalCode", description="A postal code specified in an address", type="string" ) public static final String SP_ADDRESS_POSTALCODE = "address-postalcode"; + /** + * Fluent Client search parameter constant for address-postalcode + *

+ * Description: A postal code specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.postalCode
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_POSTALCODE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_POSTALCODE); + + /** + * Search parameter: address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.country
+ *

+ */ @SearchParamDefinition(name="address-country", path="RelatedPerson.address.country", description="A country specified in an address", type="string" ) public static final String SP_ADDRESS_COUNTRY = "address-country"; + /** + * Fluent Client search parameter constant for address-country + *

+ * Description: A country specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.country
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_COUNTRY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_COUNTRY); + + /** + * Search parameter: phonetic + *

+ * Description: A portion of name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: RelatedPerson.name
+ *

+ */ @SearchParamDefinition(name="phonetic", path="RelatedPerson.name", description="A portion of name using some kind of phonetic matching algorithm", type="string" ) public static final String SP_PHONETIC = "phonetic"; + /** + * Fluent Client search parameter constant for phonetic + *

+ * Description: A portion of name using some kind of phonetic matching algorithm
+ * Type: string
+ * Path: RelatedPerson.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PHONETIC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PHONETIC); + + /** + * Search parameter: phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: RelatedPerson.telecom(system=phone)
+ *

+ */ @SearchParamDefinition(name="phone", path="RelatedPerson.telecom.where(system='phone')", description="A value in a phone contact", type="token" ) public static final String SP_PHONE = "phone"; + /** + * Fluent Client search parameter constant for phone + *

+ * Description: A value in a phone contact
+ * Type: token
+ * Path: RelatedPerson.telecom(system=phone)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PHONE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PHONE); + + /** + * Search parameter: patient + *

+ * Description: The patient this person is related to
+ * Type: reference
+ * Path: RelatedPerson.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="RelatedPerson.patient", description="The patient this person is related to", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient this person is related to
+ * Type: reference
+ * Path: RelatedPerson.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RelatedPerson:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("RelatedPerson:patient").toLocked(); + /** + * Search parameter: name + *

+ * Description: A portion of name in any name part
+ * Type: string
+ * Path: RelatedPerson.name
+ *

+ */ @SearchParamDefinition(name="name", path="RelatedPerson.name", description="A portion of name in any name part", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: A portion of name in any name part
+ * Type: string
+ * Path: RelatedPerson.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: RelatedPerson.address.use
+ *

+ */ @SearchParamDefinition(name="address-use", path="RelatedPerson.address.use", description="A use code specified in an address", type="token" ) public static final String SP_ADDRESS_USE = "address-use"; + /** + * Fluent Client search parameter constant for address-use + *

+ * Description: A use code specified in an address
+ * Type: token
+ * Path: RelatedPerson.address.use
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS_USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS_USE); + + /** + * Search parameter: telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: RelatedPerson.telecom
+ *

+ */ @SearchParamDefinition(name="telecom", path="RelatedPerson.telecom", description="The value in any kind of contact", type="token" ) public static final String SP_TELECOM = "telecom"; + /** + * Fluent Client search parameter constant for telecom + *

+ * Description: The value in any kind of contact
+ * Type: token
+ * Path: RelatedPerson.telecom
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TELECOM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TELECOM); + + /** + * Search parameter: address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.city
+ *

+ */ @SearchParamDefinition(name="address-city", path="RelatedPerson.address.city", description="A city specified in an address", type="string" ) public static final String SP_ADDRESS_CITY = "address-city"; + /** + * Fluent Client search parameter constant for address-city + *

+ * Description: A city specified in an address
+ * Type: string
+ * Path: RelatedPerson.address.city
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS_CITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS_CITY); + + /** + * Search parameter: email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: RelatedPerson.telecom(system=email)
+ *

+ */ @SearchParamDefinition(name="email", path="RelatedPerson.telecom.where(system='email')", description="A value in an email contact", type="token" ) public static final String SP_EMAIL = "email"; + /** + * Fluent Client search parameter constant for email + *

+ * Description: A value in an email contact
+ * Type: token
+ * Path: RelatedPerson.telecom(system=email)
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EMAIL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EMAIL); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Resource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Resource.java index 451ffb1f470..5be127b5314 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Resource.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Resource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceFactory.java index 90ac9783cfb..4b9d0b2e72c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceType.java index 23758d15330..c0aa7500adb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ResourceType.java @@ -2,7 +2,7 @@ package org.hl7.fhir.dstu21.model; import org.hl7.fhir.exceptions.FHIRException; -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 public enum ResourceType { Account, diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RiskAssessment.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RiskAssessment.java index 715d42c096c..da20cc99d36 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RiskAssessment.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1108,46 +1108,190 @@ public class RiskAssessment extends DomainResource { return ResourceType.RiskAssessment; } + /** + * Search parameter: date + *

+ * Description: When was assessment made?
+ * Type: date
+ * Path: RiskAssessment.date
+ *

+ */ @SearchParamDefinition(name="date", path="RiskAssessment.date", description="When was assessment made?", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When was assessment made?
+ * Type: date
+ * Path: RiskAssessment.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Unique identifier for the assessment
+ * Type: token
+ * Path: RiskAssessment.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="RiskAssessment.identifier", description="Unique identifier for the assessment", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique identifier for the assessment
+ * Type: token
+ * Path: RiskAssessment.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: condition + *

+ * Description: Condition assessed
+ * Type: reference
+ * Path: RiskAssessment.condition
+ *

+ */ @SearchParamDefinition(name="condition", path="RiskAssessment.condition", description="Condition assessed", type="reference" ) public static final String SP_CONDITION = "condition"; + /** + * Fluent Client search parameter constant for condition + *

+ * Description: Condition assessed
+ * Type: reference
+ * Path: RiskAssessment.condition
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RiskAssessment:condition". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("RiskAssessment:condition").toLocked(); + /** + * Search parameter: performer + *

+ * Description: Who did assessment?
+ * Type: reference
+ * Path: RiskAssessment.performer
+ *

+ */ @SearchParamDefinition(name="performer", path="RiskAssessment.performer", description="Who did assessment?", type="reference" ) public static final String SP_PERFORMER = "performer"; + /** + * Fluent Client search parameter constant for performer + *

+ * Description: Who did assessment?
+ * Type: reference
+ * Path: RiskAssessment.performer
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RiskAssessment:performer". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("RiskAssessment:performer").toLocked(); + /** + * Search parameter: method + *

+ * Description: Evaluation mechanism
+ * Type: token
+ * Path: RiskAssessment.method
+ *

+ */ @SearchParamDefinition(name="method", path="RiskAssessment.method", description="Evaluation mechanism", type="token" ) public static final String SP_METHOD = "method"; + /** + * Fluent Client search parameter constant for method + *

+ * Description: Evaluation mechanism
+ * Type: token
+ * Path: RiskAssessment.method
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam METHOD = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_METHOD); + + /** + * Search parameter: subject + *

+ * Description: Who/what does assessment apply to?
+ * Type: reference
+ * Path: RiskAssessment.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: Who/what does assessment apply to?
+ * Type: reference
+ * Path: RiskAssessment.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RiskAssessment:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("RiskAssessment:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Who/what does assessment apply to?
+ * Type: reference
+ * Path: RiskAssessment.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="RiskAssessment.subject", description="Who/what does assessment apply to?", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Who/what does assessment apply to?
+ * Type: reference
+ * Path: RiskAssessment.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RiskAssessment:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("RiskAssessment:patient").toLocked(); + /** + * Search parameter: encounter + *

+ * Description: Where was assessment performed?
+ * Type: reference
+ * Path: RiskAssessment.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="RiskAssessment.encounter", description="Where was assessment performed?", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Where was assessment performed?
+ * Type: reference
+ * Path: RiskAssessment.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "RiskAssessment:encounter". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SampledData.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SampledData.java index 5a16a39985e..733fa41cbb8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SampledData.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SampledData.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Schedule.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Schedule.java index b771f46d300..1711cb8c6d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Schedule.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Schedule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -405,20 +405,92 @@ public class Schedule extends DomainResource { return ResourceType.Schedule; } + /** + * Search parameter: actor + *

+ * Description: The individual(HealthcareService, Practitioner, Location, ...) to find a Schedule for
+ * Type: reference
+ * Path: Schedule.actor
+ *

+ */ @SearchParamDefinition(name="actor", path="Schedule.actor", description="The individual(HealthcareService, Practitioner, Location, ...) to find a Schedule for", type="reference" ) public static final String SP_ACTOR = "actor"; + /** + * Fluent Client search parameter constant for actor + *

+ * Description: The individual(HealthcareService, Practitioner, Location, ...) to find a Schedule for
+ * Type: reference
+ * Path: Schedule.actor
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Schedule:actor". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Schedule:actor").toLocked(); + /** + * Search parameter: date + *

+ * Description: Search for Schedule resources that have a period that contains this date specified
+ * Type: date
+ * Path: Schedule.planningHorizon
+ *

+ */ @SearchParamDefinition(name="date", path="Schedule.planningHorizon", description="Search for Schedule resources that have a period that contains this date specified", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: Search for Schedule resources that have a period that contains this date specified
+ * Type: date
+ * Path: Schedule.planningHorizon
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: A Schedule Identifier
+ * Type: token
+ * Path: Schedule.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Schedule.identifier", description="A Schedule Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A Schedule Identifier
+ * Type: token
+ * Path: Schedule.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: type + *

+ * Description: The type of appointments that can be booked into associated slot(s)
+ * Type: token
+ * Path: Schedule.type
+ *

+ */ @SearchParamDefinition(name="type", path="Schedule.type", description="The type of appointments that can be booked into associated slot(s)", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The type of appointments that can be booked into associated slot(s)
+ * Type: token
+ * Path: Schedule.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SearchParameter.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SearchParameter.java index 17814726a6c..5f6a4d1a4b1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SearchParameter.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1387,20 +1387,146 @@ public class SearchParameter extends DomainResource { return ResourceType.SearchParameter; } + /** + * Search parameter: code + *

+ * Description: Code used in URL
+ * Type: token
+ * Path: SearchParameter.code
+ *

+ */ @SearchParamDefinition(name="code", path="SearchParameter.code", description="Code used in URL", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: Code used in URL
+ * Type: token
+ * Path: SearchParameter.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: name + *

+ * Description: Informal name for this search parameter
+ * Type: string
+ * Path: SearchParameter.name
+ *

+ */ @SearchParamDefinition(name="name", path="SearchParameter.name", description="Informal name for this search parameter", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Informal name for this search parameter
+ * Type: string
+ * Path: SearchParameter.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: description + *

+ * Description: Documentation for search parameter
+ * Type: string
+ * Path: SearchParameter.description
+ *

+ */ @SearchParamDefinition(name="description", path="SearchParameter.description", description="Documentation for search parameter", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Documentation for search parameter
+ * Type: string
+ * Path: SearchParameter.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: type + *

+ * Description: number | date | string | token | reference | composite | quantity | uri
+ * Type: token
+ * Path: SearchParameter.type
+ *

+ */ @SearchParamDefinition(name="type", path="SearchParameter.type", description="number | date | string | token | reference | composite | quantity | uri", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: number | date | string | token | reference | composite | quantity | uri
+ * Type: token
+ * Path: SearchParameter.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: url + *

+ * Description: Absolute URL used to reference this search parameter
+ * Type: uri
+ * Path: SearchParameter.url
+ *

+ */ @SearchParamDefinition(name="url", path="SearchParameter.url", description="Absolute URL used to reference this search parameter", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Absolute URL used to reference this search parameter
+ * Type: uri
+ * Path: SearchParameter.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: base + *

+ * Description: The resource type this search parameter applies to
+ * Type: token
+ * Path: SearchParameter.base
+ *

+ */ @SearchParamDefinition(name="base", path="SearchParameter.base", description="The resource type this search parameter applies to", type="token" ) public static final String SP_BASE = "base"; + /** + * Fluent Client search parameter constant for base + *

+ * Description: The resource type this search parameter applies to
+ * Type: token
+ * Path: SearchParameter.base
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BASE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BASE); + + /** + * Search parameter: target + *

+ * Description: Types of resource (if a resource reference)
+ * Type: token
+ * Path: SearchParameter.target
+ *

+ */ @SearchParamDefinition(name="target", path="SearchParameter.target", description="Types of resource (if a resource reference)", type="token" ) public static final String SP_TARGET = "target"; + /** + * Fluent Client search parameter constant for target + *

+ * Description: Types of resource (if a resource reference)
+ * Type: token
+ * Path: SearchParameter.target
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TARGET = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TARGET); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Sequence.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Sequence.java index 048c4499028..d78ab2ec513 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Sequence.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Sequence.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2262,20 +2262,146 @@ public class Sequence extends DomainResource { return ResourceType.Sequence; } + /** + * Search parameter: coordinate + *

+ * Description: Genomic coordinate of the sequence. For example, a search for sequence in region 1:123-345 can be represented as `coordinate=1$lt345$gt123`
+ * Type: composite
+ * Path:
+ *

+ */ @SearchParamDefinition(name="coordinate", path="", description="Genomic coordinate of the sequence. For example, a search for sequence in region 1:123-345 can be represented as `coordinate=1$lt345$gt123`", type="composite" ) public static final String SP_COORDINATE = "coordinate"; + /** + * Fluent Client search parameter constant for coordinate + *

+ * Description: Genomic coordinate of the sequence. For example, a search for sequence in region 1:123-345 can be represented as `coordinate=1$lt345$gt123`
+ * Type: composite
+ * Path:
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.CompositeClientParam COORDINATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_COORDINATE); + + /** + * Search parameter: variationid + *

+ * Description: Identifier for variant
+ * Type: token
+ * Path: Sequence.variationID
+ *

+ */ @SearchParamDefinition(name="variationid", path="Sequence.variationID", description="Identifier for variant", type="token" ) public static final String SP_VARIATIONID = "variationid"; + /** + * Fluent Client search parameter constant for variationid + *

+ * Description: Identifier for variant
+ * Type: token
+ * Path: Sequence.variationID
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VARIATIONID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VARIATIONID); + + /** + * Search parameter: species + *

+ * Description: The organism from which sample of the sequence was extracted.
+ * Type: token
+ * Path: Sequence.species
+ *

+ */ @SearchParamDefinition(name="species", path="Sequence.species", description="The organism from which sample of the sequence was extracted.", type="token" ) public static final String SP_SPECIES = "species"; + /** + * Fluent Client search parameter constant for species + *

+ * Description: The organism from which sample of the sequence was extracted.
+ * Type: token
+ * Path: Sequence.species
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIES = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIES); + + /** + * Search parameter: chromosome + *

+ * Description: Chromosome of the sequence
+ * Type: token
+ * Path: Sequence.coordinate.chromosome
+ *

+ */ @SearchParamDefinition(name="chromosome", path="Sequence.coordinate.chromosome", description="Chromosome of the sequence", type="token" ) public static final String SP_CHROMOSOME = "chromosome"; + /** + * Fluent Client search parameter constant for chromosome + *

+ * Description: Chromosome of the sequence
+ * Type: token
+ * Path: Sequence.coordinate.chromosome
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CHROMOSOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CHROMOSOME); + + /** + * Search parameter: start + *

+ * Description: Start position (0-based inclusive) of the sequence
+ * Type: number
+ * Path: Sequence.coordinate.start
+ *

+ */ @SearchParamDefinition(name="start", path="Sequence.coordinate.start", description="Start position (0-based inclusive) of the sequence", type="number" ) public static final String SP_START = "start"; + /** + * Fluent Client search parameter constant for start + *

+ * Description: Start position (0-based inclusive) of the sequence
+ * Type: number
+ * Path: Sequence.coordinate.start
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam START = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_START); + + /** + * Search parameter: end + *

+ * Description: End position (0-based exclusive) of the sequence
+ * Type: number
+ * Path: Sequence.coordinate.end
+ *

+ */ @SearchParamDefinition(name="end", path="Sequence.coordinate.end", description="End position (0-based exclusive) of the sequence", type="number" ) public static final String SP_END = "end"; + /** + * Fluent Client search parameter constant for end + *

+ * Description: End position (0-based exclusive) of the sequence
+ * Type: number
+ * Path: Sequence.coordinate.end
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.NumberClientParam END = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_END); + + /** + * Search parameter: type + *

+ * Description: The type of the variant: Amino acid / cDNA transcript / RNA variation.
+ * Type: token
+ * Path: Sequence.type
+ *

+ */ @SearchParamDefinition(name="type", path="Sequence.type", description="The type of the variant: Amino acid / cDNA transcript / RNA variation.", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The type of the variant: Amino acid / cDNA transcript / RNA variation.
+ * Type: token
+ * Path: Sequence.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Signature.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Signature.java index 1f95886436f..1d1d0176a0b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Signature.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Signature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SimpleQuantity.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SimpleQuantity.java index e4055534827..91ec7202f9e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SimpleQuantity.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SimpleQuantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Block; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Slot.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Slot.java index 60e56cc869e..af023e70f11 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Slot.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Slot.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -712,22 +712,112 @@ public class Slot extends DomainResource { return ResourceType.Slot; } + /** + * Search parameter: schedule + *

+ * Description: The Schedule Resource that we are seeking a slot within
+ * Type: reference
+ * Path: Slot.schedule
+ *

+ */ @SearchParamDefinition(name="schedule", path="Slot.schedule", description="The Schedule Resource that we are seeking a slot within", type="reference" ) public static final String SP_SCHEDULE = "schedule"; + /** + * Fluent Client search parameter constant for schedule + *

+ * Description: The Schedule Resource that we are seeking a slot within
+ * Type: reference
+ * Path: Slot.schedule
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SCHEDULE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SCHEDULE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Slot:schedule". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SCHEDULE = new ca.uhn.fhir.model.api.Include("Slot:schedule").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: A Slot Identifier
+ * Type: token
+ * Path: Slot.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Slot.identifier", description="A Slot Identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: A Slot Identifier
+ * Type: token
+ * Path: Slot.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: start + *

+ * Description: Appointment date/time.
+ * Type: date
+ * Path: Slot.start
+ *

+ */ @SearchParamDefinition(name="start", path="Slot.start", description="Appointment date/time.", type="date" ) public static final String SP_START = "start"; + /** + * Fluent Client search parameter constant for start + *

+ * Description: Appointment date/time.
+ * Type: date
+ * Path: Slot.start
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam START = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_START); + + /** + * Search parameter: slot-type + *

+ * Description: The type of appointments that can be booked into the slot
+ * Type: token
+ * Path: Slot.type
+ *

+ */ @SearchParamDefinition(name="slot-type", path="Slot.type", description="The type of appointments that can be booked into the slot", type="token" ) public static final String SP_SLOT_TYPE = "slot-type"; + /** + * Fluent Client search parameter constant for slot-type + *

+ * Description: The type of appointments that can be booked into the slot
+ * Type: token
+ * Path: Slot.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam SLOT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SLOT_TYPE); + + /** + * Search parameter: fb-type + *

+ * Description: The free/busy status of the appointment
+ * Type: token
+ * Path: Slot.freeBusyType
+ *

+ */ @SearchParamDefinition(name="fb-type", path="Slot.freeBusyType", description="The free/busy status of the appointment", type="token" ) public static final String SP_FB_TYPE = "fb-type"; + /** + * Fluent Client search parameter constant for fb-type + *

+ * Description: The free/busy status of the appointment
+ * Type: token
+ * Path: Slot.freeBusyType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam FB_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FB_TYPE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Specimen.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Specimen.java index 71927871667..a2e3a3098a6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Specimen.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Specimen.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1817,46 +1817,244 @@ public class Specimen extends DomainResource { return ResourceType.Specimen; } + /** + * Search parameter: container + *

+ * Description: The kind of specimen container
+ * Type: token
+ * Path: Specimen.container.type
+ *

+ */ @SearchParamDefinition(name="container", path="Specimen.container.type", description="The kind of specimen container", type="token" ) public static final String SP_CONTAINER = "container"; + /** + * Fluent Client search parameter constant for container + *

+ * Description: The kind of specimen container
+ * Type: token
+ * Path: Specimen.container.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTAINER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTAINER); + + /** + * Search parameter: identifier + *

+ * Description: The unique identifier associated with the specimen
+ * Type: token
+ * Path: Specimen.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Specimen.identifier", description="The unique identifier associated with the specimen", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The unique identifier associated with the specimen
+ * Type: token
+ * Path: Specimen.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: parent + *

+ * Description: The parent of the specimen
+ * Type: reference
+ * Path: Specimen.parent
+ *

+ */ @SearchParamDefinition(name="parent", path="Specimen.parent", description="The parent of the specimen", type="reference" ) public static final String SP_PARENT = "parent"; + /** + * Fluent Client search parameter constant for parent + *

+ * Description: The parent of the specimen
+ * Type: reference
+ * Path: Specimen.parent
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Specimen:parent". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARENT = new ca.uhn.fhir.model.api.Include("Specimen:parent").toLocked(); + /** + * Search parameter: container-id + *

+ * Description: The unique identifier associated with the specimen container
+ * Type: token
+ * Path: Specimen.container.identifier
+ *

+ */ @SearchParamDefinition(name="container-id", path="Specimen.container.identifier", description="The unique identifier associated with the specimen container", type="token" ) public static final String SP_CONTAINER_ID = "container-id"; + /** + * Fluent Client search parameter constant for container-id + *

+ * Description: The unique identifier associated with the specimen container
+ * Type: token
+ * Path: Specimen.container.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTAINER_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTAINER_ID); + + /** + * Search parameter: bodysite + *

+ * Description: The code for the body site from where the specimen originated
+ * Type: token
+ * Path: Specimen.collection.bodySite
+ *

+ */ @SearchParamDefinition(name="bodysite", path="Specimen.collection.bodySite", description="The code for the body site from where the specimen originated", type="token" ) public static final String SP_BODYSITE = "bodysite"; + /** + * Fluent Client search parameter constant for bodysite + *

+ * Description: The code for the body site from where the specimen originated
+ * Type: token
+ * Path: Specimen.collection.bodySite
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODYSITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODYSITE); + + /** + * Search parameter: subject + *

+ * Description: The subject of the specimen
+ * Type: reference
+ * Path: Specimen.subject
+ *

+ */ @SearchParamDefinition(name="subject", path="Specimen.subject", description="The subject of the specimen", type="reference" ) public static final String SP_SUBJECT = "subject"; + /** + * Fluent Client search parameter constant for subject + *

+ * Description: The subject of the specimen
+ * Type: reference
+ * Path: Specimen.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Specimen:subject". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Specimen:subject").toLocked(); + /** + * Search parameter: patient + *

+ * Description: The patient the specimen comes from
+ * Type: reference
+ * Path: Specimen.subject
+ *

+ */ @SearchParamDefinition(name="patient", path="Specimen.subject", description="The patient the specimen comes from", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The patient the specimen comes from
+ * Type: reference
+ * Path: Specimen.subject
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Specimen:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Specimen:patient").toLocked(); + /** + * Search parameter: collected + *

+ * Description: The date the specimen was collected
+ * Type: date
+ * Path: Specimen.collection.collected[x]
+ *

+ */ @SearchParamDefinition(name="collected", path="Specimen.collection.collected[x]", description="The date the specimen was collected", type="date" ) public static final String SP_COLLECTED = "collected"; + /** + * Fluent Client search parameter constant for collected + *

+ * Description: The date the specimen was collected
+ * Type: date
+ * Path: Specimen.collection.collected[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam COLLECTED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_COLLECTED); + + /** + * Search parameter: accession + *

+ * Description: The accession number associated with the specimen
+ * Type: token
+ * Path: Specimen.accessionIdentifier
+ *

+ */ @SearchParamDefinition(name="accession", path="Specimen.accessionIdentifier", description="The accession number associated with the specimen", type="token" ) public static final String SP_ACCESSION = "accession"; + /** + * Fluent Client search parameter constant for accession + *

+ * Description: The accession number associated with the specimen
+ * Type: token
+ * Path: Specimen.accessionIdentifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACCESSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACCESSION); + + /** + * Search parameter: type + *

+ * Description: The specimen type
+ * Type: token
+ * Path: Specimen.type
+ *

+ */ @SearchParamDefinition(name="type", path="Specimen.type", description="The specimen type", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: The specimen type
+ * Type: token
+ * Path: Specimen.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: collector + *

+ * Description: Who collected the specimen
+ * Type: reference
+ * Path: Specimen.collection.collector
+ *

+ */ @SearchParamDefinition(name="collector", path="Specimen.collection.collector", description="Who collected the specimen", type="reference" ) public static final String SP_COLLECTOR = "collector"; + /** + * Fluent Client search parameter constant for collector + *

+ * Description: Who collected the specimen
+ * Type: reference
+ * Path: Specimen.collection.collector
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam COLLECTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_COLLECTOR); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Specimen:collector". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/StructureDefinition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/StructureDefinition.java index bc8910f9339..55984f7bc08 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/StructureDefinition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -2616,54 +2616,432 @@ public class StructureDefinition extends DomainResource { return ResourceType.StructureDefinition; } + /** + * Search parameter: date + *

+ * Description: The profile publication date
+ * Type: date
+ * Path: StructureDefinition.date
+ *

+ */ @SearchParamDefinition(name="date", path="StructureDefinition.date", description="The profile publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The profile publication date
+ * Type: date
+ * Path: StructureDefinition.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: The identifier of the profile
+ * Type: token
+ * Path: StructureDefinition.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="StructureDefinition.identifier", description="The identifier of the profile", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identifier of the profile
+ * Type: token
+ * Path: StructureDefinition.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A code for the profile
+ * Type: token
+ * Path: StructureDefinition.code
+ *

+ */ @SearchParamDefinition(name="code", path="StructureDefinition.code", description="A code for the profile", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A code for the profile
+ * Type: token
+ * Path: StructureDefinition.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: valueset + *

+ * Description: A vocabulary binding reference
+ * Type: reference
+ * Path: StructureDefinition.snapshot.element.binding.valueSet[x]
+ *

+ */ @SearchParamDefinition(name="valueset", path="StructureDefinition.snapshot.element.binding.valueSet[x]", description="A vocabulary binding reference", type="reference" ) public static final String SP_VALUESET = "valueset"; + /** + * Fluent Client search parameter constant for valueset + *

+ * Description: A vocabulary binding reference
+ * Type: reference
+ * Path: StructureDefinition.snapshot.element.binding.valueSet[x]
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam VALUESET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_VALUESET); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "StructureDefinition:valueset". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_VALUESET = new ca.uhn.fhir.model.api.Include("StructureDefinition:valueset").toLocked(); + /** + * Search parameter: kind + *

+ * Description: datatype | resource | logical
+ * Type: token
+ * Path: StructureDefinition.kind
+ *

+ */ @SearchParamDefinition(name="kind", path="StructureDefinition.kind", description="datatype | resource | logical", type="token" ) public static final String SP_KIND = "kind"; + /** + * Fluent Client search parameter constant for kind + *

+ * Description: datatype | resource | logical
+ * Type: token
+ * Path: StructureDefinition.kind
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam KIND = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_KIND); + + /** + * Search parameter: display + *

+ * Description: Use this name when displaying the value
+ * Type: string
+ * Path: StructureDefinition.display
+ *

+ */ @SearchParamDefinition(name="display", path="StructureDefinition.display", description="Use this name when displaying the value", type="string" ) public static final String SP_DISPLAY = "display"; + /** + * Fluent Client search parameter constant for display + *

+ * Description: Use this name when displaying the value
+ * Type: string
+ * Path: StructureDefinition.display
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPLAY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPLAY); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the profile
+ * Type: string
+ * Path: StructureDefinition.description
+ *

+ */ @SearchParamDefinition(name="description", path="StructureDefinition.description", description="Text search in the description of the profile", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the profile
+ * Type: string
+ * Path: StructureDefinition.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: experimental + *

+ * Description: If for testing purposes, not real usage
+ * Type: token
+ * Path: StructureDefinition.experimental
+ *

+ */ @SearchParamDefinition(name="experimental", path="StructureDefinition.experimental", description="If for testing purposes, not real usage", type="token" ) public static final String SP_EXPERIMENTAL = "experimental"; + /** + * Fluent Client search parameter constant for experimental + *

+ * Description: If for testing purposes, not real usage
+ * Type: token
+ * Path: StructureDefinition.experimental
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam EXPERIMENTAL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EXPERIMENTAL); + + /** + * Search parameter: context-type + *

+ * Description: resource | datatype | mapping | extension
+ * Type: token
+ * Path: StructureDefinition.contextType
+ *

+ */ @SearchParamDefinition(name="context-type", path="StructureDefinition.contextType", description="resource | datatype | mapping | extension", type="token" ) public static final String SP_CONTEXT_TYPE = "context-type"; + /** + * Fluent Client search parameter constant for context-type + *

+ * Description: resource | datatype | mapping | extension
+ * Type: token
+ * Path: StructureDefinition.contextType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE); + + /** + * Search parameter: abstract + *

+ * Description: Whether the structure is abstract
+ * Type: token
+ * Path: StructureDefinition.abstract
+ *

+ */ @SearchParamDefinition(name="abstract", path="StructureDefinition.abstract", description="Whether the structure is abstract", type="token" ) public static final String SP_ABSTRACT = "abstract"; + /** + * Fluent Client search parameter constant for abstract + *

+ * Description: Whether the structure is abstract
+ * Type: token
+ * Path: StructureDefinition.abstract
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam ABSTRACT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ABSTRACT); + + /** + * Search parameter: type + *

+ * Description: Any datatype or resource, including abstract ones
+ * Type: token
+ * Path: StructureDefinition.constrainedType
+ *

+ */ @SearchParamDefinition(name="type", path="StructureDefinition.constrainedType", description="Any datatype or resource, including abstract ones", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: Any datatype or resource, including abstract ones
+ * Type: token
+ * Path: StructureDefinition.constrainedType
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the profile
+ * Type: token
+ * Path: StructureDefinition.version
+ *

+ */ @SearchParamDefinition(name="version", path="StructureDefinition.version", description="The version identifier of the profile", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the profile
+ * Type: token
+ * Path: StructureDefinition.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: Absolute URL used to reference this StructureDefinition
+ * Type: uri
+ * Path: StructureDefinition.url
+ *

+ */ @SearchParamDefinition(name="url", path="StructureDefinition.url", description="Absolute URL used to reference this StructureDefinition", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Absolute URL used to reference this StructureDefinition
+ * Type: uri
+ * Path: StructureDefinition.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: path + *

+ * Description: A path that is constrained in the profile
+ * Type: token
+ * Path: StructureDefinition.snapshot.element.path, StructureDefinition.differential.element.path
+ *

+ */ @SearchParamDefinition(name="path", path="StructureDefinition.snapshot.element.path|StructureDefinition.differential.element.path", description="A path that is constrained in the profile", type="token" ) public static final String SP_PATH = "path"; + /** + * Fluent Client search parameter constant for path + *

+ * Description: A path that is constrained in the profile
+ * Type: token
+ * Path: StructureDefinition.snapshot.element.path, StructureDefinition.differential.element.path
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam PATH = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PATH); + + /** + * Search parameter: ext-context + *

+ * Description: Where the extension can be used in instances
+ * Type: string
+ * Path: StructureDefinition.context
+ *

+ */ @SearchParamDefinition(name="ext-context", path="StructureDefinition.context", description="Where the extension can be used in instances", type="string" ) public static final String SP_EXT_CONTEXT = "ext-context"; + /** + * Fluent Client search parameter constant for ext-context + *

+ * Description: Where the extension can be used in instances
+ * Type: string
+ * Path: StructureDefinition.context
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam EXT_CONTEXT = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_EXT_CONTEXT); + + /** + * Search parameter: name + *

+ * Description: Name of the profile
+ * Type: string
+ * Path: StructureDefinition.name
+ *

+ */ @SearchParamDefinition(name="name", path="StructureDefinition.name", description="Name of the profile", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Name of the profile
+ * Type: string
+ * Path: StructureDefinition.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the structure
+ * Type: token
+ * Path: StructureDefinition.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="StructureDefinition.useContext", description="A use context assigned to the structure", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the structure
+ * Type: token
+ * Path: StructureDefinition.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: base-path + *

+ * Description: Path that identifies the base element
+ * Type: token
+ * Path: StructureDefinition.snapshot.element.base.path, StructureDefinition.differential.element.base.path
+ *

+ */ @SearchParamDefinition(name="base-path", path="StructureDefinition.snapshot.element.base.path|StructureDefinition.differential.element.base.path", description="Path that identifies the base element", type="token" ) public static final String SP_BASE_PATH = "base-path"; + /** + * Fluent Client search parameter constant for base-path + *

+ * Description: Path that identifies the base element
+ * Type: token
+ * Path: StructureDefinition.snapshot.element.base.path, StructureDefinition.differential.element.base.path
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam BASE_PATH = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BASE_PATH); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the profile
+ * Type: string
+ * Path: StructureDefinition.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="StructureDefinition.publisher", description="Name of the publisher of the profile", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the profile
+ * Type: string
+ * Path: StructureDefinition.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: status + *

+ * Description: The current status of the profile
+ * Type: token
+ * Path: StructureDefinition.status
+ *

+ */ @SearchParamDefinition(name="status", path="StructureDefinition.status", description="The current status of the profile", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The current status of the profile
+ * Type: token
+ * Path: StructureDefinition.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + + /** + * Search parameter: base + *

+ * Description: Structure that this set of constraints applies to
+ * Type: uri
+ * Path: StructureDefinition.base
+ *

+ */ @SearchParamDefinition(name="base", path="StructureDefinition.base", description="Structure that this set of constraints applies to", type="uri" ) public static final String SP_BASE = "base"; + /** + * Fluent Client search parameter constant for base + *

+ * Description: Structure that this set of constraints applies to
+ * Type: uri
+ * Path: StructureDefinition.base
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam BASE = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_BASE); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Subscription.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Subscription.java index 24ceb9b353b..7c0d06402a3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Subscription.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Subscription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1165,20 +1165,146 @@ public class Subscription extends DomainResource { return ResourceType.Subscription; } + /** + * Search parameter: payload + *

+ * Description: Mimetype to send, or blank for no payload
+ * Type: string
+ * Path: Subscription.channel.payload
+ *

+ */ @SearchParamDefinition(name="payload", path="Subscription.channel.payload", description="Mimetype to send, or blank for no payload", type="string" ) public static final String SP_PAYLOAD = "payload"; + /** + * Fluent Client search parameter constant for payload + *

+ * Description: Mimetype to send, or blank for no payload
+ * Type: string
+ * Path: Subscription.channel.payload
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PAYLOAD = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PAYLOAD); + + /** + * Search parameter: criteria + *

+ * Description: Rule for server push criteria
+ * Type: string
+ * Path: Subscription.criteria
+ *

+ */ @SearchParamDefinition(name="criteria", path="Subscription.criteria", description="Rule for server push criteria", type="string" ) public static final String SP_CRITERIA = "criteria"; + /** + * Fluent Client search parameter constant for criteria + *

+ * Description: Rule for server push criteria
+ * Type: string
+ * Path: Subscription.criteria
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam CRITERIA = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_CRITERIA); + + /** + * Search parameter: contact + *

+ * Description: Contact details for source (e.g. troubleshooting)
+ * Type: token
+ * Path: Subscription.contact
+ *

+ */ @SearchParamDefinition(name="contact", path="Subscription.contact", description="Contact details for source (e.g. troubleshooting)", type="token" ) public static final String SP_CONTACT = "contact"; + /** + * Fluent Client search parameter constant for contact + *

+ * Description: Contact details for source (e.g. troubleshooting)
+ * Type: token
+ * Path: Subscription.contact
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTACT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTACT); + + /** + * Search parameter: tag + *

+ * Description: A tag to add to matching resources
+ * Type: token
+ * Path: Subscription.tag
+ *

+ */ @SearchParamDefinition(name="tag", path="Subscription.tag", description="A tag to add to matching resources", type="token" ) public static final String SP_TAG = "tag"; + /** + * Fluent Client search parameter constant for tag + *

+ * Description: A tag to add to matching resources
+ * Type: token
+ * Path: Subscription.tag
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TAG = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TAG); + + /** + * Search parameter: type + *

+ * Description: rest-hook | websocket | email | sms | message
+ * Type: token
+ * Path: Subscription.channel.type
+ *

+ */ @SearchParamDefinition(name="type", path="Subscription.channel.type", description="rest-hook | websocket | email | sms | message", type="token" ) public static final String SP_TYPE = "type"; + /** + * Fluent Client search parameter constant for type + *

+ * Description: rest-hook | websocket | email | sms | message
+ * Type: token
+ * Path: Subscription.channel.type
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE); + + /** + * Search parameter: url + *

+ * Description: Where the channel points to
+ * Type: uri
+ * Path: Subscription.channel.endpoint
+ *

+ */ @SearchParamDefinition(name="url", path="Subscription.channel.endpoint", description="Where the channel points to", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Where the channel points to
+ * Type: uri
+ * Path: Subscription.channel.endpoint
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: status + *

+ * Description: requested | active | error | off
+ * Type: token
+ * Path: Subscription.status
+ *

+ */ @SearchParamDefinition(name="status", path="Subscription.status", description="requested | active | error | off", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: requested | active | error | off
+ * Type: token
+ * Path: Subscription.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Substance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Substance.java index 43d57761cab..fa53d9b06cb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Substance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Substance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -845,26 +845,152 @@ public class Substance extends DomainResource { return ResourceType.Substance; } + /** + * Search parameter: identifier + *

+ * Description: Unique identifier for the substance
+ * Type: token
+ * Path: Substance.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="Substance.identifier", description="Unique identifier for the substance", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique identifier for the substance
+ * Type: token
+ * Path: Substance.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: container-identifier + *

+ * Description: Identifier of the package/container
+ * Type: token
+ * Path: Substance.instance.identifier
+ *

+ */ @SearchParamDefinition(name="container-identifier", path="Substance.instance.identifier", description="Identifier of the package/container", type="token" ) public static final String SP_CONTAINER_IDENTIFIER = "container-identifier"; + /** + * Fluent Client search parameter constant for container-identifier + *

+ * Description: Identifier of the package/container
+ * Type: token
+ * Path: Substance.instance.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTAINER_IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTAINER_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: The code of the substance
+ * Type: token
+ * Path: Substance.code
+ *

+ */ @SearchParamDefinition(name="code", path="Substance.code", description="The code of the substance", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: The code of the substance
+ * Type: token
+ * Path: Substance.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: quantity + *

+ * Description: Amount of substance in the package
+ * Type: quantity
+ * Path: Substance.instance.quantity
+ *

+ */ @SearchParamDefinition(name="quantity", path="Substance.instance.quantity", description="Amount of substance in the package", type="quantity" ) public static final String SP_QUANTITY = "quantity"; + /** + * Fluent Client search parameter constant for quantity + *

+ * Description: Amount of substance in the package
+ * Type: quantity
+ * Path: Substance.instance.quantity
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.QuantityClientParam QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_QUANTITY); + + /** + * Search parameter: substance + *

+ * Description: A component of the substance
+ * Type: reference
+ * Path: Substance.ingredient.substance
+ *

+ */ @SearchParamDefinition(name="substance", path="Substance.ingredient.substance", description="A component of the substance", type="reference" ) public static final String SP_SUBSTANCE = "substance"; + /** + * Fluent Client search parameter constant for substance + *

+ * Description: A component of the substance
+ * Type: reference
+ * Path: Substance.ingredient.substance
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBSTANCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBSTANCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "Substance:substance". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSTANCE = new ca.uhn.fhir.model.api.Include("Substance:substance").toLocked(); + /** + * Search parameter: expiry + *

+ * Description: Expiry date of package or container of substance
+ * Type: date
+ * Path: Substance.instance.expiry
+ *

+ */ @SearchParamDefinition(name="expiry", path="Substance.instance.expiry", description="Expiry date of package or container of substance", type="date" ) public static final String SP_EXPIRY = "expiry"; + /** + * Fluent Client search parameter constant for expiry + *

+ * Description: Expiry date of package or container of substance
+ * Type: date
+ * Path: Substance.instance.expiry
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam EXPIRY = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EXPIRY); + + /** + * Search parameter: category + *

+ * Description: The category of the substance
+ * Type: token
+ * Path: Substance.category
+ *

+ */ @SearchParamDefinition(name="category", path="Substance.category", description="The category of the substance", type="token" ) public static final String SP_CATEGORY = "category"; + /** + * Fluent Client search parameter constant for category + *

+ * Description: The category of the substance
+ * Type: token
+ * Path: Substance.category
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyDelivery.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyDelivery.java index cef484cd065..7839cf6cf48 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyDelivery.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyDelivery.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -843,34 +843,124 @@ public class SupplyDelivery extends DomainResource { return ResourceType.SupplyDelivery; } + /** + * Search parameter: identifier + *

+ * Description: External identifier
+ * Type: token
+ * Path: SupplyDelivery.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="SupplyDelivery.identifier", description="External identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External identifier
+ * Type: token
+ * Path: SupplyDelivery.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: receiver + *

+ * Description: Who collected the Supply
+ * Type: reference
+ * Path: SupplyDelivery.receiver
+ *

+ */ @SearchParamDefinition(name="receiver", path="SupplyDelivery.receiver", description="Who collected the Supply", type="reference" ) public static final String SP_RECEIVER = "receiver"; + /** + * Fluent Client search parameter constant for receiver + *

+ * Description: Who collected the Supply
+ * Type: reference
+ * Path: SupplyDelivery.receiver
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECEIVER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECEIVER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyDelivery:receiver". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECEIVER = new ca.uhn.fhir.model.api.Include("SupplyDelivery:receiver").toLocked(); + /** + * Search parameter: patient + *

+ * Description: Patient for whom the item is supplied
+ * Type: reference
+ * Path: SupplyDelivery.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="SupplyDelivery.patient", description="Patient for whom the item is supplied", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient for whom the item is supplied
+ * Type: reference
+ * Path: SupplyDelivery.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyDelivery:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("SupplyDelivery:patient").toLocked(); + /** + * Search parameter: supplier + *

+ * Description: Dispenser
+ * Type: reference
+ * Path: SupplyDelivery.supplier
+ *

+ */ @SearchParamDefinition(name="supplier", path="SupplyDelivery.supplier", description="Dispenser", type="reference" ) public static final String SP_SUPPLIER = "supplier"; + /** + * Fluent Client search parameter constant for supplier + *

+ * Description: Dispenser
+ * Type: reference
+ * Path: SupplyDelivery.supplier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPLIER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPLIER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyDelivery:supplier". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPLIER = new ca.uhn.fhir.model.api.Include("SupplyDelivery:supplier").toLocked(); + /** + * Search parameter: status + *

+ * Description: in-progress | completed | abandoned
+ * Type: token
+ * Path: SupplyDelivery.status
+ *

+ */ @SearchParamDefinition(name="status", path="SupplyDelivery.status", description="in-progress | completed | abandoned", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: in-progress | completed | abandoned
+ * Type: token
+ * Path: SupplyDelivery.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyRequest.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyRequest.java index 1f9989906e6..b2906fac2c1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyRequest.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/SupplyRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -957,38 +957,164 @@ public class SupplyRequest extends DomainResource { return ResourceType.SupplyRequest; } + /** + * Search parameter: date + *

+ * Description: When the request was made
+ * Type: date
+ * Path: SupplyRequest.date
+ *

+ */ @SearchParamDefinition(name="date", path="SupplyRequest.date", description="When the request was made", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: When the request was made
+ * Type: date
+ * Path: SupplyRequest.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: SupplyRequest.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="SupplyRequest.identifier", description="Unique identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Unique identifier
+ * Type: token
+ * Path: SupplyRequest.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: kind + *

+ * Description: The kind of supply (central, non-stock, etc.)
+ * Type: token
+ * Path: SupplyRequest.kind
+ *

+ */ @SearchParamDefinition(name="kind", path="SupplyRequest.kind", description="The kind of supply (central, non-stock, etc.)", type="token" ) public static final String SP_KIND = "kind"; + /** + * Fluent Client search parameter constant for kind + *

+ * Description: The kind of supply (central, non-stock, etc.)
+ * Type: token
+ * Path: SupplyRequest.kind
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam KIND = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_KIND); + + /** + * Search parameter: patient + *

+ * Description: Patient for whom the item is supplied
+ * Type: reference
+ * Path: SupplyRequest.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="SupplyRequest.patient", description="Patient for whom the item is supplied", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: Patient for whom the item is supplied
+ * Type: reference
+ * Path: SupplyRequest.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyRequest:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("SupplyRequest:patient").toLocked(); + /** + * Search parameter: supplier + *

+ * Description: Who is intended to fulfill the request
+ * Type: reference
+ * Path: SupplyRequest.supplier
+ *

+ */ @SearchParamDefinition(name="supplier", path="SupplyRequest.supplier", description="Who is intended to fulfill the request", type="reference" ) public static final String SP_SUPPLIER = "supplier"; + /** + * Fluent Client search parameter constant for supplier + *

+ * Description: Who is intended to fulfill the request
+ * Type: reference
+ * Path: SupplyRequest.supplier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPLIER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPLIER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyRequest:supplier". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPLIER = new ca.uhn.fhir.model.api.Include("SupplyRequest:supplier").toLocked(); + /** + * Search parameter: source + *

+ * Description: Who initiated this order
+ * Type: reference
+ * Path: SupplyRequest.source
+ *

+ */ @SearchParamDefinition(name="source", path="SupplyRequest.source", description="Who initiated this order", type="reference" ) public static final String SP_SOURCE = "source"; + /** + * Fluent Client search parameter constant for source + *

+ * Description: Who initiated this order
+ * Type: reference
+ * Path: SupplyRequest.source
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "SupplyRequest:source". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("SupplyRequest:source").toLocked(); + /** + * Search parameter: status + *

+ * Description: requested | completed | failed | cancelled
+ * Type: token
+ * Path: SupplyRequest.status
+ *

+ */ @SearchParamDefinition(name="status", path="SupplyRequest.status", description="requested | completed | failed | cancelled", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: requested | completed | failed | cancelled
+ * Type: token
+ * Path: SupplyRequest.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/TestScript.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/TestScript.java index 0b289398f87..a92ba126600 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/TestScript.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/TestScript.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -7749,20 +7749,146 @@ public class TestScript extends DomainResource { return ResourceType.TestScript; } + /** + * Search parameter: identifier + *

+ * Description: External identifier
+ * Type: token
+ * Path: TestScript.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="TestScript.identifier", description="External identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: External identifier
+ * Type: token
+ * Path: TestScript.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: testscript-test-capability + *

+ * Description: TestScript test required and validated capability
+ * Type: string
+ * Path: TestScript.test.metadata.capability.description
+ *

+ */ @SearchParamDefinition(name="testscript-test-capability", path="TestScript.test.metadata.capability.description", description="TestScript test required and validated capability", type="string" ) public static final String SP_TESTSCRIPT_TEST_CAPABILITY = "testscript-test-capability"; + /** + * Fluent Client search parameter constant for testscript-test-capability + *

+ * Description: TestScript test required and validated capability
+ * Type: string
+ * Path: TestScript.test.metadata.capability.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TESTSCRIPT_TEST_CAPABILITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TESTSCRIPT_TEST_CAPABILITY); + + /** + * Search parameter: testscript-setup-capability + *

+ * Description: TestScript setup required and validated capability
+ * Type: string
+ * Path: TestScript.setup.metadata.capability.description
+ *

+ */ @SearchParamDefinition(name="testscript-setup-capability", path="TestScript.setup.metadata.capability.description", description="TestScript setup required and validated capability", type="string" ) public static final String SP_TESTSCRIPT_SETUP_CAPABILITY = "testscript-setup-capability"; + /** + * Fluent Client search parameter constant for testscript-setup-capability + *

+ * Description: TestScript setup required and validated capability
+ * Type: string
+ * Path: TestScript.setup.metadata.capability.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TESTSCRIPT_SETUP_CAPABILITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TESTSCRIPT_SETUP_CAPABILITY); + + /** + * Search parameter: name + *

+ * Description: Informal name for this TestScript
+ * Type: string
+ * Path: TestScript.name
+ *

+ */ @SearchParamDefinition(name="name", path="TestScript.name", description="Informal name for this TestScript", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: Informal name for this TestScript
+ * Type: string
+ * Path: TestScript.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: description + *

+ * Description: Natural language description of the TestScript
+ * Type: string
+ * Path: TestScript.description
+ *

+ */ @SearchParamDefinition(name="description", path="TestScript.description", description="Natural language description of the TestScript", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Natural language description of the TestScript
+ * Type: string
+ * Path: TestScript.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: testscript-capability + *

+ * Description: TestScript required and validated capability
+ * Type: string
+ * Path: TestScript.metadata.capability.description
+ *

+ */ @SearchParamDefinition(name="testscript-capability", path="TestScript.metadata.capability.description", description="TestScript required and validated capability", type="string" ) public static final String SP_TESTSCRIPT_CAPABILITY = "testscript-capability"; + /** + * Fluent Client search parameter constant for testscript-capability + *

+ * Description: TestScript required and validated capability
+ * Type: string
+ * Path: TestScript.metadata.capability.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam TESTSCRIPT_CAPABILITY = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TESTSCRIPT_CAPABILITY); + + /** + * Search parameter: url + *

+ * Description: Absolute URL used to reference this TestScript
+ * Type: uri
+ * Path: TestScript.url
+ *

+ */ @SearchParamDefinition(name="url", path="TestScript.url", description="Absolute URL used to reference this TestScript", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: Absolute URL used to reference this TestScript
+ * Type: uri
+ * Path: TestScript.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Timing.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Timing.java index 0498c7d14ae..9783185e858 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Timing.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Timing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ValueSet.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ValueSet.java index 05efdf4006e..5f1f85c06e8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ValueSet.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -4749,32 +4749,266 @@ public class ValueSet extends DomainResource { return ResourceType.ValueSet; } + /** + * Search parameter: date + *

+ * Description: The value set publication date
+ * Type: date
+ * Path: ValueSet.date
+ *

+ */ @SearchParamDefinition(name="date", path="ValueSet.date", description="The value set publication date", type="date" ) public static final String SP_DATE = "date"; + /** + * Fluent Client search parameter constant for date + *

+ * Description: The value set publication date
+ * Type: date
+ * Path: ValueSet.date
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE); + + /** + * Search parameter: identifier + *

+ * Description: The identifier for the value set
+ * Type: token
+ * Path: ValueSet.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="ValueSet.identifier", description="The identifier for the value set", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: The identifier for the value set
+ * Type: token
+ * Path: ValueSet.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: code + *

+ * Description: A code defined in the value set
+ * Type: token
+ * Path: ValueSet.codeSystem.concept.code
+ *

+ */ @SearchParamDefinition(name="code", path="ValueSet.codeSystem.concept.code", description="A code defined in the value set", type="token" ) public static final String SP_CODE = "code"; + /** + * Fluent Client search parameter constant for code + *

+ * Description: A code defined in the value set
+ * Type: token
+ * Path: ValueSet.codeSystem.concept.code
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE); + + /** + * Search parameter: description + *

+ * Description: Text search in the description of the value set
+ * Type: string
+ * Path: ValueSet.description
+ *

+ */ @SearchParamDefinition(name="description", path="ValueSet.description", description="Text search in the description of the value set", type="string" ) public static final String SP_DESCRIPTION = "description"; + /** + * Fluent Client search parameter constant for description + *

+ * Description: Text search in the description of the value set
+ * Type: string
+ * Path: ValueSet.description
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION); + + /** + * Search parameter: version + *

+ * Description: The version identifier of the value set
+ * Type: token
+ * Path: ValueSet.version
+ *

+ */ @SearchParamDefinition(name="version", path="ValueSet.version", description="The version identifier of the value set", type="token" ) public static final String SP_VERSION = "version"; + /** + * Fluent Client search parameter constant for version + *

+ * Description: The version identifier of the value set
+ * Type: token
+ * Path: ValueSet.version
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + + /** + * Search parameter: url + *

+ * Description: The logical URL for the value set
+ * Type: uri
+ * Path: ValueSet.url
+ *

+ */ @SearchParamDefinition(name="url", path="ValueSet.url", description="The logical URL for the value set", type="uri" ) public static final String SP_URL = "url"; + /** + * Fluent Client search parameter constant for url + *

+ * Description: The logical URL for the value set
+ * Type: uri
+ * Path: ValueSet.url
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL); + + /** + * Search parameter: expansion + *

+ * Description: Uniquely identifies this expansion
+ * Type: uri
+ * Path: ValueSet.expansion.identifier
+ *

+ */ @SearchParamDefinition(name="expansion", path="ValueSet.expansion.identifier", description="Uniquely identifies this expansion", type="uri" ) public static final String SP_EXPANSION = "expansion"; + /** + * Fluent Client search parameter constant for expansion + *

+ * Description: Uniquely identifies this expansion
+ * Type: uri
+ * Path: ValueSet.expansion.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam EXPANSION = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_EXPANSION); + + /** + * Search parameter: reference + *

+ * Description: A code system included or excluded in the value set or an imported value set
+ * Type: uri
+ * Path: ValueSet.compose.include.system
+ *

+ */ @SearchParamDefinition(name="reference", path="ValueSet.compose.include.system", description="A code system included or excluded in the value set or an imported value set", type="uri" ) public static final String SP_REFERENCE = "reference"; + /** + * Fluent Client search parameter constant for reference + *

+ * Description: A code system included or excluded in the value set or an imported value set
+ * Type: uri
+ * Path: ValueSet.compose.include.system
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam REFERENCE = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_REFERENCE); + + /** + * Search parameter: system + *

+ * Description: The system for any codes defined by this value set
+ * Type: uri
+ * Path: ValueSet.codeSystem.system
+ *

+ */ @SearchParamDefinition(name="system", path="ValueSet.codeSystem.system", description="The system for any codes defined by this value set", type="uri" ) public static final String SP_SYSTEM = "system"; + /** + * Fluent Client search parameter constant for system + *

+ * Description: The system for any codes defined by this value set
+ * Type: uri
+ * Path: ValueSet.codeSystem.system
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.UriClientParam SYSTEM = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SYSTEM); + + /** + * Search parameter: name + *

+ * Description: The name of the value set
+ * Type: string
+ * Path: ValueSet.name
+ *

+ */ @SearchParamDefinition(name="name", path="ValueSet.name", description="The name of the value set", type="string" ) public static final String SP_NAME = "name"; + /** + * Fluent Client search parameter constant for name + *

+ * Description: The name of the value set
+ * Type: string
+ * Path: ValueSet.name
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME); + + /** + * Search parameter: context + *

+ * Description: A use context assigned to the value set
+ * Type: token
+ * Path: ValueSet.useContext
+ *

+ */ @SearchParamDefinition(name="context", path="ValueSet.useContext", description="A use context assigned to the value set", type="token" ) public static final String SP_CONTEXT = "context"; + /** + * Fluent Client search parameter constant for context + *

+ * Description: A use context assigned to the value set
+ * Type: token
+ * Path: ValueSet.useContext
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT); + + /** + * Search parameter: publisher + *

+ * Description: Name of the publisher of the value set
+ * Type: string
+ * Path: ValueSet.publisher
+ *

+ */ @SearchParamDefinition(name="publisher", path="ValueSet.publisher", description="Name of the publisher of the value set", type="string" ) public static final String SP_PUBLISHER = "publisher"; + /** + * Fluent Client search parameter constant for publisher + *

+ * Description: Name of the publisher of the value set
+ * Type: string
+ * Path: ValueSet.publisher
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER); + + /** + * Search parameter: status + *

+ * Description: The status of the value set
+ * Type: token
+ * Path: ValueSet.status
+ *

+ */ @SearchParamDefinition(name="status", path="ValueSet.status", description="The status of the value set", type="token" ) public static final String SP_STATUS = "status"; + /** + * Fluent Client search parameter constant for status + *

+ * Description: The status of the value set
+ * Type: token
+ * Path: ValueSet.status
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS); + } diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/VisionPrescription.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/VisionPrescription.java index 9dded906acf..a38e13a34e4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/VisionPrescription.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import java.util.*; @@ -1868,28 +1868,118 @@ public class VisionPrescription extends DomainResource { return ResourceType.VisionPrescription; } + /** + * Search parameter: prescriber + *

+ * Description: Who authorizes the vision product
+ * Type: reference
+ * Path: VisionPrescription.prescriber
+ *

+ */ @SearchParamDefinition(name="prescriber", path="VisionPrescription.prescriber", description="Who authorizes the vision product", type="reference" ) public static final String SP_PRESCRIBER = "prescriber"; + /** + * Fluent Client search parameter constant for prescriber + *

+ * Description: Who authorizes the vision product
+ * Type: reference
+ * Path: VisionPrescription.prescriber
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRESCRIBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRESCRIBER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "VisionPrescription:prescriber". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PRESCRIBER = new ca.uhn.fhir.model.api.Include("VisionPrescription:prescriber").toLocked(); + /** + * Search parameter: identifier + *

+ * Description: Return prescriptions with this external identifier
+ * Type: token
+ * Path: VisionPrescription.identifier
+ *

+ */ @SearchParamDefinition(name="identifier", path="VisionPrescription.identifier", description="Return prescriptions with this external identifier", type="token" ) public static final String SP_IDENTIFIER = "identifier"; + /** + * Fluent Client search parameter constant for identifier + *

+ * Description: Return prescriptions with this external identifier
+ * Type: token
+ * Path: VisionPrescription.identifier
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER); + + /** + * Search parameter: patient + *

+ * Description: The identity of a patient to list dispenses for
+ * Type: reference
+ * Path: VisionPrescription.patient
+ *

+ */ @SearchParamDefinition(name="patient", path="VisionPrescription.patient", description="The identity of a patient to list dispenses for", type="reference" ) public static final String SP_PATIENT = "patient"; + /** + * Fluent Client search parameter constant for patient + *

+ * Description: The identity of a patient to list dispenses for
+ * Type: reference
+ * Path: VisionPrescription.patient
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "VisionPrescription:patient". */ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("VisionPrescription:patient").toLocked(); + /** + * Search parameter: datewritten + *

+ * Description: Return prescriptions written on this date
+ * Type: date
+ * Path: VisionPrescription.dateWritten
+ *

+ */ @SearchParamDefinition(name="datewritten", path="VisionPrescription.dateWritten", description="Return prescriptions written on this date", type="date" ) public static final String SP_DATEWRITTEN = "datewritten"; + /** + * Fluent Client search parameter constant for datewritten + *

+ * Description: Return prescriptions written on this date
+ * Type: date
+ * Path: VisionPrescription.dateWritten
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.DateClientParam DATEWRITTEN = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATEWRITTEN); + + /** + * Search parameter: encounter + *

+ * Description: Return prescriptions with this encounter identifier
+ * Type: reference
+ * Path: VisionPrescription.encounter
+ *

+ */ @SearchParamDefinition(name="encounter", path="VisionPrescription.encounter", description="Return prescriptions with this encounter identifier", type="reference" ) public static final String SP_ENCOUNTER = "encounter"; + /** + * Fluent Client search parameter constant for encounter + *

+ * Description: Return prescriptions with this encounter identifier
+ * Type: reference
+ * Path: VisionPrescription.encounter
+ *

+ */ + public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER); + /** * Constant for fluent queries to be used to add include statements. Specifies * the path value of "VisionPrescription:encounter". diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Block.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Block.java deleted file mode 100644 index 2aed8c85e21..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Block.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Class annotation used to indicate a class which is a "block"/"component" type. A block - * is a nested group of fields within a resource definition and can contain other blocks as - * well as data types. - *

- * An example of a block would be Patient.contact - *

- */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface Block { - - /** - * @deprecated Do not use, will be removed - */ - @Deprecated - String name() default ""; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Child.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Child.java deleted file mode 100644 index 6121e42291e..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Child.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hl7.fhir.dstu21.model.Enumeration; -import org.hl7.fhir.dstu21.model.api.IBase; -import org.hl7.fhir.dstu21.model.api.IBaseEnumFactory; - -/** - * Field annotation for fields within resource and datatype definitions, indicating - * a child of that type. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.FIELD}) -public @interface Child { - - /** - * Constant value to supply for {@link #order()} when the order is defined - * elsewhere - */ - int ORDER_UNKNOWN = -1; - - /** - * Constant value to supply for {@link #max()} to indicate '*' (no maximum) - */ - int MAX_UNLIMITED = -1; - - /** - * Constant value to supply for {@link #order()} to indicate that this child should replace the - * entry in the superclass with the same name (and take its {@link Child#order() order} value - * in the process). This is useful if you wish to redefine an existing field in a resource/type - * definition in order to constrain/extend it. - */ - int REPLACE_PARENT = -2; - - /** - * The name of this field, as it will appear in serialized versions of the message - */ - String name(); - - /** - * The order in which this field comes within its parent. The first field should have a - * value of 0, the second a value of 1, etc. - */ - int order() default ORDER_UNKNOWN; - - /** - * The minimum number of repetitions allowed for this child - */ - int min() default 0; - - /** - * The maximum number of repetitions allowed for this child. Should be - * set to {@link #MAX_UNLIMITED} if there is no limit to the number of - * repetitions. - */ - int max() default 1; - - /** - * Lists the allowable types for this field, if the field supports multiple - * types (otherwise does not need to be populated). - *

- * For example, if this field supports either DateTimeDt or BooleanDt types, - * those two classes should be supplied here. - *

- */ - Class[] type() default {}; - - /** - * For children which accept an {@link Enumeration} as the type, this - * field indicates the type to use for the enum factory - */ - Class> enumFactory() default NoEnumFactory.class; - - /** - * Is this element a modifier? - */ - boolean modifier() default false; - - /** - * Should this element be included in the summary view - */ - boolean summary() default false; - - // Not implemented -// /** -// * This value is used when extending a built-in model class and defining a -// * field to replace a field within the built-in class. For example, the {@link Patient} -// * resource has a {@link Patient#getName() name} field, but if you wanted to extend Patient and -// * provide your own implementation of {@link HumanNameDt} (most likely your own subclass of -// * HumanNameDt which adds extensions of your choosing) you could do that using a replacement field. -// */ -// String replaces() default ""; - - public static class NoEnumFactory implements IBaseEnumFactory> { - - private NoEnumFactory() { - // non instantiable - } - - @Override - public Enum fromCode(String theCodeString) throws IllegalArgumentException { - return null; - } - - @Override - public String toCode(Enum theCode) { - return null; - } - - } - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/DatatypeDef.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/DatatypeDef.java deleted file mode 100644 index d9ccc9095fc..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/DatatypeDef.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hl7.fhir.dstu21.model.api.IBaseDatatype; - -/** - * Class annotation to note a class which defines a datatype - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface DatatypeDef { - - /** - * The defined name of this datatype - */ - String name(); - - /** - * Set this to true (default is false) for any types that are - * really only a specialization of another type. For example, - * {@link BoundCodeDt} is really just a specific type of - * {@link CodeDt} and not a separate datatype, so it should - * have this set to true. - */ - boolean isSpecialization() default false; - - /** - * Indicates that this datatype is a profile of the given datatype, which - * implies certain parsing/encoding rules (e.g. a choice element named - * foo[x] which allows a Markdown value will still be encoded as - * fooString because Markdown is a profile of string. - */ - Class profileOf() default IBaseDatatype.class; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Description.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Description.java deleted file mode 100644 index a4fc828cb63..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Description.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Annotation which may be placed on a resource/datatype definition, or a field, or - * a search parameter definition in order to provide documentation for that item. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER, ElementType.METHOD}) -public @interface Description { - - /** - * Optional short name for this child - */ - String shortDefinition() default ""; - - /** - * Optional formal definition for this child - */ - String formalDefinition() default ""; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Extension.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Extension.java deleted file mode 100644 index b9ace078853..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/Extension.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Field modifier to be placed on a child field (a field also annotated with the {@link Child} annotation) which - * indicates that this field is an extension. - */ -@Target(value = { ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -public @interface Extension { - - /** - * This parameter affects how the extension is treated when the element definition containing this resource is - * exported to a profile. - * - *

- * If set to true, the resource is taken to be a local resource and its definition is exported - * along with the reference. Use this option for extension defintions that you have added locally (i.e. within your - * own organization) - *

- * - *

- * If set to false, the resource is taken to be a remote resource and its definition is - * not exported to the profile. Use this option for extensions that are defined by other organizations (i.e. - * by regional authorities or jurisdictional governments) - *

- */ - boolean definedLocally(); - - /** - * Returns true if this extension is a modifier extension - */ - boolean isModifier(); - - /** - * The URL associated with this extension - */ - String url(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/ResourceDef.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/ResourceDef.java deleted file mode 100644 index d70bf9c25e8..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/ResourceDef.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Class annotation which indicates a resource definition class - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface ResourceDef { - - /** - * The name of the resource (e.g. "Patient" or "DiagnosticReport") - */ - String name(); - - /** - * Not currently used - */ - String id() default ""; - - /** - * The URL indicating the profile for this resource definition, if known - */ - String profile() default ""; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/SearchParamDefinition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/SearchParamDefinition.java deleted file mode 100644 index 34c8cb6331d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/annotations/SearchParamDefinition.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.hl7.fhir.dstu21.model.annotations; - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hl7.fhir.dstu21.model.Resource; - -@Target(value=ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -public @interface SearchParamDefinition { - - /** - * The name for this parameter - */ - String name(); - - /** - * The path for this parameter - */ - String path(); - - /** - * A description of this parameter - */ - String description() default ""; - - /** - * The type for this parameter, e.g. "string", or "token" - */ - String type() default "string"; - - /** - * If the parameter is of type "composite", this parameter lists the names of the parameters - * which this parameter is a composite of. E.g. "name-value-token" is a composite of "name" and "value-token". - *

- * If the parameter is not a composite, this parameter must be empty - *

- */ - String[] compositeOf() default {}; - - /** - * For search params of type "reference", this can optionally be used to - * specify the resource type(s) that this parameter applies to. - */ - Class[] target() default {}; - - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IAnyResource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IAnyResource.java deleted file mode 100644 index 2e353ed9f36..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IAnyResource.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IAnyResource extends IBaseResource { - - String getId(); - - IAnyResource setId(String theId); - - IIdType getIdElement(); - - IBaseMetaType getMeta(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBackboneElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBackboneElement.java deleted file mode 100644 index 657eabe9e03..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBackboneElement.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBackboneElement extends IBase { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBase.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBase.java deleted file mode 100644 index dc6ff680398..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBase.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/** - * This interface is a simple marker for anything which is an HL7 - * structure of some kind. It is provided mostly to simplify convergence - * between the HL7.org structures and the HAPI ones. - */ -public interface IBase { - - boolean isEmpty(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBackboneElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBackboneElement.java deleted file mode 100644 index b1831997211..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBackboneElement.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseBackboneElement extends IBase, IBaseHasExtensions, IBaseHasModifierExtensions { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBinary.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBinary.java deleted file mode 100644 index ac337746cd2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBinary.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseBinary extends IBaseResource { - - byte[] getContent(); - - String getContentAsBase64(); - - String getContentType(); - - IBaseBinary setContent(byte[] theContent); - - IBaseBinary setContentAsBase64(String theContent); - - IBaseBinary setContentType(String theContentType); -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBooleanDatatype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBooleanDatatype.java deleted file mode 100644 index 5e50708e185..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBooleanDatatype.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseBooleanDatatype extends IPrimitiveType { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBundle.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBundle.java deleted file mode 100644 index 2649a0cc2e9..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseBundle.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseBundle extends IBaseResource { - - /** - * Constant for links provided in the bundle. This constant is used in the - * link.type field to indicate that the given link is for - * the next page of results. - */ - public static final String LINK_NEXT = "next"; - - /** - * Constant for links provided in the bundle. This constant is used in the - * link.type field to indicate that the given link is for - * the previous page of results. - */ - public static final String LINK_PREV = "prev"; - - /** - * Constant for links provided in the bundle. This constant is used in the - * link.type field to indicate that the given link is for - * this bundle. - */ - public static final String LINK_SELF = "self"; - - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseCoding.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseCoding.java deleted file mode 100644 index 91fb967fdd6..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseCoding.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -public interface IBaseCoding { - - IBaseCoding setSystem(String theScheme); - - IBaseCoding setCode(String theTerm); - - IBaseCoding setDisplay(String theLabel); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseConformance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseConformance.java deleted file mode 100644 index c5cd34342ae..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseConformance.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -public interface IBaseConformance extends IBaseResource { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatype.java deleted file mode 100644 index 7c39b772425..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatype.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseDatatype extends IBase { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatypeElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatypeElement.java deleted file mode 100644 index 35d1ca5e2dd..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDatatypeElement.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseDatatypeElement extends IBase { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDecimalDatatype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDecimalDatatype.java deleted file mode 100644 index d09f7d27295..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseDecimalDatatype.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.math.BigDecimal; - -public interface IBaseDecimalDatatype extends IPrimitiveType { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseElement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseElement.java deleted file mode 100644 index f97ff7295ed..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseElement.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -public interface IBaseElement { - - IBaseElement setId(String theValue); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumFactory.java deleted file mode 100644 index a605e73c5e5..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -public interface IBaseEnumFactory> { - - /** - * Read an enumeration value from the string that represents it on the XML or JSON - * - * @param codeString the value found in the XML or JSON - * @return the enumeration value - * @throws IllegalArgumentException is the value is not known - */ - public T fromCode(String codeString) throws IllegalArgumentException; - - /** - * Get the XML/JSON representation for an enumerated value - * - * @param code - the enumeration value - * @return the XML/JSON representation - */ - public String toCode(T code); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumeration.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumeration.java deleted file mode 100644 index 3e39e1d041d..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseEnumeration.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -public interface IBaseEnumeration> extends IPrimitiveType { - - // Marker interface - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseExtension.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseExtension.java deleted file mode 100644 index 78620bf4725..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseExtension.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.List; - -public interface IBaseExtension extends ICompositeType { - - List getExtension(); - - String getUrl(); - - IBaseDatatype getValue(); - - T setUrl(String theUrl); - - T setValue(IBaseDatatype theValue); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseFhirEnum.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseFhirEnum.java deleted file mode 100644 index c6ed0122fa4..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseFhirEnum.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - - -/* -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. - -*/ - -/** - * Interface to be implemented by all built-in FHIR enumerations (i.e. the - * actual FHIR-defined Java Enum will implement this interface) - */ -public interface IBaseFhirEnum { - - /** - * Get the XML/JSON representation for an enumerated value - * @return the XML/JSON representation - */ - public String toCode(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasExtensions.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasExtensions.java deleted file mode 100644 index f438f30be9f..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasExtensions.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.List; - -public interface IBaseHasExtensions { - - public List> getExtension(); - - public IBaseExtension addExtension(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasModifierExtensions.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasModifierExtensions.java deleted file mode 100644 index 0d3e2e83163..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseHasModifierExtensions.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.List; - -public interface IBaseHasModifierExtensions { - - public List> getModifierExtension(); - - public IBaseExtension addModifierExtension(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseIntegerDatatype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseIntegerDatatype.java deleted file mode 100644 index f8e0359c315..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseIntegerDatatype.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseIntegerDatatype extends IPrimitiveType { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseMetaType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseMetaType.java deleted file mode 100644 index ecfa69de6be..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseMetaType.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.Date; - -public interface IBaseMetaType extends ICompositeType { - - IBaseCoding addTag(); - - IBaseMetaType setLastUpdated(Date theHeaderDateValue); - - Date getLastUpdated(); - - String getVersionId(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseOperationOutcome.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseOperationOutcome.java deleted file mode 100644 index bdb89b2c28b..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseOperationOutcome.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -public interface IBaseOperationOutcome extends IBaseResource { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseParameters.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseParameters.java deleted file mode 100644 index 29052292c99..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseParameters.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseParameters extends IBaseResource { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseReference.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseReference.java deleted file mode 100644 index 2ebe99d9503..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseReference.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IBaseReference extends ICompositeType { - - IBaseResource getResource(); - - void setResource(IBaseResource theResource); - - IIdType getReferenceElement(); - - IBaseReference setReference(String theReference); - - IBase setDisplay(String theValue); - - IPrimitiveType getDisplayElement(); -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseResource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseResource.java deleted file mode 100644 index 93af9f5a0a2..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseResource.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/** - * For now, this is a simple marker interface indicating that a class is a resource type. - * There are two concrete types of implementations of this interrface. The first are - * HL7.org's Resource structures (e.g. - * org.hl7.fhir.instance.model.Patient) and - * the second are HAPI's Resource structures, e.g. - * ca.uhn.fhir.model.dstu.resource.Patient) - */ -public interface IBaseResource extends IBase { - - IIdType getIdElement(); - - IBaseResource setId(String theId); - - IBaseResource setId(IIdType theId); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseXhtml.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseXhtml.java deleted file mode 100644 index cbdfee1c81a..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IBaseXhtml.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -public interface IBaseXhtml extends IPrimitiveType { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/ICompositeType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/ICompositeType.java deleted file mode 100644 index 44252c7dde1..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/ICompositeType.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -public interface ICompositeType extends IBaseDatatype { - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IDomainResource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IDomainResource.java deleted file mode 100644 index f281f3bf65c..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IDomainResource.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.List; - -import org.hl7.fhir.instance.model.api.IBaseExtension; - -public interface IDomainResource extends IAnyResource { - - List getContained(); - - INarrative getText(); - - public List> getExtension(); - - public List> getModifierExtension(); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IIdType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IIdType.java deleted file mode 100644 index ef591c3aec5..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IIdType.java +++ /dev/null @@ -1,138 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/** - * Base interface for ID datatype. - * - *

- * Concrete Implementations: This interface is often returned and/or accepted by methods in HAPI's API - * where either {@link ca.uhn.fhir.model.primitive.IdDt} (the HAPI structure ID type) or - * org.hl7.fhir.instance.model.IdType (the RI structure ID type) will be used, depending on - * which version of the strctures your application is using. - *

- */ -public interface IIdType { - - void applyTo(IBaseResource theResource); - - /** - * Returns the server base URL if this ID contains one. For example, the base URL is - * the 'http://example.com/fhir' in the following ID: http://example.com/fhir/Patient/123/_history/55 - */ - String getBaseUrl(); - - /** - * Returns only the logical ID part of this ID. For example, given the ID - * "http://example,.com/fhir/Patient/123/_history/456", this method would - * return "123". - */ - String getIdPart(); - - /** - * Returns the ID part of this ID (e.g. in the ID http://example.com/Patient/123/_history/456 this would be the - * part "123") parsed as a {@link Long}. - * - * @throws NumberFormatException If the value can't be parsed as a long - */ - Long getIdPartAsLong(); - - String getResourceType(); - - /** - * Returns the value of this ID. Note that this value may be a fully qualified URL, a relative/partial URL, or a simple ID. Use {@link #getIdPart()} to get just the ID portion. - * - * @see #getIdPart() - */ - String getValue(); - - String getVersionIdPart(); - - /** - * Returns the version ID part of this ID (e.g. in the ID http://example.com/Patient/123/_history/456 this would be the - * part "456") parsed as a {@link Long}. - * - * @throws NumberFormatException If the value can't be parsed as a long - */ - Long getVersionIdPartAsLong(); - - boolean hasBaseUrl(); - - /** - * Returns true if this ID contains an actual ID part. For example, the ID part is - * the '123' in the following ID: http://example.com/fhir/Patient/123/_history/55 - */ - boolean hasIdPart(); - - boolean hasResourceType(); - - boolean hasVersionIdPart(); - - /** - * Returns true if this ID contains an absolute URL (in other words, a URL starting with "http://" or "https://" - */ - boolean isAbsolute(); - - boolean isEmpty(); - - /** - * Returns true if the {@link #getIdPart() ID part of this object} is valid according to the FHIR rules for valid IDs. - *

- * The FHIR specification states: - * Any combination of upper or lower case ASCII letters ('A'..'Z', and 'a'..'z', numerals ('0'..'9'), '-' and '.', with a length limit of 64 characters. (This might be an integer, an un-prefixed OID, UUID or any other identifier pattern that meets these constraints.) regex: [A-Za-z0-9\-\.]{1,64} - *

- */ - boolean isIdPartValid(); - - /** - * Returns true if the {@link #getIdPart() ID part of this object} contains - * only numbers - */ - boolean isIdPartValidLong(); - - /** - * Returns true if the ID is a local reference (in other words, it begins with the '#' character) - */ - boolean isLocal(); - - /** - * Returns true if the {@link #getVersionIdPart() version ID part of this object} contains - * only numbers - */ - boolean isVersionIdPartValidLong(); - - IIdType setValue(String theString); - - IIdType toUnqualified(); - - IIdType toUnqualifiedVersionless(); - - IIdType toVersionless(); - - IIdType withResourceType(String theResName); - - IIdType withServerBase(String theServerBase, String theResourceName); - - IIdType withVersion(String theVersion); - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/INarrative.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/INarrative.java deleted file mode 100644 index 7f05ad3b645..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/INarrative.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface INarrative extends ICompositeType { - - boolean isEmpty(); - - // TODO: use less broad exception type here - public void setDivAsString(String theString) throws Exception; - - // TODO: use less broad exception type here - public String getDivAsString() throws Exception; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IPrimitiveType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IPrimitiveType.java deleted file mode 100644 index ac3a5acfacd..00000000000 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/api/IPrimitiveType.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.hl7.fhir.dstu21.model.api; - - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -public interface IPrimitiveType extends IBaseDatatype { - - void setValueAsString(String theValue) throws IllegalArgumentException; - - String getValueAsString(); - - T getValue(); - - IPrimitiveType setValue(T theValue) throws IllegalArgumentException; - -} diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Additionalmaterials.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Additionalmaterials.java index 9118ce91ec5..e125bdb7cb0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Additionalmaterials.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Additionalmaterials.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 96006d0756a..0933de10f18 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java index f4dc65f6bee..1613bfe752f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Adjudication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ce80a0c3729..e60b22cccd0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java index 7d32225ed0f..6cbcf8d7d57 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationError.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c4eb835a6f1..bccdf0c9e78 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java index fe157f3ab12..b1bcd6ebce8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AdjudicationReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index b10c8f72861..476deb1de89 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java index 9c4897f5be9..5c673fb4db9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalBreeds.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f22810ca4f1..e7051602f56 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java index c1044542ba6..1cf44b63a9e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalGenderstatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5633d06e9c5..36505012ed4 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java index 765a54a1fdf..b62adcc91d9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnimalSpecies.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a73d4d610f2..89291231a90 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java index 94d2d23208c..a671ba77e07 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupations.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java index 2ff44ab382f..bae1ddd3972 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AnzscoOccupationsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java index dd9fa5280ab..525c27a05f9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/AuditSourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index aaa0557b35d..70ae81c6747 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java index d30b7f7b1f0..3aa19c4963d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java index a869abb4200..72f3b9e9b36 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BasicResourceTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java index 35206069db5..8ff89f23bab 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4033297e5c3..b727825d831 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java index a42157e4299..13a749bfadb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitNetwork.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 71006de53d4..3925b709f45 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java index e4fc3c2e160..ae1cc054c40 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java index 9d9aa6bb415..41c466d1d7f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitSubcategoryEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java index d0655c28875..4121af2e13b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitTerm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index b5a511a267f..7c96c65d881 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java index 67b74755742..15e6f3434cd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 788b165b013..d6356defb3a 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java index cf040512e51..20549de50a7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/BenefitUnit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index e60b199ac4a..0b70f3ecb48 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java index 47d669fdc89..4a41ddce29f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/CarePlanActivityCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ee0c24f5cea..83c4b4dd60f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java index e34a25097f0..cf4962f01c6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ChoiceListOrientation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6ac8562a758..621c895fdef 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java index 03e9f0859a4..86c12bca525 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimException.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0bfa7e2acbf..05220a127b0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java index e7b5ba172de..0e591c882ad 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClaimModifiers.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c1c88f25b91..f545c185879 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java index 5e0327d5a47..049ea71190a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ClassificationOrContext.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5a48b85e22c..040440eccb3 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java index 8d454710da8..696e4995ba5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 91c0821698a..e3c9c40d039 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java index 03599279267..e0cdaa4075e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionClinical.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5ffdb57b248..8a11c9ae0f9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java index 514c1be5e3d..e7c68d11e49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConditionState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f095d2b03d1..da440b40cfb 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java index fa22c01221d..903965674f0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ConformanceExpectation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5ee2fd1d6a0..8cf4e9db9ef 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java index c6155ee4aea..9aa1a0c7969 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContactentityType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c4d785cad0b..feca6bc7824 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java index 3a4e38cf704..9699c295bff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 539a5fcf7f6..dc12329bbee 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java index b3a6aee9627..9e86b083c34 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractActorrole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8455616cf50..67a57c7f1dc 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java index 4dca0fdb6d7..7b4834250b8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java index 9d3a3a86449..cf400e47ba7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSignerTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java index af1ee3f57a2..55936397295 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 3fe8d5ba737..abaee4a483c 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java index 770fec75309..e7e84b8d960 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermSubtype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 82af1e9785a..a8eb34d2891 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java index 1e3c030aec6..d1ee26faf49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractTermType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a14ce359369..313f6239a75 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java index 0e4f345e5b5..184fb097c7e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ContractType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 61eac8dc69a..c0e403dc5c2 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java index e2df99d88da..1b6933f2c6a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/DeviceAction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9d89d4d2762..e1832903245 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java index 3e0abbeb7f0..11aaa6ee0e2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java index 9de417b78af..87946fccdd1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterAdmitSourceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java index 68c97c199e3..c579ffdd810 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDiet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0ddb4de8bb8..31695631e63 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java index fd19ccc778d..d88a2937d02 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDisposition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java index 7ac647b79a4..fb2c550af71 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterDischargeDispositionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java index 7eba09a6bcc..3ea14521e6d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 999662f6f41..caf3d570c41 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java index 8694e506694..152fab9b6fe 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterSpecialArrangements.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9cb03b9435c..90022fc6679 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java index 76e90534a17..2f896d72004 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EncounterType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6e074ba2682..9856921f903 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java index e5a07d682c4..ede043be715 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/EntformulaAdditive.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 7db4d8a2125..c0c4f309ea2 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java index b114df9b627..155bc51fd0f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ef77e1aafd2..9c60b9a8c75 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java index 11be616d2bc..1b1281d1614 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FlagPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d71bbe12844..d5b1962eb22 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java index f3ab9364b33..d5c61e3fa74 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/FmConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 118a3f49f87..a659d57d9d3 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java index 38503d01973..b894458e766 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Forms.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c62d6ecb3cc..a4836677f6b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java index 37d265591bb..2c65d728f06 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Fundsreserve.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 292edf25a06..e550548c5cc 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java index c9e368c2d96..ec819e78694 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalAcceptanceStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 305637c0bde..440c8c0d3f0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java index 0ffce6d4a93..c52b4249b1e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9083f64de25..63caa6f7385 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java index 8fab7f026ea..eabcb6f56c5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6daddf135a4..2096c72a844 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java index de6004f72f0..996a7bebc79 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 78fed5623c3..2b86aba27d1 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java index f32aa0bd551..1c734bfba7e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/GoalStatusReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 2582999ede5..5f4d635b1fe 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java index 64eb8f5a368..54cfa02715b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationDateCriterion.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8e79a3984a6..608fef09b3c 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java index dfce84bd715..28ed4efa721 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ImmunizationRecommendationStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4850ab04b35..45b95d31375 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java index 531c04d871a..53e5fa7a19a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Intervention.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 123a9b76aa7..909abd17148 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java index ef0ae969e79..19865aeceaa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480020Answerlist.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 1fb7eae3f23..d55df19b8d1 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java index 90163ede904..10326b966b9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC480194Answerlist.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 04f7d41ba7c..7446cfef650 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java index a34eca84cee..bf129a5338e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530345Answerlist.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ea7635ef163..07be94df4e7 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java index ffc1aee2d6b..a529a61c075 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LOINC530378Answerlist.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index e014ea8e122..7ddac458f94 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java index 816815207d9..39102d655e7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListEmptyReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 92532ff8e0d..45e938c6528 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java index d0ed39d94b2..397803bd58b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java index ad5468421aa..bb5b4459ce1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListExampleCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java index 09ac04b836a..09d122953db 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListItemFlag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index cd4e73d7529..4738d77d9c1 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java index 02c3a1408e9..83f5a389c54 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ListOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a52498e3f6a..863ab30a49e 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java index 678b54e8c94..e7570686e66 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java index 0c202d33259..ee18fd0611a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/LocationPhysicalTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java index 322a317db70..1afd99c8ca3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageReasonEncounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8c36c319e02..97edbb82d87 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java index 2ad0e166ef7..29e803e2310 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MessageTransport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 57ec9b90cea..c607a986bbf 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java index a07c1d05ef4..910d30d6446 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/MissingToothReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ee4659aacb4..4e008b0df7b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java index 00fc9c8767c..899b194625c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java index 1640e48b00b..abc3ce15c9f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectLifecycleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java index b055afedf75..97a89207198 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java index dad8e9b1988..52adaff7aa1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java index c7cf0cc91ac..5288a482c09 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObjectType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index aa10ec8a4e7..98c042dabdd 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java index 2c2392bef88..01f612a8c58 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ObservationCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c58c2872840..478bee4f8a6 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java index d8fbf46dc5f..01bebb69d3e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java index da78ff5c80e..4151e0c0b90 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OperationOutcomeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java index 1c17d8aba4b..6a3c7e6cd77 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OralProsthodonticMaterial.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c3bdbdbb021..bb8071e9ec0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java index b6730bb18d5..73cf5490cf9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java index 4bc3bf47898..7aef016e2d8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/OrganizationTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java index 9a095715417..c31fae41f22 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java index 90d4163e67b..91831ca7ad9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientContactRelationshipEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java index 6db839f0f85..cba13bf2f32 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PatientMpiMatch.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9acc6f51955..e81f07017ac 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java index 0f3a24d2877..2c37c2c671a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Payeetype.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4885288cd54..b40fd6f656b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java index 9ffc72ff850..eaa3b6cef0a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentAdjustmentReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4005672460d..47acecf55a0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java index aa29cba535b..fa8e61c78b3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6caca3ddd15..b5db53380a4 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java index 7da9bf564a5..2414ae81df0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PaymentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 243264e77f0..dc39a652a94 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java index 73f0f0bb9bf..eadd121a1f0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a1174113c5b..e6e6129b4a8 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java index 6be63f51e4a..b521bfac54c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/PractitionerSpecialty.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 61c5cb2df79..0bfa2a9912d 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java index c84b28edb32..65de97e4807 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureProgressStatusCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 179e7871491..f43b3e529bb 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java index 501a8e889f8..85e0629bfb8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcedureRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8364e6cf4e6..ea89a539062 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java index 6f64dbeee72..ffb4ba132c7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0c04bce88f2..66075e5b5b6 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java index 6c8002a162b..6fa80ea45fa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProcessPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0d6a7268aa0..ef993c859c7 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java index dbe4a13a97b..3874ae3fffb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java index 964c1c47732..d9a8918577c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentRoleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java index b1a871e9c47..a3460511dda 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ProvenanceAgentType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index e461dcd22f2..ac3f880592b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java index 25868619c64..176df1ec73c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionMaxOccurs.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f2f7b178f72..3c2d8d110ac 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java index 659626f3b80..a21534b43de 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireDisplayCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 926ff09e8b4..112e0eee3f1 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java index a89e8057964..faeae8acc1d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControl.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java index 9a75ba0e389..f11ba907be9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/QuestionnaireItemControlEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java index 4612717532e..335a1e9e950 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index abb0b1e6a29..0938c0fe240 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java index 63a8d358c26..cd37352e3c5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ReasonMedicationNotGivenCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a265eca73b7..d173974a3f5 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java index c82076c6ab5..da56eb418e3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Relationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 591138eba38..5047eee179a 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java index 2074df0c3a8..77878eda87d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ResourceValidationMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5972637ce26..bf22f482154 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java index 3cb99a717e0..f4c78a1d793 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RestfulSecurityService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 46b65e34731..8d8fd13f444 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java index 2208dbfd369..0383d880616 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/RiskProbability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0ea05ab9abc..48da7778f10 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java index bbe86da4cf1..f47fab5166e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Ruleset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 57beb54cc39..76f1da8c2ca 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java index b728c89d338..311d20761ec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePharmacy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 58316028be2..bf91e18cf56 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java index 502c264249b..29720c8d073 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServicePlace.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 343fdc88974..98405e5316f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java index 6fad23212ac..c22d09146fc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index fd5e3995893..e9c1a8f0418 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java index 5776d94fd22..b2fff60d987 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceProvisionConditions.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 27c19c343fd..55fa906c9cf 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java index 6878b8fa850..4099fe82bf1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceReferralMethod.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 21276698425..8b9ec7b3df0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java index 6e50f80e7cb..9cef93ddb28 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUscls.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java index 88dc6f9086a..485fadbb175 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ServiceUsclsEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java index 02f37d39533..51609a78989 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java index 56ae57bd1dd..bd253469947 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SignatureTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java index 6e802836c25..5be29ceac15 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubscriptionTag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f064694e670..8f91f087e7f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java index 62b28e7bf32..8f341b5f9f0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SubstanceCategory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4fb18b92812..844e2552c56 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java index 9933fc315c4..21aa15ea54f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplydeliveryType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 75326d8634f..2accd7ddd5f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java index d5c9c9f5647..f85a57849aa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestKind.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 7267657a020..0c560bf154f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java index 286d6518a9b..78169fd5113 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/SupplyrequestReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index eca971094ca..469729e1c9f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java index f69224a2ea9..4b6bf9e902b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Surface.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5ab414ce669..edcf9c3ea02 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java index 6ded9fe6611..9cd4875bfa8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Teeth.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java index a0cb857a1c1..044214ec78e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TeethEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java index 2724263d11a..d4f5bb9b0ff 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodes.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java index 98b240b7a67..5bd3f390d8e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/TestscriptOperationCodesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java index 31e186d8a43..5add33452f8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Tooth.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java index 0df3d774fdc..443713f4164 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/ToothEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java index 0498ca0106e..fd4fc2d0c54 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/Udi.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d067c50ccf5..de07aa2f4f1 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java index 4d1dc8a8d1e..2a8bfe0ea49 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementCondition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 3bd0bc25ae4..e4e0dd3a4f2 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java index 8e83d267dee..faae268bc91 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java index 9932eaeb0f3..cc1c1fc3313 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java index ffffee9e910..18eb58778f4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementDetailType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d0a6463716b..f0c2b8d411c 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java index 3220ab0ccf9..c3f95a51f7c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AcknowledgementType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 721f494d5b0..85a36a2f962 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java index 08f54761c6f..bbddc390774 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java index 4a66c7f6416..ac35cf92239 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java index ac3ed2fd142..de9fff27170 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java index 5504135e4bd..868f99b9632 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java index b10045284a4..bdfb8186d25 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActExposureLevelCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index acc751d9706..b427606e0be 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java index 81e1d91037b..e87fff80eea 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActInvoiceElementModifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 74a72cf6082..f0592d6373e 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java index 9f51b897384..edbc84374f2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMood.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java index f00782f8a20..d95508223b2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActMoodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java index fceeef1e242..a0022c6b3a5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java index fdeeb9400a6..412730a31f2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActPriorityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java index a7405cce179..3d05e438abf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java index 30bb29e7de2..5ff92e23b6c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActReasonEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java index cf986c20630..6b2cfff1240 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipCheckpoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index be62ff4dfdb..dac60c58ece 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java index 64b8cbc7d31..60cbbf1dcb3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipJoin.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index dc94bc20203..b6242a787af 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java index d99983bb9bd..557ac5dcab6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSplit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 720c9f1301d..da5297241d0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java index c0acb692067..6d6395d828f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java index 5369772f8f6..e9f3fb715fa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipSubsetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java index 24ebf407ad4..5759743fe8a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java index 30b743815fa..86d8f29c46f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActRelationshipTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java index 9f222e62c36..82affa38b65 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSite.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java index 60b347af310..53a6095d23c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActSiteEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java index 65312306fb5..3766d5ebb55 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java index 85243a31fe4..1892e3c0448 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActStatusEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java index 352974acb2b..cdfc0e737e2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUSPrivacyLaw.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 62423e21241..80be98da68b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java index bc27f23ff10..ceaeefcaa0d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ActUncertainty.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 65b41cb4200..7659e1cd06e 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java index b8f252eea70..011b595fe00 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java index dc5c8b01f6e..2f136c4631e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressPartTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java index 5aa9f236b4e..68495980b1b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java index db3b4cbbf62..6f2f8e22e59 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AddressUseEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java index 40af86e376d..99c31cc55aa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AdministrativeGender.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index afc522baf35..376cb9ba844 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java index cf6441ac4b1..fbc619adc43 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguages.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java index 9cb74034568..d0607ce78d9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3AmericanIndianAlaskaNativeLanguagesEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java index 01803073d46..53e29498fc8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Calendar.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java index 831755efd4d..fa5549b4c9b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java index 03dfb52ecc9..1ac84626284 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarCycleEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; 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 index b0bec76c524..4bdbcb35ccf 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java index 910a09d4941..084f48475a5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CalendarType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 70de646db0b..97974bf2988 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java index b5eebf3421f..3f413f8446f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Charset.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java index 52fdd225a61..621979029fb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CharsetEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java index 84938cc4232..27128ad5cab 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CodingRationale.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 1002d3c6a19..62d4ce0f12c 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java index de3b58f9ce5..bf0c9e128ac 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CommunicationFunctionType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a8192972b40..06afdfd2f8f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java index da8a36b25b9..ced2042823e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3CompressionAlgorithm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d87118ee3e1..404f8c58d86 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java index 7aa8522fba0..2aa94669377 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Confidentiality.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java index 08114b28aca..e0af1550104 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ConfidentialityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java index 73f14951d39..eeb68216baa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerCap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index cc31acfe71b..b004df3d269 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java index 6173f5d1786..73358f29e38 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContainerSeparator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index b232907a06f..5360e42fe2e 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java index b0824a9b9d8..29f788d98c3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContentProcessingMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a89fe93cf49..4bb6fc9579b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java index fce8d75f1df..8923e2d0937 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControl.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java index 0af03d34c70..e8286e9b789 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ContextControlEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java index 03d3fb6a33f..c196c5b46db 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java index e3c9fc1323e..2d2962bbb47 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DataOperationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java index f8c46896a45..3ea51e2f457 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DeviceAlertLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c48ce780814..7472c9fc80d 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java index cd9a691c2a0..39a7864f246 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentCompletion.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8dda9c06244..71ababa2232 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java index 0263ed2a244..8ae90bc5de6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3DocumentStorage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6778e6fa1eb..b75900608df 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java index f02066adf6e..aa461674b39 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EducationLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d5c891a8456..4d46e341dfa 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java index bd50794bd77..dc0c86b56c9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EmployeeJobClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5712e42359f..cce2fc49d27 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java index 4c020bc8eda..5baef77c520 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterAdmissionSource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 1f2ec84a705..b288ed1a77a 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java index af934516019..4fd4f6ebca7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EncounterSpecialCourtesy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 206687df7f7..624ff778f57 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java index c230578423c..a9a685c9b38 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java index 3fa63beeb19..6f8f4fecb0b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java index 96ca03c53e7..afe31d5edfb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java index c8dd56b5f2a..525a92672da 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java index d243b06a2fe..7b7accd9281 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityDeterminer.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8bdb140b504..ed0748fdefa 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java index 803993edbd4..8a76b108c68 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandling.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java index 1b4a5f44609..8663a06f882 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityHandlingEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java index ef8155d0b66..7b6d30a52b4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java index febf7e0b8d2..b7603068380 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java index 8165fb203a4..e9f95b28aae 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java index 2eb153b93d0..9f58c15c46b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartQualifierR2EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java index d3b7d8d7a79..f7232d704cd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 49520b7ede7..c3689e096a9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java index cddc76990a5..90bc8243a7a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNamePartTypeR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 8200bb9c6f2..4ca23f63ccd 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java index b0669269c49..5276ca1e72a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java index 8fcd183c85a..a1d37964a0f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java index 73555084eae..f5527ab6817 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java index 31e03271d4d..c1c9b59b981 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityNameUseR2EnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java index de094b6aeb0..78b5fabf6f2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityRisk.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 18c9212de99..1de5d23edda 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java index af29a2bd0b8..8de465d7320 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EntityStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 82682cd4e18..8ba2f75b318 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java index e0ee95e5178..4ea5603860e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EquipmentAlertLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f62f7d4f633..9284769052b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java index 7d6d3f0e2eb..b58149a3859 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Ethnicity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java index ff1246542c3..12ed82ad2a1 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3EthnicityEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java index 52e00df725e..f4313c1f6d9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ExposureMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c352e620130..e41f4b0cbfd 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java index a76e3b4a3f9..6efe048bf98 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java index 0dd63ff3d7a..6dae85f45eb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GTSAbbreviationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java index dc766ae7d9a..fc9b93c9278 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3GenderStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f96673dbabe..1b7cdd8064e 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java index 36434d8ebb8..db74eb48dec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java index f25ab6746a4..531b7de0216 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HL7UpdateModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java index 58b18e0d9ba..27a6d8abc85 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7Realm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java index fd5ea907306..a4188f3adf5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7RealmEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java index 1e299ef96a0..c01fa2277d0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Hl7V3Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 4c1cdb488dc..f0740ccb7e9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java index 13eb05a603b..8013aa11dc0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java index 4d9f5e63e68..d664cf4ae67 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3HtmlLinkTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java index 21da5018f9e..97eec98c779 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierReliability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f1f2681bd00..8e1da8f1180 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java index 10147d8ee4e..1c6cf70d227 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IdentifierScope.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a574a2bce54..7d2a5c30da0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java index bb42dea6e93..2672e954e82 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3IntegrityCheckAlgorithm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 3a5a556be4f..9445ce1690a 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java index 522f3157b82..99f26f53e00 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 454f0a22943..464ee11660c 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java index cf8c5bcca5d..44b52187023 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LanguageAbilityProficiency.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 00aef8b92b9..120203703de 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java index 81a7d0a36db..9a41d0a7a03 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java index 6fd94e5ab41..57d9e3b872f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LivingArrangementEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java index c49cfaa8fc2..311068bff63 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalMarkupIgnore.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 1d559e38c85..f79b1345968 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java index 5cf43110376..25035ca8c00 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3LocalRemoteControlState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 65d4462ca3d..b6f5af49e59 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java index 76531b3290e..a20845cc3a3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ManagedParticipationStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 167ae7cd226..5d08863ee04 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java index 27082eba97a..1231c95630c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MapRelationship.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9c10cccf8a6..3d688a9a136 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java index 95c7ff0f0c4..148db8a7aca 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MaritalStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index d5d49128dec..1fe8d8233bd 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java index f18fa773611..a0189f64b3f 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3MessageWaitingPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index b5b27b531e3..34252020a07 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java index 1ba1f60a897..d21c1f0c845 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ModifyIndicator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 3abec482998..d3611eb1226 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java index 37640e445f8..b4387c6ce39 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavor.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java index af0643e2246..2f93c149848 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3NullFlavorEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java index 81f9ccea8e0..108b23dc135 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java index ae7b8b71f65..f0d120753cd 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationInterpretationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java index 1e3074ab495..0178ff4a98a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethod.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java index c9a734ba809..12d55f8303d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationMethodEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java index 3b8b2437297..5af938664d0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java index 577c8a0e22b..7a0afe6c478 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ObservationValueEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java index 7244156c98c..9a7676264bb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugForm.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java index 52e6c4e2b47..0a46c02ad7c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3OrderableDrugFormEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java index d75b9d7a8b0..8929f7bc9e8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java index 1df8156529f..7147d68096d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationFunctionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java index 9b3f3ad8a8b..9533c923f34 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java index 9bd0c2bb4c6..d8f8c52b204 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationModeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java index 0d7b1d04801..26293535b46 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationSignature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f8a886e6a16..75751c29601 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java index 2dd8c153c6b..95929290182 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java index 5206fac633a..4ac76410ea3 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ParticipationTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java index 77ca9879792..2cac15413af 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PatientImportance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f58b67a09d0..9721d1c32ac 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java index 3a394ff9a2b..25ad879be07 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PaymentTerms.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index ce317841d84..8f32d03ab26 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java index aef3ac8dcc7..a6f26c94ad0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java index dda56d699d6..4df733861aa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3PersonDisabilityTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java index 0a599879689..30486aa5d54 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java index 7afbfb71275..9f149e91e29 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProbabilityDistributionTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java index 6b9a8dd5872..47389999eec 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingID.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9eb03bbef4b..cec6eff684f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java index 3e0abb642fd..92168677d00 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ProcessingMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 03fd73ff4f0..22ef0062d94 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java index f35fbe0a374..6be4a2d5a4d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java index eadad23f9e3..303a2e42f59 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryParameterValueEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java index 2a8aefe20e2..0e3e20a3cfb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryPriority.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 934621961c7..343f628d8c6 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java index 0ecfe1e0fb9..dde10f6b3d4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryRequestLimit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 36f3b6c3020..8dc29da04d0 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java index a0791f8b2b4..dcb3207dbcc 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 99f14a56437..24085c3456a 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java index 51e21f76f75..50f506d1c7a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3QueryStatusCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 2b14cd598a0..8e28e88b34f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java index 5b01dd1e771..dc3add141fe 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Race.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java index 0829b591a2b..35d4456721a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RaceEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java index c09f282384d..ab13c61a0ea 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationalOperator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index f64316cfeac..0c0e067bb57 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java index 9d8aa361eca..e7b23c4ceb0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RelationshipConjunction.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 497ac64e799..8241dc0892d 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java index 2d266a1365b..fbdbb5e8c55 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java index 4c8a2217676..3446ff3dd8a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ReligiousAffiliationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java index e2513a5f76f..40600592a54 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseLevel.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index dcdd28beec7..981d7411af8 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java index e7b86581c07..c47f6695ef7 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseModality.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6c56339bc64..a2e9b8b2ae5 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java index da375a606e1..872c0a385bf 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3ResponseMode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 44bff548c6b..b682345ce2b 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java index f4b825d7783..558262ad919 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClass.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java index 2a9dbed4a53..de7b43755d4 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleClassEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java index 0ba6721e4a4..d439fd0abfa 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java index 3d07af84c1e..2e3d561ceca 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleCodeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java index 0b5ea992cf6..a624750501a 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 6e2b8446129..ed84d8a2aa3 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java index 2eb0973d5c0..6bd737364e5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleLinkType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 38adda68216..16afbc7d3a9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java index 47c73d1489c..e2d5504e20c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RoleStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 5e71a592f41..19131392619 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java index 7570686d618..3435af7032e 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java index c40ec7556de..880f4dd5b45 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3RouteOfAdministrationEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java index 2f3f34d0d5d..47c802e407d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3Sequencing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 214764145e8..81044cb1726 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java index 7f0ea183bc7..7be2b0d4402 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SetOperator.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c9a174b40c5..ae5f9a700e9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java index 1a10506994d..69778306ce5 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java index 6298d88a1dc..04531b076ad 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SpecimenTypeEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java index c0956333aaa..55d858fbcd0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitution.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java index c164202e80a..2281638d07d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstanceAdminSubstitutionEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java index 8f25f96f2a7..9688f24e165 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3SubstitutionCondition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index b1ef985098b..1443a2aad73 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java index 2c87d9e05e6..a71f9a85f31 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellHorizontalAlign.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 9232e0cf2e5..442e5d2c177 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java index 7614ee3533c..159e1e5cb42 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellScope.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 62a6bddba1a..fe3e04d77de 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java index 3a6d0f2f16a..3a72a21e06d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableCellVerticalAlign.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 03e543a0725..cbb9c487f7d 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java index 31ccb6ecbb6..7c3f9771ae9 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableFrame.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 0681ea27e66..1b6b91ee46f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java index 17b93fb3a4b..cb01e02090c 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TableRules.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 344442aef2f..54cf167f005 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java index d273e327bfe..5d1a682c682 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TargetAwareness.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index a597b919f46..e98ba46ad9f 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java index 4a9f7c9b4e0..0677d041c10 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TelecommunicationCapabilities.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 69aedf6f385..7eec3d09f5d 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java index 7be2e2f2ca3..ec13cec63ea 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java index 17c67dd657c..587a6e598c6 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TimingEventEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java index f406af723cb..6ccff8f6f47 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TransmissionRelationshipTypeCode.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 686dcb22b5e..958a10a7aed 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java index d4d9ea1d57c..c9949f7916d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUS.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java index b8bcbc18d81..088c0dd714b 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3TribalEntityUSEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java index 92e5c6906b1..b2cde5698c2 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturer.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java index 9f30466ba04..8e35ded9a02 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/V3VaccineManufacturerEnumFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java index e5df0c7ca97..4e70d9162e8 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index e58cecb9a95..1f3e8d3dbb5 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java index 610a2214302..61505ac9efb 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VaccinationProtocolDoseStatusReason.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 063439a8109..c3a71b60f21 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java index 52530e444f3..7b0d39100d0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VariantState.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 3d3fbaa5215..8ea35c48737 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java index 5c0266d8701..e3e8a878ac0 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/VisionProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index c59955d20c0..a17f539f979 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java index 80ec0112326..d344f87b54d 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/valuesets/XdsRelationshipType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.exceptions.FHIRException; 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 index 424c491140d..85649131ec9 100644 --- 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model.valuesets; */ -// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 +// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 import org.hl7.fhir.dstu21.model.EnumFactory; diff --git a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java index e921148a3f9..ca55e3e0c45 100644 --- a/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java +++ b/hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/exceptions/FHIRException.java @@ -2,6 +2,8 @@ package org.hl7.fhir.exceptions; public class FHIRException extends Exception { + // Note that the 4-argument constructor has been removed as it is not JDK6 compatible + public FHIRException() { super(); } diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java new file mode 100644 index 00000000000..73831c1bf23 --- /dev/null +++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerUsingOldTypesDstu21Test.java @@ -0,0 +1,81 @@ +package ca.uhn.fhir.rest.server; + +import static org.junit.Assert.assertThat; +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.instance.model.api.IBaseResource; +import org.junit.Test; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.model.primitive.IntegerDt; +import ca.uhn.fhir.rest.annotation.IdParam; +import ca.uhn.fhir.rest.annotation.Operation; +import ca.uhn.fhir.rest.annotation.OperationParam; +import ca.uhn.fhir.rest.annotation.OptionalParam; +import ca.uhn.fhir.rest.annotation.Read; +import ca.uhn.fhir.rest.annotation.Search; + +public class ServerUsingOldTypesDstu21Test { + + private static FhirContext ourCtx = FhirContext.forDstu2_1(); + + @Test + public void testReadProvider() { + RestfulServer srv = new RestfulServer(ourCtx); + srv.setFhirContext(ourCtx); + srv.setResourceProviders(new ReadProvider()); + + try { + srv.init(); + fail(); + } catch (ServletException e) { + assertThat(e.getCause().toString(), StringContains.containsString("ConfigurationException")); + } + } + @Test + public void testOperationProvider() { + RestfulServer srv = new RestfulServer(ourCtx); + srv.setFhirContext(ourCtx); + srv.setResourceProviders(new OperationProvider()); + + try { + srv.init(); + fail(); + } catch (ServletException e) { + assertThat(e.getCause().toString(), StringContains.containsString("Incorrect use of type")); + } + } + + public static class ReadProvider implements IResourceProvider { + + @Override + public Class getResourceType() { + return Patient.class; + } + + @Read + public Patient opTypeRetOldBundle(@IdParam String theId) { + return null; + } + + } + + public static class OperationProvider implements IResourceProvider { + + @Override + public Class getResourceType() { + return Patient.class; + } + + @Operation(name="foo") + public Patient opTypeRetOldBundle(@OperationParam(name="foo") IntegerDt theId) { + return null; + } + + } + +} diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index df216e923bc..b67ebfc5afa 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -25,6 +25,7 @@ import java.util.Date; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.ConfigurationException; @@ -125,4 +126,9 @@ public class FhirDstu2 implements IFhirVersion { return new CodingDt(); } + @Override + public IIdType newIdType() { + return new IdDt(); + } + } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/FhirDstu2Hl7Org.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/FhirDstu2Hl7Org.java index c7002225e97..977886d96ec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/FhirDstu2Hl7Org.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/FhirDstu2Hl7Org.java @@ -27,10 +27,12 @@ import java.util.Date; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.conf.ServerConformanceProvider; import org.hl7.fhir.instance.conf.ServerProfileProvider; +import org.hl7.fhir.instance.model.IdType; import org.hl7.fhir.instance.model.Reference; import org.hl7.fhir.instance.model.Resource; import org.hl7.fhir.instance.model.StructureDefinition; import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; import ca.uhn.fhir.context.ConfigurationException; @@ -122,4 +124,9 @@ public class FhirDstu2Hl7Org implements IFhirVersion { return ((Resource)theResource).getMeta().getLastUpdatedElement(); } + @Override + public IIdType newIdType() { + return new IdType(); + } + } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java index ae3e3f64c41..b2a8423dbbd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java index d7645e09d01..b2c5820c5ae 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java @@ -30,15 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java index 4d0dee6d22c..118f4bd9fbb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java index d0d39a54974..42cf2ebe013 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java index 701778c6d4c..790b30dace4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java @@ -30,15 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A text note which also contains information about who made the statement and when. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java index 85ed44cab72..26d377a11bb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java index aaacdd6579c..7305611b83f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java index 36abda730c5..eda4c7d38eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * For referring to data content defined in other formats. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java index 2ddd8842ba2..b60cd55e3a1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java index 6023b56e14a..c8720d2d9dd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java @@ -30,14 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * Base definition for all elements that are defined inside a resource - but not those in a data type. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base64BinaryType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base64BinaryType.java index 5376b1cf323..105d563df64 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base64BinaryType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base64BinaryType.java @@ -29,7 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. package org.hl7.fhir.instance.model; import org.apache.commons.codec.binary.Base64; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "base64Binary" in FHIR: a sequence of bytes represented in base64 diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java index d6aad15ff23..43ff9a77f6d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java @@ -30,15 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java index d4ff95e798b..fea860d817a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java @@ -30,17 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBinary; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A binary resource can contain any content, whether text, image, pdf, zip archive, etc. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java index dd0475abb0b..5d026c6abf6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BooleanType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BooleanType.java index 64c4d76f7a7..ff47c923397 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BooleanType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BooleanType.java @@ -31,9 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + /** * Primitive type "boolean" in FHIR "true" or "false" */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java index aaf9cd102ac..8b41b562844 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,17 +32,19 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A container for a collection of resources. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java index 83e099c1fbc..9a20a470257 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java index 1a3d0643c6e..06e1fc075b3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,18 +32,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java index ccab2edfc06..387cbfc1800 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,18 +32,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides the adjudication details from the processing of a Claim resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java index 2f986df9722..dd18db6b224 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeType.java index fdec7a60671..bbc1285acf7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeType.java @@ -30,7 +30,7 @@ package org.hl7.fhir.instance.model; import static org.apache.commons.lang3.StringUtils.defaultString; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "code" in FHIR, when not bound to an enumerated list of codes diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java index b2fbe0c851c..2df32d094ff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java @@ -30,15 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java index bff504f9972..56d6feb8cc5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java @@ -30,15 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseCoding; +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A reference to a code defined by a terminology system. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java index 36ef11facaa..e1fd8ea72fb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java index f1f89355a9f..60d88d4aef3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java index deff4387d3f..2ce6fe0325d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java index 4f0b74d90d9..288439b2a11 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java @@ -30,17 +30,22 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConceptMapEquivalence; +import org.hl7.fhir.instance.model.Enumerations.ConceptMapEquivalenceEnumFactory; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java index fd146832fd1..0aac66138fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java index ae0a39c84f8..3095725f2d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java @@ -30,17 +30,23 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.Enumerations.SearchParamType; +import org.hl7.fhir.instance.model.Enumerations.SearchParamTypeEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import org.hl7.fhir.instance.model.api.IBaseConformance; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java index 411d3aae45a..01a9ab4b30c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java @@ -30,15 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * Details for all kinds of technology mediated contact points for a person or organization, including telephone, email, etc. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java index e7ce3c22bf9..a61d49f5fb9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,17 +32,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A formal agreement between parties regarding the conduct of business, exchange of information or other matters. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java index 0ab9dbc7219..f9dbf99a1d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java index a570f46e39f..99c4126fddd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Financial instrument which may be used to pay for or reimburse health care products and services. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java index 86f2571fd66..bb04d41f6c2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * The formal description of a single piece of information that can be gathered and reported. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateTimeType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateTimeType.java index 9c50d3f6026..c499edd1035 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateTimeType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateTimeType.java @@ -35,7 +35,8 @@ import java.util.TimeZone; import java.util.zip.DataFormatException; import org.apache.commons.lang3.time.DateUtils; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Represents a FHIR dateTime datatype. Valid precisions values for this type are: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateType.java index 3eb28a0a63a..37245ede8f5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DateType.java @@ -36,7 +36,7 @@ package org.hl7.fhir.instance.model; import java.util.Date; import java.util.TimeZone; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Represents a FHIR date datatype. Valid precisions values for this type are: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DecimalType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DecimalType.java index 4ef05f17614..cb4588a6422 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DecimalType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DecimalType.java @@ -35,9 +35,10 @@ import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseDecimalDatatype; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + /** * Primitive type "decimal" in FHIR: A rational number */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java index dab75083413..47c9ef91d5a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java index ade760a8a41..1e70b3efb87 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java index ee9b87e459d..9cb781f41e0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Describes the characteristics, operational status and capabilities of a medical-related component of a medical device. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java index 8928241b1ab..21a8fb5890c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Describes a measurement, calculation or setting capability of a medical device. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java index 10aa876abaf..ade489a5bdd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java index e7253e42807..1342048ee24 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java index 7c418fec087..cc82f70b0a8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A record of a request for a diagnostic investigation service to be performed. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java index 7e70d6f4411..1e3129b60a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java index 4826166a72e..b347b685e82 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java index 94a1b2f85c7..172808b44fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java @@ -30,17 +30,21 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatus; +import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A manifest that defines a set of documents. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java index 51a272dac83..a7c2db39c73 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatus; +import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A reference to a document . */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java index 1a201207147..98dad3a5fe4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java @@ -30,15 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; +import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions; +import org.hl7.fhir.instance.model.api.IDomainResource; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; /** * A resource that includes narrative, extensions, and contained resources. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java index 0edeae8c123..03a00b0fc21 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java index 8f207122a6d..c30cf6ca531 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java @@ -30,15 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; /** * Base definition for all elements in a resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java index dd5627caf9f..7c90284aab9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java @@ -30,16 +30,19 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.BindingStrength; +import org.hl7.fhir.instance.model.Enumerations.BindingStrengthEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseDatatypeElement; +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * Captures constraints on each element within the resource, profile, or extension. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java index 0a05a58e88d..34328deb8a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java index 79183e9a7b5..cf54edae146 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides eligibility and plan details from the processing of an Eligibility resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java index d98cccee319..98abac1d1ca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java index e8c1e4fd211..dd16dc21b18 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides the insurance enrollment details to the insurer regarding a specified coverage. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java index 0f374ad9a90..2055800c32d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides enrollment and plan details from the processing of an Enrollment resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumeration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumeration.java index 87629af3263..fbfeb64ec1f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumeration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumeration.java @@ -1,8 +1,9 @@ package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseEnumeration; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + /* Copyright (c) 2011+, HL7, Inc All rights reserved. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java index 750c5bc849b..b48ae7eeaff 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java @@ -1,39 +1,5 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - - -import org.hl7.fhir.instance.model.api.*; - public class Enumerations { // In here: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java index f305e564db5..bfc0e7f6637 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java index b5c789d7c0a..7dd211b16f9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java index bc8c7291dc6..5f831e91d90 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java @@ -30,15 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseExtension; +import org.hl7.fhir.instance.model.api.IBaseHasExtensions; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * Optional Extensions Element - found in all resources. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java index 98f6351b7ad..806bec95525 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Significant health events and conditions for a person related to the patient relevant in the context of care for the patient. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java index 10186d98a73..e356e716bd6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java @@ -30,16 +30,13 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Prospective warnings of potential issues when providing care to the patient. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java index 47332a29b42..5e0566d488a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Describes the intended objective(s) for a patient, group or organization care, for example, weight loss, restoring an activity of daily living, obtaining herd immunity via immunization, meeting a process improvement objective, etc. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java index c40ae131d03..6169816bb5b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Represents a defined collection of entities that may be discussed or acted upon collectively but which are not expected to act collectively and are not formally or legally recognized; i.e. a collection of entities that isn't an Organization. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java index dab64b2d0ca..c81851a39c0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * The details of a healthcare service available at a location. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java index 651a7813344..a28978830e4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java @@ -30,15 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A human's name with the ability to identify parts and usage. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java index 197858d6f93..924d4387b93 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java @@ -39,11 +39,12 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IPrimitiveType; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + /** * This class represents the logical identity for a resource, or as much of that * identity is known. In FHIR, every resource must have a "logical ID" which is @@ -729,4 +730,24 @@ public final class IdType extends UriType implements IPrimitiveType, IId return theIdPart.toString(); } + public IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart) { + if (isNotBlank(theVersionIdPart)) { + Validate.notBlank(theResourceType, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + Validate.notBlank(theIdPart, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated"); + } + if (isNotBlank(theBaseUrl) && isNotBlank(theIdPart)) { + Validate.notBlank(theResourceType, "If theBaseUrl is populated and theIdPart is populated, theResourceType must be populated"); + } + + setValue(null); + + myBaseUrl = theBaseUrl; + myResourceType = theResourceType; + myUnqualifiedId = theIdPart; + myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionIdPart, null); + myHaveComponentParts = true; + + return this; + } + } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java index c049775de56..e933840e111 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A technical identifier - identifies some entity uniquely and unambiguously. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java index aef206da28c..b3eb65b0a96 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A manifest of a set of DICOM Service-Object Pair Instances (SOP Instances). The referenced SOP Instances (images or other content) are for a single patient, and may be from one or more studies. The referenced SOP Instances have been selected for a purpose, such as quality assurance, conference, or consult. Reflecting that range of purposes, typical ImagingObjectSelection resources may include all SOP Instances in a study (perhaps for sharing through a Health Information Exchange); key images from multiple studies (for reference by a referring or treating physician); a multi-frame ultrasound instance ("cine" video clip) and a set of measurements taken from that instance (for inclusion in a teaching file); and so on. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java index 529e161470d..4048c7c00f6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Representation of the content produced in a DICOM imaging study. A study comprises a set of series, each of which includes a set of Service-Object Pair Instances (SOP Instances - images or other data) acquired or produced in a common context. A series is of only one modality (e.g. X-ray, CT, MR, ultrasound), but a study may have multiple series of different modalities. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java index 17e03b3bc0e..36cb5291d27 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Describes the event of a patient being administered a vaccination or a record of a vaccination as reported by a patient, a clinician or another party and may include vaccine reaction information and what vaccination protocol was followed. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java index 2dfa8daf2ff..f51967efb00 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A patient's point-in-time immunization and recommendation (i.e. forecasting a patient's immunization eligibility according to a published schedule) with optional supporting justification. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java index c2a12f895b1..a5d44dd7a3a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A set of rules or how FHIR is used to solve a particular problem. This resource is used to gather all the parts of an implementation guide into a logical whole, and to publish a computable definition of all the parts. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/InstantType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/InstantType.java index e8e816889a4..219cf552243 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/InstantType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/InstantType.java @@ -36,7 +36,7 @@ import java.util.Date; import java.util.TimeZone; import java.util.zip.DataFormatException; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Represents a FHIR instant datatype. Valid precisions values for this type are: diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IntegerType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IntegerType.java index 8410a0f2fbb..d5a2421c40f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IntegerType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IntegerType.java @@ -31,9 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseIntegerDatatype; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + /** * Primitive type "integer" in FHIR: A signed 32-bit integer */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java index 84a706b77f8..1490a519a1b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A set of information summarized from a list of other resources. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java index 5bb49eff2f4..ff28368be67 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,17 +32,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Details and position information for a physical place where services are provided and resources and participants may be stored, found, contained or accommodated. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MarkdownType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MarkdownType.java index c733077ad95..79d12aaad4b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MarkdownType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MarkdownType.java @@ -30,7 +30,7 @@ package org.hl7.fhir.instance.model; import static org.apache.commons.lang3.StringUtils.defaultString; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "code" in FHIR, when not bound to an enumerated list of codes diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java index c43923dc110..98fb0e3cc3e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A photo, video, or audio recording acquired or used in healthcare. The actual content may be inline or provided by direct reference. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java index 348a92198b2..b0dabf8e866 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource is primarily used for the identification and definition of a medication. It covers the ingredients and the packaging for a medication. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java index be2c0ad7882..e5e33b6e3e3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java index 67ec3a2391b..146826b5ff7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Indicates that a medication product is to be or has been dispensed for a named person/patient. This includes a description of the medication product (supply) provided and the instructions for administering the medication. The medication dispense is the result of a pharmacy system responding to a medication order. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java index c8e21f790c8..cc58c029f98 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * An order for both supply of the medication and the instructions for administration of the medication to a patient. The resource is called "MedicationOrder" rather than "MedicationPrescription" to generalize the use across inpatient and outpatient settings as well as for care plans, etc. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java index 15d047e92ad..8fe954754ed 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A record of a medication that is being consumed by a patient. A MedicationStatement may indicate that the patient may be taking the medication now, or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from e.g. the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains The primary difference between a medication statement and a medication administration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medication statement is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the medication statement information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java index f6549c19004..b8242890d5e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * The header for a message exchange that is either requesting or responding to an action. The reference(s) that are the subject of the action as well as other information related to the action are typically transmitted in a bundle in which the MessageHeader resource instance is the first resource in the bundle. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java index 9c9786d82c1..1a6fb8d8ca3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java @@ -34,11 +34,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.api.IBaseMetaType; import org.hl7.fhir.utilities.Utilities; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * The metadata about a resource. This is content in the resource that is maintained by the infrastructure. Changes to the content may not always be associated with version changes to the resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java index f84fc653f10..bed7784de02 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java index 9cfc3b09b34..29179f9d946 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A curated namespace that issues unique symbols within that namespace for the identification of concepts, people, devices, etc. Represents a "System" used within the Identifier and Coding data types. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java index 3d7a8317af0..8fe07d0a5fb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.INarrative; import org.hl7.fhir.utilities.xhtml.XhtmlNode; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A human-readable formatted text, including images. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java index 7751eac816b..ea8d43d4d8b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A request to supply a diet, formula feeding (enteral) or oral nutritional supplement to a patient/resident. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java index fe362b51b7b..119f4cb8935 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Measurements and simple assertions made about a patient, device or other subject. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OidType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OidType.java index 1e4a1e2143a..81d6b606400 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OidType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OidType.java @@ -30,7 +30,7 @@ package org.hl7.fhir.instance.model; import java.net.URI; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "oid" in FHIR: an OID represented as urn:oid:0.1.2.3.4... diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java index 4a9478fd2be..99302c03ed0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java @@ -30,17 +30,22 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.BindingStrength; +import org.hl7.fhir.instance.model.Enumerations.BindingStrengthEnumFactory; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A formal computable definition of an operation (on the RESTful interface) or a named query (using the search interaction). */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java index ec2508d9c42..fc8a439ea08 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; /** * A collection of error, warning or information messages that result from a system action. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java index a65be6d9664..9d52b5ada72 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java @@ -30,15 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A request to perform an action. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java index aa67e55bd46..f966680aace 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A response to an order. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java index 7d5ce7a2197..d3844f5ea4c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, etc. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java index da45f2c0bd1..91f63860c4c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import org.hl7.fhir.instance.model.api.IBaseParameters; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; /** * This special resource type is used to represent an operation request and response (operations.html). It has no other use, and there is no RESTful endpoint associated with it. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java index 7d524d5ccec..3dc49e7620f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java @@ -30,17 +30,19 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Demographics and other administrative information about an individual or animal receiving care or other health-related services. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java index b648747602b..e29f88ead27 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides the status of the payment for goods and services rendered, and the request and response resource references. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java index a44f72f4e15..17d5f55a672 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; +import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides payment details and claim references supporting a bulk payment. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java index cbe209be53d..eb3055780a9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java @@ -30,14 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A time period defined by a start and end date and optionally time. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java index 6557a6e65ac..58af6e03a4e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java @@ -30,17 +30,19 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Demographics and administrative information about a person independent of a specific health-related context. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PositiveIntType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PositiveIntType.java index 74a481c1d2b..fb3b0a25266 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PositiveIntType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PositiveIntType.java @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "integer" in FHIR: A signed 32-bit integer diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java index 66c0f759b28..a4fe6960a52 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java @@ -30,17 +30,19 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A person who is directly or indirectly involved in the provisioning of healthcare. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java index 39153ca34b8..ec657ca5b23 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * An action that is or was performed on a patient. This can be a physical intervention like an operation, or less invasive like counseling or hypnotherapy. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java index 3672e08bfb3..4d679c7c6ca 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A request for a procedure to be performed. May be a proposal or an order. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java index 14ff442ee62..fe81af23eea 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides the target, request and response, and action details for an action to be performed by the target on or about existing resources. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java index 197615af4f2..0e02bf2c6f9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * This resource provides processing status, errors and notes from the processing of a resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java index d20f43e6976..1a09a62c0a8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g. Document Completion - has the artifact been legally authenticated), all of which may impact security, privacy, and trust policies. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java index c32feb79d43..ee69dfde909 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,16 +32,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java index e287d645c15..c1afc63f40a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java @@ -30,17 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A structured set of questions intended to guide the collection of answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java index 15faa435fe0..acd85249a81 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A structured set of questions and their answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java index 6c5d672c6de..5a47b4c3153 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java @@ -30,14 +30,13 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A set of ordered Quantities defined by a low and high limit. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java index bff99c7e04d..a35afdaf091 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java @@ -30,14 +30,13 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A relationship of two Quantity values - expressed as a numerator and a denominator. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java index 6a6be8c0838..1a83c4dd6a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java @@ -30,15 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IAnyResource; +import org.hl7.fhir.instance.model.api.IBaseReference; +import org.hl7.fhir.instance.model.api.ICompositeType; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A reference from one resource to another. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java index c9302c4ede3..6bf44efa796 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Used to record and send details about a request for referral service or transfer of a patient to the care of another provider or provider organization. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java index b54317d4d39..74b796f2c7b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java @@ -30,17 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; +import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Information about a person that is involved in the care for a patient, but who is not the target of healthcare, nor has a formal responsibility in the care process. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java index 940258c5cd8..ec2f3caa42f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java @@ -30,17 +30,13 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; /** * This is the base resource type for everything. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java index 0049d09e892..acf07972f7e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,17 +32,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * An assessment of the likely outcome(s) for a patient or other subject as well as the likelihood of each outcome. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java index d3c63aa4390..20a4dcaa6a6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,16 +32,13 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import java.math.*; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A series of measurements taken by a device, with upper and lower limits. There may be more than one dimension in the data. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java index df6b53a5015..7f089e03433 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A container for slot(s) of time that may be available for booking appointments. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java index 4bb4e6095dc..9dfb294ee8a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java @@ -30,17 +30,22 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.Enumerations.SearchParamType; +import org.hl7.fhir.instance.model.Enumerations.SearchParamTypeEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A search parameter that defines a named search item that can be used to search/filter on a resource. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java index 70c9353389b..f771540fe25 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java @@ -30,16 +30,15 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * A digital signature along with supporting context. The signature may be electronic/cryptographic in nature, or a graphical image representing a hand-written signature, or a signature process. Different Signature approaches have different utilities. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java index 5e83f504686..250e0b768b9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SimpleQuantity.java @@ -1,39 +1,6 @@ package org.hl7.fhir.instance.model; -/* - 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 Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * 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-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java index ff47923c12a..ea8e387bab6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java @@ -30,16 +30,16 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 - -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A slot of time on a schedule that may be available for booking appointments. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java index 1f70a373ee5..ff631325b12 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A sample to be used for analysis. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java index 80fb4ade02f..4f9ff2a4253 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java @@ -29,7 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. package org.hl7.fhir.instance.model; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java index c49e12733a9..37a4cbaf618 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A definition of a FHIR structure. This resource is used to describe the underlying resources, data types defined in FHIR, and also for describing extensions, and constraints on resources and data types. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java index cfac9064e63..7a7fb072c92 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * The subscription resource is used to define a push based subscription from a server to another system. Once a subscription is registered with the server, the server checks every resource that is created or updated, and if the resource matches the given criteria, it sends a message on the defined "channel" so that another system is able to take an appropriate action. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java index a39704d1750..d953cb36443 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java @@ -30,16 +30,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A homogeneous material with a definite composition. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java index 1c9161f781e..dca49a6ee07 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java @@ -30,16 +30,14 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * Record of delivery of what is supplied. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java index 4629a0eacbb..40fa4976e09 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java @@ -30,16 +30,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A record of a request for a medication, substance or device used in the healthcare setting. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java index e67b368ce35..351112a1f7e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * TestScript is a resource that specifies a suite of tests against a FHIR server implementation to determine compliance against the FHIR specification. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TimeType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TimeType.java index 0ab9c9d254f..4d89099f3d6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TimeType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TimeType.java @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Represents a Time datatype, per the FHIR specification. A time is a specification of hours and minutes (and optionally milliseconds), with NO date and NO timezone information attached. It is diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java index cad9d251867..19ce9b29aec 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,16 +32,17 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; +import org.hl7.fhir.instance.model.api.IBaseDatatypeElement; +import org.hl7.fhir.instance.model.api.ICompositeType; -import java.math.*; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; /** * Specifies an event that may occur multiple times. Timing schedules are used to record when things are expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UnsignedIntType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UnsignedIntType.java index 0a0395ac6f8..ec75db5c3ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UnsignedIntType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UnsignedIntType.java @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ package org.hl7.fhir.instance.model; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "integer" in FHIR: A signed 32-bit integer diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UriType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UriType.java index d8dd929eb51..4738d7c71a3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UriType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/UriType.java @@ -32,7 +32,8 @@ import java.net.URI; import java.net.URISyntaxException; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; + +import ca.uhn.fhir.model.api.annotation.DatatypeDef; /** * Primitive type "uri" in FHIR: any valid URI. Sometimes constrained to be only an absolute URI, and sometimes constrained to be a literal reference diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java index adef4bb381d..60ff3f3c9fe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java @@ -30,17 +30,20 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; +import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.Enumerations.*; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * A value set specifies a set of codes drawn from one or more code systems. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java index 7ff67a8518c..a725be13e76 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java @@ -1,5 +1,7 @@ package org.hl7.fhir.instance.model; +import java.math.BigDecimal; + /* Copyright (c) 2011+, HL7, Inc. All rights reserved. @@ -30,17 +32,18 @@ package org.hl7.fhir.instance.model; */ // Generated on Wed, Nov 11, 2015 10:54-0500 for FHIR v1.0.2 +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import java.util.*; - -import java.math.*; +import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.instance.model.annotations.ResourceDef; -import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.api.*; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; /** * An authorization for the supply of glasses and/or contact lenses to a patient. */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Block.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Block.java deleted file mode 100644 index d5c8d173bf0..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Block.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Class annotation used to indicate a class which is a "block"/"component" type. A block - * is a nested group of fields within a resource definition and can contain other blocks as - * well as data types. - *

- * An example of a block would be Patient.contact - *

- */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface Block { - - /** - * @deprecated Do not use, will be removed - */ - @Deprecated - String name() default ""; - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Child.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Child.java deleted file mode 100644 index ed57472d8c5..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Child.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hl7.fhir.instance.model.Enumeration; -import org.hl7.fhir.instance.model.api.IBase; -import org.hl7.fhir.instance.model.api.IBaseEnumFactory; - -/** - * Field annotation for fields within resource and datatype definitions, indicating - * a child of that type. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.FIELD}) -public @interface Child { - - /** - * Constant value to supply for {@link #order()} when the order is defined - * elsewhere - */ - int ORDER_UNKNOWN = -1; - - /** - * Constant value to supply for {@link #max()} to indicate '*' (no maximum) - */ - int MAX_UNLIMITED = -1; - - /** - * Constant value to supply for {@link #order()} to indicate that this child should replace the - * entry in the superclass with the same name (and take its {@link Child#order() order} value - * in the process). This is useful if you wish to redefine an existing field in a resource/type - * definition in order to constrain/extend it. - */ - int REPLACE_PARENT = -2; - - /** - * The name of this field, as it will appear in serialized versions of the message - */ - String name(); - - /** - * The order in which this field comes within its parent. The first field should have a - * value of 0, the second a value of 1, etc. - */ - int order() default ORDER_UNKNOWN; - - /** - * The minimum number of repetitions allowed for this child - */ - int min() default 0; - - /** - * The maximum number of repetitions allowed for this child. Should be - * set to {@link #MAX_UNLIMITED} if there is no limit to the number of - * repetitions. - */ - int max() default 1; - - /** - * Lists the allowable types for this field, if the field supports multiple - * types (otherwise does not need to be populated). - *

- * For example, if this field supports either DateTimeDt or BooleanDt types, - * those two classes should be supplied here. - *

- */ - Class[] type() default {}; - - /** - * For children which accept an {@link Enumeration} as the type, this - * field indicates the type to use for the enum factory - */ - Class> enumFactory() default NoEnumFactory.class; - - /** - * Is this element a modifier? - */ - boolean modifier() default false; - - /** - * Should this element be included in the summary view - */ - boolean summary() default false; - - // Not implemented -// /** -// * This value is used when extending a built-in model class and defining a -// * field to replace a field within the built-in class. For example, the {@link Patient} -// * resource has a {@link Patient#getName() name} field, but if you wanted to extend Patient and -// * provide your own implementation of {@link HumanNameDt} (most likely your own subclass of -// * HumanNameDt which adds extensions of your choosing) you could do that using a replacement field. -// */ -// String replaces() default ""; - - public static class NoEnumFactory implements IBaseEnumFactory> { - - private NoEnumFactory() { - // non instantiable - } - - @Override - public Enum fromCode(String theCodeString) throws IllegalArgumentException { - return null; - } - - @Override - public String toCode(Enum theCode) { - return null; - } - - } - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/DatatypeDef.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/DatatypeDef.java deleted file mode 100644 index b52310f5daa..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/DatatypeDef.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hl7.fhir.instance.model.api.IBaseDatatype; - -/** - * Class annotation to note a class which defines a datatype - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface DatatypeDef { - - /** - * The defined name of this datatype - */ - String name(); - - /** - * Set this to true (default is false) for any types that are - * really only a specialization of another type. For example, - * {@link BoundCodeDt} is really just a specific type of - * {@link CodeDt} and not a separate datatype, so it should - * have this set to true. - */ - boolean isSpecialization() default false; - - /** - * Indicates that this datatype is a profile of the given datatype, which - * implies certain parsing/encoding rules (e.g. a choice element named - * foo[x] which allows a Markdown value will still be encoded as - * fooString because Markdown is a profile of string. - */ - Class profileOf() default IBaseDatatype.class; - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Description.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Description.java deleted file mode 100644 index 34e55b7ec2b..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Description.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Annotation which may be placed on a resource/datatype definition, or a field, or - * a search parameter definition in order to provide documentation for that item. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER, ElementType.METHOD}) -public @interface Description { - - /** - * Optional short name for this child - */ - String shortDefinition() default ""; - - /** - * Optional formal definition for this child - */ - String formalDefinition() default ""; - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Extension.java deleted file mode 100644 index 5039f1ade52..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/Extension.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Field modifier to be placed on a child field (a field also annotated with the {@link Child} annotation) which - * indicates that this field is an extension. - */ -@Target(value = { ElementType.FIELD }) -@Retention(RetentionPolicy.RUNTIME) -public @interface Extension { - - /** - * This parameter affects how the extension is treated when the element definition containing this resource is - * exported to a profile. - * - *

- * If set to true, the resource is taken to be a local resource and its definition is exported - * along with the reference. Use this option for extension defintions that you have added locally (i.e. within your - * own organization) - *

- * - *

- * If set to false, the resource is taken to be a remote resource and its definition is - * not exported to the profile. Use this option for extensions that are defined by other organizations (i.e. - * by regional authorities or jurisdictional governments) - *

- */ - boolean definedLocally(); - - /** - * Returns true if this extension is a modifier extension - */ - boolean isModifier(); - - /** - * The URL associated with this extension - */ - String url(); - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/ResourceDef.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/ResourceDef.java deleted file mode 100644 index ad1fa7cb896..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/ResourceDef.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Class annotation which indicates a resource definition class - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.TYPE}) -public @interface ResourceDef { - - /** - * The name of the resource (e.g. "Patient" or "DiagnosticReport"). If you are defining your - * own custom extension to a built-in FHIR resource definition type (e.g. you are extending - * the built-in Patient class) you do not need to supply a value for this property, as it - * will be inferred from the parent class. - */ - String name() default ""; - - /** - * if set, will be used as the id for any profiles generated for this resource. This property - * should be set for custom profile definition classes, and will be used as the resource ID - * for the generated profile exported by the server. For example, if you set this value to - * "hello" on a custom resource class, your server will automatically export a profile with the - * identity: http://localhost:8080/fhir/Profile/hello (the base URL will be whatever - * your server uses, not necessarily "http://localhost:8080/fhir") - */ - String id() default ""; - - /** - * The URL indicating the profile for this resource definition, if known. If this value is set - * on a custom profile definition class in a server, the profile is assumed to be external to - * the server, so the server will not export a profile for it. - */ - String profile() default ""; - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/SearchParamDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/SearchParamDefinition.java deleted file mode 100644 index c459ff297f3..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/annotations/SearchParamDefinition.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.hl7.fhir.instance.model.annotations; - -/* - * #%L - * HAPI FHIR Structures - HL7.org DSTU2 - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/* -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. - -*/ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(value=ElementType.FIELD) -@Retention(RetentionPolicy.RUNTIME) -public @interface SearchParamDefinition { - - /** - * The name for this parameter - */ - String name(); - - /** - * The path for this parameter - */ - String path(); - - /** - * A description of this parameter - */ - String description() default ""; - - /** - * The type for this parameter, e.g. "string", or "token" - */ - String type() default "string"; - - /** - * If the parameter is of type "composite", this parameter lists the names of the parameters - * which this parameter is a composite of. E.g. "name-value-token" is a composite of "name" and "value-token". - *

- * If the parameter is not a composite, this parameter must be empty - *

- */ - String[] compositeOf() default {}; - -} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java index d903b11d35f..080064ee9ed 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java @@ -55,10 +55,11 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IBaseXhtml; import org.hl7.fhir.instance.model.api.IPrimitiveType; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; + @DatatypeDef(name="xhtml") public class XhtmlNode implements IBaseXhtml { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java index a207c0ebe0a..cdf7e286711 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java @@ -35,9 +35,6 @@ import org.hl7.fhir.instance.model.Resource; import org.hl7.fhir.instance.model.StringType; import org.hl7.fhir.instance.model.Timing; import org.hl7.fhir.instance.model.Type; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.DatatypeDef; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; @@ -69,6 +66,9 @@ import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.RuntimePrimitiveDatatypeDefinition; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; public class ModelInheritanceTest { /* @@ -224,7 +224,7 @@ public class ModelInheritanceTest { public void testIdentifierUse() throws Exception { Child child = Identifier.class.getField("use").getAnnotation(Child.class); - assertEquals(IdentifierUseEnumFactory.class, child.enumFactory()); +// assertEquals(IdentifierUseEnumFactory.class, child.enumFactory()); } public void testIdType() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java index 838af9e2c89..eb4fceb8a39 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java @@ -1,7 +1,16 @@ package ca.uhn.fhir.parser; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.stringContainsInOrder; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.OutputStreamWriter; @@ -43,8 +52,6 @@ import org.hl7.fhir.instance.model.StringType; import org.hl7.fhir.instance.model.ValueSet; import org.hl7.fhir.instance.model.ValueSet.ConceptDefinitionComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetCodeSystemComponent; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -54,6 +61,8 @@ import org.xml.sax.SAXException; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.TagList; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.base.composite.BaseNarrativeDt; import ca.uhn.fhir.narrative.INarrativeGenerator; import ca.uhn.fhir.rest.server.Constants; @@ -1262,7 +1271,7 @@ public class JsonParserHl7OrgTest { private static final long serialVersionUID = 1L; @Child(order = 0, name = "foo") - @org.hl7.fhir.instance.model.annotations.Extension(url = "urn:foo", definedLocally = true, isModifier = false) + @ca.uhn.fhir.model.api.annotation.Extension(url = "urn:foo", definedLocally = true, isModifier = false) private Address myFoo; public Address getFoo() { @@ -1281,7 +1290,7 @@ public class JsonParserHl7OrgTest { private static final long serialVersionUID = 1L; @Child(order = 0, name = "foo") - @org.hl7.fhir.instance.model.annotations.Extension(url = "urn:foo", definedLocally = true, isModifier = false) + @ca.uhn.fhir.model.api.annotation.Extension(url = "urn:foo", definedLocally = true, isModifier = false) private Enumeration myFoo; public Enumeration getFoo() { @@ -1300,7 +1309,7 @@ public class JsonParserHl7OrgTest { private static final long serialVersionUID = 1L; @Child(order = 0, name = "foo") - @org.hl7.fhir.instance.model.annotations.Extension(url = "urn:foo", definedLocally = true, isModifier = false) + @ca.uhn.fhir.model.api.annotation.Extension(url = "urn:foo", definedLocally = true, isModifier = false) private Reference myFoo; public Reference getFoo() { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyObservationWithExtensions.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyObservationWithExtensions.java index 9a9d2820abd..21a9f24b21e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyObservationWithExtensions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyObservationWithExtensions.java @@ -5,12 +5,12 @@ import org.hl7.fhir.instance.model.BackboneElement; import org.hl7.fhir.instance.model.DateType; import org.hl7.fhir.instance.model.Patient; import org.hl7.fhir.instance.model.StringType; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Extension; -import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Extension; +import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.util.ElementUtil; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyOrganizationDstu2.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyOrganizationDstu2.java index 29bfafe1349..c59625ee973 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyOrganizationDstu2.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyOrganizationDstu2.java @@ -1,7 +1,8 @@ package ca.uhn.fhir.parser; import org.hl7.fhir.instance.model.Organization; -import org.hl7.fhir.instance.model.annotations.ResourceDef; + +import ca.uhn.fhir.model.api.annotation.ResourceDef; @ResourceDef() public class MyOrganizationDstu2 extends Organization { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyPatientHl7Org.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyPatientHl7Org.java index 4e5aa27dc5d..6ef74ecf63b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyPatientHl7Org.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/MyPatientHl7Org.java @@ -7,10 +7,11 @@ import org.hl7.fhir.instance.model.DateTimeType; import org.hl7.fhir.instance.model.Patient; import org.hl7.fhir.instance.model.Reference; import org.hl7.fhir.instance.model.StringType; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Extension; -import org.hl7.fhir.instance.model.annotations.ResourceDef; + +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.Extension; +import ca.uhn.fhir.model.api.annotation.ResourceDef; @ResourceDef() diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/ResourceWithExtensionsA.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/ResourceWithExtensionsA.java index a152daa7a27..a2ac0b89096 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/ResourceWithExtensionsA.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/ResourceWithExtensionsA.java @@ -9,11 +9,12 @@ import org.hl7.fhir.instance.model.Identifier; import org.hl7.fhir.instance.model.Resource; import org.hl7.fhir.instance.model.ResourceType; import org.hl7.fhir.instance.model.StringType; -import org.hl7.fhir.instance.model.annotations.Block; -import org.hl7.fhir.instance.model.annotations.Child; -import org.hl7.fhir.instance.model.annotations.Description; -import org.hl7.fhir.instance.model.annotations.Extension; -import org.hl7.fhir.instance.model.annotations.ResourceDef; + +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.Extension; +import ca.uhn.fhir.model.api.annotation.ResourceDef; @ResourceDef(name = "ResourceWithExtensionsA", id="0001") public class ResourceWithExtensionsA extends Resource { 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-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/valueset.profile.xml index 6c107f83160..47697ec190a 100644 --- 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-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/profile/valueset.profile.xml @@ -1348,7 +1348,7 @@ - + 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-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-single.xsd index ef914b51499..d33b0d9d594 100644 --- 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-dstu2.1/src/main/resources/org/hl7/fhir/instance/model/dstu21/schema/fhir-single.xsd @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. - Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0 + Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0 --> diff --git a/hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml b/hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml new file mode 100644 index 00000000000..456689528ae --- /dev/null +++ b/hapi-tinder-plugin/src/main/resources/res/dstu21/guidancerequest-spreadsheet.xml @@ -0,0 +1,7344 @@ + + + + + Grahame + Bryn + 2012-03-19T11:12:07Z + 2015-11-19T16:58:48Z + 15.00 + + + bbe84aa9-eb84-4499-9ec0-21e48d3104d5 + + + + + + 8355 + 21570 + 0 + 0 + 1 + 1 + + False + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FHIR Resource-authoring Spreadsheet + + + This spreadsheet is used to support the definition of resources or data types (structures). A complete set of instructions on the various tabs, columns and rules associated with populating this spreadsheet can be found here: + + + http://wiki.hl7.org?title=FHIR_Spreadsheet_Authoring + +
+ + +
+