diff --git a/pom.xml b/pom.xml index 7664bc3..fdf20a7 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.smartregister fhir-common-utils - 0.0.11-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/src/main/java/org/smartregister/model/location/LocationHierarchy.java b/src/main/java/org/smartregister/model/location/LocationHierarchy.java index 5316e5a..bc72d84 100755 --- a/src/main/java/org/smartregister/model/location/LocationHierarchy.java +++ b/src/main/java/org/smartregister/model/location/LocationHierarchy.java @@ -18,14 +18,16 @@ 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 org.hl7.fhir.r4.model.*; import java.util.ArrayList; import java.util.List; +import org.hl7.fhir.r4.model.Location; +import org.hl7.fhir.r4.model.StringType; +import org.hl7.fhir.r4.model.Bundle; +import org.hl7.fhir.r4.model.ResourceType; @ResourceDef(name = "LocationHierarchy", profile = "http://hl7.org/fhir/profiles/custom-resource") public class LocationHierarchy extends Location { - @Child( name = "locationId", type = {StringType.class}, diff --git a/src/main/java/org/smartregister/model/location/LocationHierarchyTree.java b/src/main/java/org/smartregister/model/location/LocationHierarchyTree.java index 48b8d24..c9d0b4c 100755 --- a/src/main/java/org/smartregister/model/location/LocationHierarchyTree.java +++ b/src/main/java/org/smartregister/model/location/LocationHierarchyTree.java @@ -25,12 +25,9 @@ import org.hl7.fhir.r4.model.Type; import java.util.List; -import java.util.logging.Logger; @DatatypeDef(name = "LocationHierarchyTree") public class LocationHierarchyTree extends Type implements ICompositeType { - - private static final Logger logger = Logger.getLogger(LocationHierarchyTree.class.getSimpleName()); @Child(name = "locationsHierarchy") private Tree locationsHierarchy; diff --git a/src/main/java/org/smartregister/model/practitioner/PractitionerDetails.java b/src/main/java/org/smartregister/model/practitioner/PractitionerDetails.java index 19af5ed..27231d7 100755 --- a/src/main/java/org/smartregister/model/practitioner/PractitionerDetails.java +++ b/src/main/java/org/smartregister/model/practitioner/PractitionerDetails.java @@ -20,7 +20,6 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.rest.gclient.TokenClientParam; -import ca.uhn.fhir.rest.param.SpecialParam; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.Practitioner; import org.hl7.fhir.r4.model.ResourceType; @@ -29,7 +28,7 @@ import java.util.List; @ResourceDef( - name = "practitioner-details", + name = "PractitionerDetail", profile = "http://hl7.org/fhir/profiles/custom-resource") public class PractitionerDetails extends Practitioner {