Merge pull request #26 from opensrp/25-move-strings-to-constants

Moved strings to a constant file

pom.xml

@@ -19,7 +19,7 @@
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
     <groupId>org.smartregister</groupId>
-    <version>5.6.0-SNAPSHOT</version>
+    <version>5.6.1-SNAPSHOT</version>
 
     <properties>
         <java.version>8</java.version>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.smartregister.hapi-fhir-opensrp-extensions</groupId>
             <artifactId>practitioner</artifactId>
-            <version>0.0.3-SNAPSHOT</version>
+            <version>0.0.4-SNAPSHOT</version>
         </dependency>
 
         <!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a logging library. Logback

src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java

@@ -10,7 +10,8 @@
 import org.springframework.context.annotation.Import;
 
 import javax.servlet.ServletException;
-import static org.smartregister.utils.Constants.LOCATION;
+
+import static org.smartregister.utils.Constants.*;
 
 @Import(AppProperties.class)
 public class JpaRestfulServer extends BaseJpaRestfulServer {
@@ -50,11 +51,11 @@ private void registerLocationHierarchyTypes() {
 
 
 	private void registerPracitionerDetailsTypes() {
-		IFhirResourceDao<Practitioner> practitionerIFhirResourceDao = daoRegistry.getResourceDao("Practitioner");
-		IFhirResourceDao<PractitionerRole> practitionerRoleIFhirResourceDao = daoRegistry.getResourceDao("PractitionerRole");
-		IFhirResourceDao<CareTeam> careTeamIFhirResourceDao = daoRegistry.getResourceDao("CareTeam");
-		IFhirResourceDao<OrganizationAffiliation> organizationAffiliationIFhirResourceDao = daoRegistry.getResourceDao("OrganizationAffiliation");
-		IFhirResourceDao<Organization> organizationIFhirResourceDao = daoRegistry.getResourceDao("Organization");
+		IFhirResourceDao<Practitioner> practitionerIFhirResourceDao = daoRegistry.getResourceDao(_PRACTITIONER);
+		IFhirResourceDao<PractitionerRole> practitionerRoleIFhirResourceDao = daoRegistry.getResourceDao(PRACTITIONER_ROLE);
+		IFhirResourceDao<CareTeam> careTeamIFhirResourceDao = daoRegistry.getResourceDao(CARE_TEAM);
+		IFhirResourceDao<OrganizationAffiliation> organizationAffiliationIFhirResourceDao = daoRegistry.getResourceDao(ORGANIZATION_AFFILIATION);
+		IFhirResourceDao<Organization> organizationIFhirResourceDao = daoRegistry.getResourceDao(ORGANIZATION);
 		IFhirResourceDao<Location> locationIFhirResourceDao = daoRegistry.getResourceDao(LOCATION);
 		LocationHierarchyResourceProvider locationHierarchyResourceProvider = new LocationHierarchyResourceProvider();
 		locationHierarchyResourceProvider.setLocationIFhirResourceDao(locationIFhirResourceDao);
@@ -72,8 +73,6 @@ private void registerPracitionerDetailsTypes() {
 		getFhirContext().registerCustomType(KeycloakUserDetails.class);
 		getFhirContext().registerCustomType(UserBioData.class);
 		getFhirContext().registerCustomType(FhirPractitionerDetails.class);
-		getFhirContext().registerCustomType(FhirCareTeamExtension.class);
-		getFhirContext().registerCustomType(FhirOrganizationExtension.class);
 	}
 
 }