change 2.5 to 2.6

README.md

@@ -60,6 +60,7 @@ configuration/
   ├── encounterroles/
   ├── fhirconceptsources/
   ├── fhirpatientidentifiersystems/
+  ├── fhirContactPointMap/
   ├── globalproperties/
   ├── htmlforms/
   ├── idgen/

api-2.5/pom.xml → api-2.6/pom.xml

@@ -10,13 +10,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>initializer-api-2.5</artifactId>
+    <artifactId>initializer-api-2.6</artifactId>
     <packaging>jar</packaging>
-    <name>Initializer API 2.5</name>
-    <description>API 2.5 project for Initializer</description>
+    <name>Initializer API 2.6</name>
+    <description>API 2.6 project for Initializer</description>
 
     <properties>
-        <openmrsPlatformVersion>${openmrsVersion2.5}</openmrsPlatformVersion>
+        <openmrsPlatformVersion>${openmrsVersion2.6}</openmrsPlatformVersion>
     </properties>
 
     <dependencies>

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

@@ -1,3 +1,12 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ * <p>
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
 package org.openmrs.module.initializer.api.fhir.cpm;
 
 import org.openmrs.PersonAttributeType;
@@ -14,7 +23,7 @@
 import org.openmrs.module.initializer.api.CsvParser;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
+@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";
@@ -124,7 +133,6 @@ protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, Stri
 				}
 
 				return locationService.getLocationAttributeTypeByUuid(attributeType);
-				break;
 			case PROVIDER:
 				baseAttributeType = providerService.getProviderAttributeTypeByName(attributeType);
 
@@ -133,7 +141,6 @@ protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, Stri
 				}
 
 				return providerService.getProviderAttributeTypeByUuid(attributeType);
-			break;
 		}
 		return baseAttributeType;
 	}

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

@@ -1,3 +1,12 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ * <p>
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
 package org.openmrs.module.initializer.api.fhir.cpm;
 
 import org.apache.commons.lang3.StringUtils;
@@ -9,7 +18,7 @@
 
 import static org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapCsvParser.ATTRIBUTE_TYPE_DOMAIN_HEADER;
 
-@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
+@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
 public class FhirContactPointMapLineProcessor extends BaseLineProcessor<FhirContactPointMap> {
 
 	private static final String SYSTEM_HEADER = "system";

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

@@ -1,11 +1,20 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ * <p>
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
 package org.openmrs.module.initializer.api.fhir.cpm;
 
 import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.module.fhir2.model.FhirContactPointMap;
 import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
+@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
 public class FhirContactPointMapLoader extends BaseCsvLoader<FhirContactPointMap, FhirContactPointMapCsvParser> {
 
 	@Autowired

api-2.5/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_5_Test.java → api-2.6/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_6_Test.java

@@ -3,13 +3,13 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
  * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
- *
+ * <p>
  * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
  * graphic logo is a trademark of OpenMRS Inc.
  */
 package org.openmrs.module.initializer;
 
-public abstract class DomainBaseModuleContextSensitive_2_5_Test extends DomainBaseModuleContextSensitiveTest {
+public abstract class DomainBaseModuleContextSensitive_2_6_Test extends DomainBaseModuleContextSensitiveTest {
 
 	@Override
 	public void updateSearchIndex() {

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

@@ -1,3 +1,12 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ * <p>
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
 package org.openmrs.module.initializer.api;
 
 import org.hl7.fhir.r4.model.ContactPoint;
@@ -12,7 +21,7 @@
 import org.openmrs.attribute.BaseAttributeType;
 import org.openmrs.module.fhir2.api.FhirContactPointMapService;
 import org.openmrs.module.fhir2.model.FhirContactPointMap;
-import org.openmrs.module.initializer.DomainBaseModuleContextSensitiveTest;
+import org.openmrs.module.initializer.DomainBaseModuleContextSensitive_2_6_Test;
 import org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapLoader;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -22,7 +31,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitiveTest {
+public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitive_2_6_Test {
 
 	@Autowired
 	private FhirContactPointMapService fhirContactPointMapService;

pom.xml

@@ -36,7 +36,7 @@
         <module>api-2.2</module>
         <module>api-2.3</module>
         <module>api-2.4</module>
-        <module>api-2.5</module>
+        <module>api-2.6</module>
         <module>omod</module>
     </modules>
 
@@ -55,7 +55,7 @@
         <openmrsVersion2.2>2.2.0</openmrsVersion2.2>
         <openmrsVersion2.3>2.3.6</openmrsVersion2.3>
         <openmrsVersion2.4>2.4.0</openmrsVersion2.4>
-        <openmrsVersion2.5>2.5.13-SNAPSHOT</openmrsVersion2.5>
+        <openmrsVersion2.6>2.6.3-SNAPSHOT</openmrsVersion2.6>
 
         <openmrsPlatformVersion>${openmrsVersion2.1}</openmrsPlatformVersion>