adding the @component to create beans of the loader and others

Author: mherman22

api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java

@@ -22,13 +22,15 @@
 import org.openmrs.module.initializer.api.CsvLine;
 import org.openmrs.module.initializer.api.CsvParser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 @OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
 public class FhirContactPointMapCsvParser extends CsvParser<FhirContactPointMap, BaseLineProcessor<FhirContactPointMap>> {
 
 	public static final String ATTRIBUTE_TYPE_DOMAIN_HEADER = "Entity name";
 
-	public static final String ATTRIBUTE_TYPE = "Attribute type";
+	public static final String ATTRIBUTE_TYPE = "Attribute Type";
 
 	private static final String LOCATION = "location";
 
@@ -116,9 +118,7 @@ protected PersonAttributeType getPersonAttributeType(String attributeType) {
 			return personAttributeType;
 		}
 
-		personAttributeType = personService.getPersonAttributeTypeByUuid(attributeType);
-		
-		return personAttributeType;
+		return personService.getPersonAttributeTypeByUuid(attributeType);
 	}
 
 	protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, String attributeType) {

api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java

@@ -15,9 +15,11 @@
 import org.openmrs.module.fhir2.model.FhirContactPointMap;
 import org.openmrs.module.initializer.api.BaseLineProcessor;
 import org.openmrs.module.initializer.api.CsvLine;
+import org.springframework.stereotype.Component;
 
 import static org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapCsvParser.ATTRIBUTE_TYPE_DOMAIN_HEADER;
 
+@Component
 @OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
 public class FhirContactPointMapLineProcessor extends BaseLineProcessor<FhirContactPointMap> {
 

api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java

@@ -13,7 +13,9 @@
 import org.openmrs.module.fhir2.model.FhirContactPointMap;
 import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 @OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
 public class FhirContactPointMapLoader extends BaseCsvLoader<FhirContactPointMap, FhirContactPointMapCsvParser> {
 

api-2.6/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java

@@ -69,8 +69,8 @@ public void setup() {
 		fhirContactPointMap.setSystem(ContactPoint.ContactPointSystem.PHONE);
 		fhirContactPointMap.setUse(ContactPoint.ContactPointUse.WORK);
 		fhirContactPointMap.setRank(1);
+		
 		fhirContactPointMapService.saveFhirContactPointMap(fhirContactPointMap);
-		personService.savePersonAttributeType(personAttributeType);
 	}
 
 	@Test