Use hapi-fhir version 3.7.0 instead of version 2.2.

pom.xml

@@ -3,24 +3,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cqframework.info</groupId>
 	<artifactId>qicore</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>0.0.3</version>
 	<name>QI Core Interfaces and Adapters</name>
 	<description>Java logical interfaces and corresponding HAPI FHIR implementation adapters for the FHIR QI Core profile set</description>
 	<dependencies>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
-			<version>2.2</version>
+			<version>3.7.0</version>
 		</dependency>
  		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>2.2</version>
+			<version>3.7.0</version>
 		</dependency> 
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>2.2</version>
+			<version>3.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>

src/main/java/org/cqf/qicore/dstu3/AdapterFactory.java

@@ -1,5 +1,7 @@
 package org.cqf.qicore.dstu3;
 
+import ca.uhn.fhir.model.api.IResource;
+import org.hl7.fhir.dstu3.model.Bundle;
 import org.slf4j.LoggerFactory;
 import java.util.List;
 
@@ -14,9 +16,9 @@ public class AdapterFactory
    static public final Logger LOGGER = LoggerFactory
          .getLogger(AdapterFactory.class);
 
-   public static Map adapt(ca.uhn.fhir.model.api.Bundle bundle) {
+   public static Map adapt(org.hl7.fhir.dstu3.model.Bundle bundle) {
 		Map<String, List<?>> adapteeMap = new java.util.HashMap<>();
-		for (ca.uhn.fhir.model.api.BundleEntry entry : bundle.getEntries()) {
+		for (Bundle.BundleEntryComponent entry : bundle.getEntry()) {
 			Object adapter = adapt(entry.getResource());
 			if (adapter != null) {
 				List list = adapteeMap.get(entry.getResource().getClass()
@@ -32,11 +34,11 @@ public static Map adapt(ca.uhn.fhir.model.api.Bundle bundle) {
 		return adapteeMap;
 	}
 
-   public static Object adapt(ca.uhn.fhir.model.api.IResource resource)
+   public static Object adapt(org.hl7.fhir.dstu3.model.Resource resource)
    {
       Object adapter = null;
-      String adapterName = resource.getResourceName() + "Adapter";
-      String resourceName = resource.getResourceName();
+      String adapterName = resource.getResourceType().name() + "Adapter";
+      String resourceName = resource.getResourceType().name();
       try
       {
          Class clazz = Class.forName(GENERATED_PACKAGE_PREFIX + adapterName);
@@ -55,4 +57,4 @@ public static Object adapt(ca.uhn.fhir.model.api.IResource resource)
       }
       return adapter;
    }
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicoreallergyintolerance.java

@@ -129,12 +129,8 @@ public Iqicoreallergyintolerance setCriticalityElement(
 
    public boolean hasCategory();
 
-//   public boolean hasCategoryElement();
-
    public List<Enumeration<AllergyIntoleranceCategory>> getCategory();
 
-//   public Enumeration<AllergyIntolerance.AllergyIntoleranceCategory> getCategoryElement();
-
    public Iqicoreallergyintolerance setCategory(
 		   List<Enumeration<AllergyIntoleranceCategory>> param);
 
@@ -255,4 +251,4 @@ public Iqicoreallergyintolerance setPatientAdapterTarget(
    public Iqicoreallergyintolerance setIdElement(IdType param);
 
    public Iqicoreallergyintolerance setId(String param);
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicorecommunication.java

@@ -70,15 +70,15 @@ public qicorecommunicationAdapter addPayload(
 
    public Communication.CommunicationPayloadComponent addPayload();
 
-   public List<CodeableConcept> getReason();
+   public List<CodeableConcept> getReasonCode();
 
-   public Iqicorecommunication setReason(List<CodeableConcept> param);
+   public Iqicorecommunication setReasonCode(List<CodeableConcept> param);
 
-   public boolean hasReason();
+   public boolean hasReasonCode();
 
-   public Iqicorecommunication addReason(CodeableConcept param);
+   public Iqicorecommunication addReasonCode(CodeableConcept param);
 
-   public CodeableConcept addReason();
+   public CodeableConcept addReasonCode();
 
    public List<Annotation> getNote();
 
@@ -115,7 +115,7 @@ public Iqicorecommunication setSubjectAdapterTarget(
 
    public boolean hasParent();
 
-   public List<Reference> getParent();
+   public Reference getParent();
 
    public CodeableConcept getReasonNotPerformed();
 
@@ -139,9 +139,9 @@ public Iqicorecommunication setStatus(
    public Iqicorecommunication setStatusElement(
          Enumeration<Communication.CommunicationStatus> param);
 
-   public CodeableConcept getCategory();
+   public List<CodeableConcept> getCategory();
 
-   public Iqicorecommunication setCategory(CodeableConcept param);
+   public Iqicorecommunication setCategory(List<CodeableConcept> param);
 
    public boolean hasCategory();
 
@@ -270,4 +270,4 @@ public Iqicorecommunication setSenderAdapterTarget(
    public boolean hasBasedOn();
 
    public List<Reference> getBasedOn();
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicorecommunicationrequest.java

@@ -131,9 +131,9 @@ public qicorecommunicationrequestAdapter addPayload(
 
    public CommunicationRequest.CommunicationRequestPayloadComponent addPayload();
 
-   public CodeableConcept getPriority();
+   public CommunicationRequest.CommunicationPriority getPriority();
 
-   public Iqicorecommunicationrequest setPriority(CodeableConcept param);
+   public Iqicorecommunicationrequest setPriority(CommunicationRequest.CommunicationPriority param);
 
    public boolean hasPriority();
 
@@ -200,9 +200,9 @@ public Iqicorecommunicationrequest setStatusElement(
 
    public Identifier addIdentifier();
 
-   public CodeableConcept getCategory();
+   public List<CodeableConcept> getCategory();
 
-   public Iqicorecommunicationrequest setCategory(CodeableConcept param);
+   public Iqicorecommunicationrequest setCategory(List<CodeableConcept> param);
 
    public boolean hasCategory();
 
@@ -269,17 +269,17 @@ public Iqicorecommunicationrequest setSenderAdapterTarget(
    public Iqicorecommunicationrequest setSenderAdapterTarget(
          qicoreorganizationAdapter param);
 
-   public Type getScheduled();
+   public Type getOccurrence();
 
-   public Iqicorecommunicationrequest setScheduled(Type param);
+   public Iqicorecommunicationrequest setOccurrence(Type param);
 
-   public DateTimeType getScheduledDateTimeType();
+   public DateTimeType getOccurrenceDateTimeType();
 
-   public boolean hasScheduledDateTimeType();
+   public boolean hasOccurrenceDateTimeType();
 
-   public Period getScheduledPeriod();
+   public Period getOccurrencePeriod();
 
-   public boolean hasScheduledPeriod();
+   public boolean hasOccurrencePeriod();
 
    public boolean hasId();
 
@@ -293,13 +293,13 @@ public Iqicorecommunicationrequest setSenderAdapterTarget(
 
    public Iqicorecommunicationrequest setId(String param);
 
-   public List<CodeableConcept> getReason();
+   public List<CodeableConcept> getReasonCode();
 
-   public Iqicorecommunicationrequest setReason(List<CodeableConcept> param);
+   public Iqicorecommunicationrequest setReasonCode(List<CodeableConcept> param);
 
-   public boolean hasReason();
+   public boolean hasReasonCode();
 
-   public Iqicorecommunicationrequest addReason(CodeableConcept param);
+   public Iqicorecommunicationrequest addReasonCode(CodeableConcept param);
 
    public CodeableConcept addReason();
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicorecondition.java

@@ -26,7 +26,6 @@
 import org.hl7.fhir.dstu3.model.Enumeration;
 import org.hl7.fhir.dstu3.model.Annotation;
 import org.hl7.fhir.dstu3.model.IdType;
-import org.hl7.fhir.dstu3.model.DateType;
 
 import java.util.Date;
 
@@ -255,11 +254,11 @@ public Iqicorecondition setClinicalStatusElement(
 
    public boolean hasAssertedDateElement();
 
-   public DateType getAssertedDateElement();
+   public DateTimeType getAssertedDateElement();
 
    public Date getAssertedDate();
 
-   public Iqicorecondition setAssertedDateElement(DateType param);
+   public Iqicorecondition setAssertedDateElement(DateTimeType param);
 
    public Iqicorecondition setAssertedDate(Date param);
 
@@ -300,4 +299,4 @@ public Iqicorecondition setVerificationStatusElement(
    public StringType getOnsetStringType();
 
    public boolean hasOnsetStringType();
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicoredevice.java

@@ -101,11 +101,11 @@ public interface Iqicoredevice
 
    public Identifier addIdentifier();
 
-   public Identifier getUdiCarrier();
+   public Device.DeviceUdiComponent getUdiCarrier();
 
-   public Iqicoredevice setUdiCarrier(Identifier param);
+   public Iqicoredevice setUdiCarrier(Device.DeviceUdiComponent param);
 
-   public boolean hasUdiCarrier();
+   public boolean hasUdi();
 
    public boolean hasOwner();
 
@@ -161,13 +161,13 @@ public interface Iqicoredevice
 
    public boolean hasStatusElement();
 
-   public Device.DeviceStatus getStatus();
+   public Device.FHIRDeviceStatus getStatus();
 
-   public Enumeration<Device.DeviceStatus> getStatusElement();
+   public Enumeration<Device.FHIRDeviceStatus> getStatusElement();
 
-   public Iqicoredevice setStatus(Device.DeviceStatus param);
+   public Iqicoredevice setStatus(Device.FHIRDeviceStatus param);
 
-   public Iqicoredevice setStatusElement(Enumeration<Device.DeviceStatus> param);
+   public Iqicoredevice setStatusElement(Enumeration<Device.FHIRDeviceStatus> param);
 
    public CodeableConcept getType();
 
@@ -228,4 +228,4 @@ public interface Iqicoredevice
    public Iqicoredevice addNote(Annotation param);
 
    public Annotation addNote();
-}
+}

src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticreport.java

@@ -88,21 +88,6 @@ public qicorediagnosticreportAdapter addImage(
 
    public DiagnosticReport.DiagnosticReportImageComponent addImage();
 
-   public boolean hasEncounter();
-
-   public Reference getEncounter();
-
-   public Iqicorediagnosticreport setEncounter(Reference param);
-
-   public Encounter getEncounterTarget();
-
-   public Iqicorediagnosticreport setEncounterTarget(Encounter param);
-
-   public qicoreencounterAdapter getEncounterAdapterTarget();
-
-   public Iqicorediagnosticreport setEncounterAdapterTarget(
-         qicoreencounterAdapter param);
-
    public List<Attachment> getPresentedForm();
 
    public Iqicorediagnosticreport setPresentedForm(List<Attachment> param);
@@ -232,11 +217,9 @@ public Iqicorediagnosticreport setStatusElement(
 
    public boolean hasPerformer();
 
-   public List<Practitioner> getPerformerPractitionerTarget();
-
-   public List<Reference> getPerformer();
+   public List<DiagnosticReport.DiagnosticReportPerformerComponent> getPerformer();
 
-   public List<Organization> getPerformerOrganizationTarget();
+   public Resource getContextTarget();
 
    public boolean hasResult();
 
@@ -254,15 +237,21 @@ public Iqicorediagnosticreport setStatusElement(
 
    public Iqicorediagnosticreport setImplicitRules(String param);
 
-   public boolean hasRequest();
+   public boolean hasBasedOn();
+
+   public List<CarePlan> getBasedOnCarePlanTarget();
+
+   public List<Reference> getBasedOn();
+
+   public List<ImmunizationRecommendation> getBasedOnImmunizationRecommendationTarget();
 
-   public List<DiagnosticRequest> getRequestDiagnosticRequestTarget();
+   public List<MedicationRequest> getBasedOnMedicationRequestTarget();
 
-   public List<Reference> getRequest();
+   public List<NutritionOrder> getBasedOnNutritionOrderTarget();
 
-   public List<ProcedureRequest> getRequestProcedureRequestTarget();
+   public List<ProcedureRequest> getBasedOnProcedureRequestTarget();
 
-   public List<ReferralRequest> getRequestReferralRequestTarget();
+   public List<ReferralRequest> getBasedOnReferralRequestTarget();
 
    public Type getEffective();
 
@@ -285,4 +274,4 @@ public Iqicorediagnosticreport setStatusElement(
    public Iqicorediagnosticreport addCodedDiagnosis(CodeableConcept param);
 
    public CodeableConcept addCodedDiagnosis();
-}
+}