honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reinstate DEV structures for now

This commit is contained in:
jamesagnew 2015-03-05 08:37:50 -05:00
parent 082b9cfc4b
commit 967d44326b
4 changed files with 107 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
View File

@ -443,6 +443,8 @@ public class FhirContext {
/** /**
* Creates and returns a new FhirContext with version {@link FhirVersionEnum#DEV} * Creates and returns a new FhirContext with version {@link FhirVersionEnum#DEV}
*
* @deprecated Support for DEV resources will be removed, you should use DSTU2 resources instead
*/ */
public static FhirContext forDev() { public static FhirContext forDev() {
return new FhirContext(FhirVersionEnum.DEV); return new FhirContext(FhirVersionEnum.DEV);

236
hapi-fhir-structures-dev/pom.xml
View File

@ -195,144 +195,104 @@
<package>ca.uhn.fhir.model.dev</package> <package>ca.uhn.fhir.model.dev</package>
<version>dev</version> <version>dev</version>
<baseResourceNames> <baseResourceNames>
<baseResourceName>adversereaction</baseResourceName> <baseResourceName>Condition</baseResourceName>
<baseResourceName>adversereactionrisk</baseResourceName> <baseResourceName>Supply</baseResourceName>
<baseResourceName>alert</baseResourceName> <baseResourceName>DeviceComponent</baseResourceName>
<baseResourceName>allergyintolerance</baseResourceName> <baseResourceName>Communication</baseResourceName>
<baseResourceName>appointment</baseResourceName> <baseResourceName>Group</baseResourceName>
<baseResourceName>appointmentresponse</baseResourceName> <baseResourceName>ValueSet</baseResourceName>
<!--<baseResourceName>assessmentdefinition</baseResourceName>--> <baseResourceName>OralHealthClaim</baseResourceName>
<baseResourceName>basic</baseResourceName> <baseResourceName>Coverage</baseResourceName>
<!--<baseResourceName>binary</baseResourceName>--> <baseResourceName>Appointment</baseResourceName>
<!--<baseResourceName>bundle</baseResourceName>--> <baseResourceName>Slot</baseResourceName>
<!--<baseResourceName>careactivity</baseResourceName>--> <baseResourceName>Contraindication</baseResourceName>
<baseResourceName>careplan</baseResourceName> <baseResourceName>Composition</baseResourceName>
<baseResourceName>careplan2</baseResourceName> <baseResourceName>EpisodeOfCare</baseResourceName>
<baseResourceName>claim</baseResourceName> <baseResourceName>Conformance</baseResourceName>
<baseResourceName>claimresponse</baseResourceName> <baseResourceName>NamingSystem</baseResourceName>
<baseResourceName>clinicalassessment</baseResourceName> <baseResourceName>HealthcareService</baseResourceName>
<!--<baseResourceName>commondataelement</baseResourceName>--> <baseResourceName>OrderResponse</baseResourceName>
<baseResourceName>communication</baseResourceName> <baseResourceName>StatusResponse</baseResourceName>
<baseResourceName>communicationrequest</baseResourceName> <baseResourceName>ConceptMap</baseResourceName>
<baseResourceName>composition</baseResourceName> <baseResourceName>PharmacyClaim</baseResourceName>
<baseResourceName>conceptmap</baseResourceName> <baseResourceName>Reversal</baseResourceName>
<baseResourceName>condition</baseResourceName> <baseResourceName>Practitioner</baseResourceName>
<baseResourceName>conformance</baseResourceName> <baseResourceName>CarePlan</baseResourceName>
<baseResourceName>contract</baseResourceName> <baseResourceName>ClinicalAssessment</baseResourceName>
<baseResourceName>contraindication</baseResourceName> <baseResourceName>Substance</baseResourceName>
<baseResourceName>coverage</baseResourceName> <baseResourceName>DeviceUseRequest</baseResourceName>
<baseResourceName>dataelement</baseResourceName> <baseResourceName>Schedule</baseResourceName>
<baseResourceName>device</baseResourceName> <baseResourceName>EligibilityRequest</baseResourceName>
<baseResourceName>devicecomponent</baseResourceName> <baseResourceName>QuestionnaireAnswers</baseResourceName>
<baseResourceName>devicemetric</baseResourceName> <baseResourceName>PaymentReconciliation</baseResourceName>
<baseResourceName>deviceobservationreport</baseResourceName> <baseResourceName>ProfessionalClaim</baseResourceName>
<baseResourceName>deviceuserequest</baseResourceName> <baseResourceName>ImagingObjectSelection</baseResourceName>
<baseResourceName>deviceusestatement</baseResourceName> <baseResourceName>OperationDefinition</baseResourceName>
<baseResourceName>diagnosticorder</baseResourceName> <baseResourceName>ClaimResponse</baseResourceName>
<baseResourceName>diagnosticreport</baseResourceName> <baseResourceName>BodySite</baseResourceName>
<!--<baseResourceName>document</baseResourceName>--> <baseResourceName>CommunicationRequest</baseResourceName>
<!--<baseResourceName>documentation</baseResourceName>--> <baseResourceName>RiskAssessment</baseResourceName>
<baseResourceName>documentmanifest</baseResourceName> <baseResourceName>Observation</baseResourceName>
<baseResourceName>documentreference</baseResourceName> <baseResourceName>AllergyIntolerance</baseResourceName>
<!--<baseResourceName>eligibility</baseResourceName>--> <baseResourceName>ExplanationOfBenefit</baseResourceName>
<baseResourceName>eligibilityrequest</baseResourceName> <baseResourceName>SupportingDocumentation</baseResourceName>
<baseResourceName>eligibilityresponse</baseResourceName> <baseResourceName>RelatedPerson</baseResourceName>
<baseResourceName>encounter</baseResourceName> <baseResourceName>InstitutionalClaim</baseResourceName>
<!--<baseResourceName>enrollment</baseResourceName>--> <baseResourceName>Alert</baseResourceName>
<baseResourceName>enrollmentrequest</baseResourceName> <baseResourceName>AuditEvent</baseResourceName>
<baseResourceName>enrollmentresponse</baseResourceName> <baseResourceName>EligibilityResponse</baseResourceName>
<baseResourceName>episodeofcare</baseResourceName> <baseResourceName>StatusRequest</baseResourceName>
<baseResourceName>explanationofbenefit</baseResourceName> <baseResourceName>Person</baseResourceName>
<baseResourceName>extensiondefinition</baseResourceName> <baseResourceName>ProcedureRequest</baseResourceName>
<baseResourceName>familyhistory</baseResourceName> <baseResourceName>VisionClaim</baseResourceName>
<!--<baseResourceName>geneexpression</baseResourceName>--> <baseResourceName>DeviceMetric</baseResourceName>
<baseResourceName>geneticanalysis</baseResourceName> <baseResourceName>Organization</baseResourceName>
<baseResourceName>goal</baseResourceName> <baseResourceName>Readjudicate</baseResourceName>
<!--<baseResourceName>goalrequest</baseResourceName>--> <baseResourceName>ImmunizationRecommendation</baseResourceName>
<baseResourceName>group</baseResourceName> <baseResourceName>MedicationDispense</baseResourceName>
<baseResourceName>gvfmeta</baseResourceName> <baseResourceName>MedicationPrescription</baseResourceName>
<baseResourceName>gvfvariant</baseResourceName> <baseResourceName>PaymentNotice</baseResourceName>
<baseResourceName>healthcareservice</baseResourceName> <baseResourceName>MedicationStatement</baseResourceName>
<baseResourceName>imagingobjectselection</baseResourceName> <baseResourceName>AppointmentResponse</baseResourceName>
<baseResourceName>imagingstudy</baseResourceName> <baseResourceName>Questionnaire</baseResourceName>
<baseResourceName>immunization</baseResourceName> <baseResourceName>OperationOutcome</baseResourceName>
<!--<baseResourceName>immunizationprofile</baseResourceName>--> <baseResourceName>Media</baseResourceName>
<baseResourceName>immunizationrecommendation</baseResourceName> <baseResourceName>Other</baseResourceName>
<baseResourceName>institutionalclaim</baseResourceName> <baseResourceName>VisionPrescription</baseResourceName>
<!--<baseResourceName>interestofcare</baseResourceName>--> <baseResourceName>DocumentReference</baseResourceName>
<baseResourceName>list</baseResourceName> <baseResourceName>Immunization</baseResourceName>
<baseResourceName>location</baseResourceName> <baseResourceName>Subscription</baseResourceName>
<baseResourceName>media</baseResourceName> <baseResourceName>ImagingStudy</baseResourceName>
<baseResourceName>medication</baseResourceName> <baseResourceName>Provenance</baseResourceName>
<baseResourceName>medicationadministration</baseResourceName> <baseResourceName>Device</baseResourceName>
<baseResourceName>medicationdispense</baseResourceName> <baseResourceName>StructureDefinition</baseResourceName>
<baseResourceName>medicationprescription</baseResourceName> <baseResourceName>Order</baseResourceName>
<baseResourceName>medicationstatement</baseResourceName> <baseResourceName>Procedure</baseResourceName>
<!--<baseResourceName>message</baseResourceName>--> <baseResourceName>DiagnosticReport</baseResourceName>
<baseResourceName>messageheader</baseResourceName> <baseResourceName>Medication</baseResourceName>
<!--<baseResourceName>microarray</baseResourceName>--> <baseResourceName>MessageHeader</baseResourceName>
<!--<baseResourceName>namespace</baseResourceName>--> <baseResourceName>DataElement</baseResourceName>
<baseResourceName>namingsystem</baseResourceName> <baseResourceName>DocumentManifest</baseResourceName>
<!--<baseResourceName>newbundle</baseResourceName>--> <baseResourceName>MedicationAdministration</baseResourceName>
<baseResourceName>nutritionorder</baseResourceName> <baseResourceName>Encounter</baseResourceName>
<baseResourceName>observation</baseResourceName> <baseResourceName>PendedRequest</baseResourceName>
<baseResourceName>operationdefinition</baseResourceName> <baseResourceName>List</baseResourceName>
<baseResourceName>operationoutcome</baseResourceName> <baseResourceName>DeviceUseStatement</baseResourceName>
<baseResourceName>oralhealthclaim</baseResourceName> <baseResourceName>Goal</baseResourceName>
<baseResourceName>order</baseResourceName> <baseResourceName>NutritionOrder</baseResourceName>
<baseResourceName>orderresponse</baseResourceName> <baseResourceName>SearchParameter</baseResourceName>
<baseResourceName>organization</baseResourceName> <baseResourceName>ReferralRequest</baseResourceName>
<baseResourceName>other</baseResourceName> <baseResourceName>FamilyHistory</baseResourceName>
<baseResourceName>patient</baseResourceName> <baseResourceName>EnrollmentRequest</baseResourceName>
<baseResourceName>paymentnotice</baseResourceName> <baseResourceName>Location</baseResourceName>
<baseResourceName>paymentreconciliation</baseResourceName> <baseResourceName>Contract</baseResourceName>
<baseResourceName>pendedrequest</baseResourceName> <baseResourceName>Basic</baseResourceName>
<baseResourceName>person</baseResourceName> <baseResourceName>Specimen</baseResourceName>
<baseResourceName>pharmacyclaim</baseResourceName> <baseResourceName>EnrollmentResponse</baseResourceName>
<!--<baseResourceName>picture</baseResourceName>--> <baseResourceName>Patient</baseResourceName>
<baseResourceName>practitioner</baseResourceName> <baseResourceName>CarePlan2</baseResourceName>
<!--<baseResourceName>problem</baseResourceName>--> <baseResourceName>DiagnosticOrder</baseResourceName>
<baseResourceName>procedure</baseResourceName> <baseResourceName>Parameters</baseResourceName>
<baseResourceName>procedurerequest</baseResourceName>
<baseResourceName>professionalclaim</baseResourceName>
<baseResourceName>profile</baseResourceName>
<!--<baseResourceName>protocol</baseResourceName>-->
<baseResourceName>provenance</baseResourceName>
<baseResourceName>query</baseResourceName>
<baseResourceName>questionnaire</baseResourceName>
<baseResourceName>questionnaireanswers</baseResourceName>
<baseResourceName>readjudicate</baseResourceName>
<baseResourceName>referralrequest</baseResourceName>
<baseResourceName>relatedperson</baseResourceName>
<baseResourceName>remittance</baseResourceName>
<baseResourceName>reversal</baseResourceName>
<baseResourceName>riskassessment</baseResourceName>
<baseResourceName>schedule</baseResourceName>
<baseResourceName>searchparameter</baseResourceName>
<baseResourceName>securityclaim</baseResourceName>
<baseResourceName>securityevent</baseResourceName>
<baseResourceName>securitygroup</baseResourceName>
<baseResourceName>securityprincipal</baseResourceName>
<!--<baseResourceName>sequence</baseResourceName>
<baseResourceName>sequencinganalysis</baseResourceName>
<baseResourceName>sequencinglab</baseResourceName>-->
<baseResourceName>slot</baseResourceName>
<baseResourceName>specimen</baseResourceName>
<baseResourceName>statusrequest</baseResourceName>
<baseResourceName>statusresponse</baseResourceName>
<!--<baseResourceName>study</baseResourceName>-->
<baseResourceName>subscription</baseResourceName>
<baseResourceName>substance</baseResourceName>
<baseResourceName>supply</baseResourceName>
<baseResourceName>supportingdocumentation</baseResourceName>
<!--<baseResourceName>test</baseResourceName>-->
<baseResourceName>user</baseResourceName>
<baseResourceName>valueset</baseResourceName>
<!--<baseResourceName>vcfmeta</baseResourceName>
<baseResourceName>vcfvariant</baseResourceName>-->
<baseResourceName>visionclaim</baseResourceName>
<baseResourceName>visionprescription</baseResourceName>
<!--<baseResourceName>visit</baseResourceName>-->
</baseResourceNames> </baseResourceNames>
<buildDatatypes>true</buildDatatypes> <buildDatatypes>true</buildDatatypes>
</configuration> </configuration>

9
hapi-fhir-structures-dev/src/main/java/ca/uhn/fhir/model/dev/resource/Binary.java
View File

@ -87,16 +87,19 @@ public class Binary extends BaseResource implements IBaseBinary {
return (myContent.isEmpty()) && ElementUtil.isEmpty(myContentType); return (myContent.isEmpty()) && ElementUtil.isEmpty(myContentType);
} }
public void setContent(byte[] theContent) { public Binary setContent(byte[] theContent) {
myContent.setValue(theContent); myContent.setValue(theContent);
return this;
} }
public void setContentAsBase64(String theContent) { public Binary setContentAsBase64(String theContent) {
myContent.setValueAsString(theContent); myContent.setValueAsString(theContent);
return this;
} }
public void setContentType(String theContentType) { public Binary setContentType(String theContentType) {
myContentType = new StringDt(theContentType); myContentType = new StringDt(theContentType);
return this;
} }
@Override @Override

2
pom.xml
View File

@ -754,7 +754,7 @@
<module>hapi-tinder-test</module> <module>hapi-tinder-test</module>
<module>hapi-fhir-structures-dstu</module> <module>hapi-fhir-structures-dstu</module>
<module>hapi-fhir-structures-dstu2</module> <module>hapi-fhir-structures-dstu2</module>
<!--<module>hapi-fhir-structures-dev</module>--> <module>hapi-fhir-structures-dev</module>
<module>hapi-fhir-jpaserver-base</module> <module>hapi-fhir-jpaserver-base</module>
<module>hapi-fhir-jpaserver-example</module> <module>hapi-fhir-jpaserver-example</module>
<module>restful-server-example</module> <module>restful-server-example</module>