update fhir version from snapshot version

Author: mherman22

api-2.5/pom.xml

@@ -2,12 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>initializer</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>initializer-api-2.5</artifactId>
     <packaging>jar</packaging>

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

@@ -49,7 +49,8 @@ protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPoi
 	public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentException {
 		FhirContactPointMap contactPointMap = null;
 		if (line.getUuid() != null) {
-			contactPointMap = fhirContactPointMapService.getFhirConactPointMapByUuid(line.getUuid());
+			contactPointMap = fhirContactPointMapService.getFhirContactPointMapByUuid(line.getUuid())
+					.orElse(null);
 		}
 
 		if (contactPointMap != null) {
@@ -134,5 +135,6 @@ protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, Stri
 				return providerService.getProviderAttributeTypeByUuid(attributeType);
 			break;
 		}
+		return baseAttributeType;
 	}
 }

pom.xml

@@ -69,7 +69,7 @@
         <metadatasharingVersion>1.2.2</metadatasharingVersion>
         <metadatamappingVersion>1.3.4</metadatamappingVersion>
         <openconceptlabVersion>1.2.9</openconceptlabVersion>
-        <fhir2Version>1.11.0-SNAPSHOT</fhir2Version>
+        <fhir2Version>1.11.0</fhir2Version>
 
         <!-- Modules compatibility > Core 2.3.0 -->
         <datafilterVersion>1.0.0</datafilterVersion>

readme/fhir.md

@@ -88,11 +88,12 @@ fhirContactPointMap/
 ```
 The format of this CSV should be as follows:
 
-| <sub>Uuid</sub> | <sub>Void/Retire</sub> | <sub>Attribute Type Domain</sub> | <sub>Attribute Type Id</sub> | <sub>System</sub> | <sub>Use</sub> | <sub>Rank</sub> | <sub>_order:1000</sub>
-| - | - | - | - | - | - | - | - |
-| <sub>fa48acc4-ef1f-46d6-b0af-150b00ddee9d</sub> | | <sub>person</sub> | | <sub>10001</sub> | | <sub>phone</sub> | | <sub>work</sub> | | <sub>1</sub> |
-| <sub>bcf23315-a236-42aa-be95-b9e0931e22b0</sub> | | <sub>provider</sub> | | <sub>10002</sub> | | <sub>email</sub> | | <sub>home</sub> | | <sub>2</sub> |
-| <sub>800e48ba-666c-445c-b871-68e54eec6de8</sub> | | <sub>location</sub> | | <sub>10003</sub> | | <sub>url</sub> | | <sub>temp</sub> | | <sub>3</sub> |
+| Uuid                                 | Void/Retire | Entity name | Attribute Type                       | System | Use  | Rank | _order:1000 |
+|--------------------------------------|-------------|-------------|--------------------------------------|--------|------|------|-------------|
+| fa48acc4-ef1f-46d6-b0af-150b00ddee9d |             | person      | 717ec942-3c4a-11ea-b024-ffc81a23382e | phone  | work | 1    |             |
+|                                      |             | person      | PAT_RENAME_NEW_NAME                  | phone  | home |      |             |
+| bcf23315-a236-42aa-be95-b9e0931e22b0 |             | provider    | Provider Speciality                  | email  | home | 2    |             |
+| 800e48ba-666c-445c-b871-68e54eec6de8 |             | location    | e7aacc6e-d151-4d9e-a808-6ed9ff761212 | phone  | temp | 3    |             |
 
 Headers that start with an underscore such as `_order:1000` are metadata headers. The values in the columns under those headers are never read by the CSV parser.