Skip to content

Commit 3aa66b2

Browse files
mherman22mherman22
committed
change 2.5 to 2.6
1 parent 2ded69e commit 3aa66b2

File tree

9 files changed

+50
-15
lines changed

9 files changed

+50
-15
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ configuration/
6060
├── encounterroles/
6161
├── fhirconceptsources/
6262
├── fhirpatientidentifiersystems/
63+
├── fhirContactPointMap/
6364
├── globalproperties/
6465
├── htmlforms/
6566
├── idgen/

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212

13-
<artifactId>initializer-api-2.5</artifactId>
13+
<artifactId>initializer-api-2.6</artifactId>
1414
<packaging>jar</packaging>
15-
<name>Initializer API 2.5</name>
16-
<description>API 2.5 project for Initializer</description>
15+
<name>Initializer API 2.6</name>
16+
<description>API 2.6 project for Initializer</description>
1717

1818
<properties>
19-
<openmrsPlatformVersion>${openmrsVersion2.5}</openmrsPlatformVersion>
19+
<openmrsPlatformVersion>${openmrsVersion2.6}</openmrsPlatformVersion>
2020
</properties>
2121

2222
<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

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* This Source Code Form is subject to the terms of the Mozilla Public License,
3+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4+
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5+
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6+
* <p>
7+
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8+
* graphic logo is a trademark of OpenMRS Inc.
9+
*/
110
package org.openmrs.module.initializer.api.fhir.cpm;
211

312
import org.openmrs.PersonAttributeType;
@@ -14,7 +23,7 @@
1423
import org.openmrs.module.initializer.api.CsvParser;
1524
import org.springframework.beans.factory.annotation.Autowired;
1625

17-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
26+
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
1827
public class FhirContactPointMapCsvParser extends CsvParser<FhirContactPointMap, BaseLineProcessor<FhirContactPointMap>> {
1928

2029
public static final String ATTRIBUTE_TYPE_DOMAIN_HEADER = "Entity name";
@@ -124,7 +133,6 @@ protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, Stri
124133
}
125134

126135
return locationService.getLocationAttributeTypeByUuid(attributeType);
127-
break;
128136
case PROVIDER:
129137
baseAttributeType = providerService.getProviderAttributeTypeByName(attributeType);
130138

@@ -133,7 +141,6 @@ protected BaseAttributeType<?> getBaseAttributeType(String attributeDomain, Stri
133141
}
134142

135143
return providerService.getProviderAttributeTypeByUuid(attributeType);
136-
break;
137144
}
138145
return baseAttributeType;
139146
}

‎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

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* This Source Code Form is subject to the terms of the Mozilla Public License,
3+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4+
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5+
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6+
* <p>
7+
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8+
* graphic logo is a trademark of OpenMRS Inc.
9+
*/
110
package org.openmrs.module.initializer.api.fhir.cpm;
211

312
import org.apache.commons.lang3.StringUtils;
@@ -9,7 +18,7 @@
918

1019
import static org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapCsvParser.ATTRIBUTE_TYPE_DOMAIN_HEADER;
1120

12-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
21+
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
1322
public class FhirContactPointMapLineProcessor extends BaseLineProcessor<FhirContactPointMap> {
1423

1524
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

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
/**
2+
* This Source Code Form is subject to the terms of the Mozilla Public License,
3+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4+
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5+
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6+
* <p>
7+
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8+
* graphic logo is a trademark of OpenMRS Inc.
9+
*/
110
package org.openmrs.module.initializer.api.fhir.cpm;
211

312
import org.openmrs.annotation.OpenmrsProfile;
413
import org.openmrs.module.fhir2.model.FhirContactPointMap;
514
import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
615
import org.springframework.beans.factory.annotation.Autowired;
716

8-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.5.13 - 2.5.*, 2.6.2 - 2.6.*, 2.7.* - 9.*")
17+
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
918
public class FhirContactPointMapLoader extends BaseCsvLoader<FhirContactPointMap, FhirContactPointMapCsvParser> {
1019

1120
@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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
55
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6-
*
6+
* <p>
77
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
88
* graphic logo is a trademark of OpenMRS Inc.
99
*/
1010
package org.openmrs.module.initializer;
1111

12-
public abstract class DomainBaseModuleContextSensitive_2_5_Test extends DomainBaseModuleContextSensitiveTest {
12+
public abstract class DomainBaseModuleContextSensitive_2_6_Test extends DomainBaseModuleContextSensitiveTest {
1313

1414
@Override
1515
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

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* This Source Code Form is subject to the terms of the Mozilla Public License,
3+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4+
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5+
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6+
* <p>
7+
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8+
* graphic logo is a trademark of OpenMRS Inc.
9+
*/
110
package org.openmrs.module.initializer.api;
211

312
import org.hl7.fhir.r4.model.ContactPoint;
@@ -12,7 +21,7 @@
1221
import org.openmrs.attribute.BaseAttributeType;
1322
import org.openmrs.module.fhir2.api.FhirContactPointMapService;
1423
import org.openmrs.module.fhir2.model.FhirContactPointMap;
15-
import org.openmrs.module.initializer.DomainBaseModuleContextSensitiveTest;
24+
import org.openmrs.module.initializer.DomainBaseModuleContextSensitive_2_6_Test;
1625
import org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapLoader;
1726
import org.springframework.beans.factory.annotation.Autowired;
1827

@@ -22,7 +31,7 @@
2231
import static org.hamcrest.Matchers.equalTo;
2332
import static org.hamcrest.Matchers.is;
2433

25-
public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitiveTest {
34+
public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitive_2_6_Test {
2635

2736
@Autowired
2837
private FhirContactPointMapService fhirContactPointMapService;

‎api-2.5/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv ‎api-2.6/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv

File renamed without changes.

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<module>api-2.2</module>
3737
<module>api-2.3</module>
3838
<module>api-2.4</module>
39-
<module>api-2.5</module>
39+
<module>api-2.6</module>
4040
<module>omod</module>
4141
</modules>
4242

@@ -55,7 +55,7 @@
5555
<openmrsVersion2.2>2.2.0</openmrsVersion2.2>
5656
<openmrsVersion2.3>2.3.6</openmrsVersion2.3>
5757
<openmrsVersion2.4>2.4.0</openmrsVersion2.4>
58-
<openmrsVersion2.5>2.5.13-SNAPSHOT</openmrsVersion2.5>
58+
<openmrsVersion2.6>2.6.3-SNAPSHOT</openmrsVersion2.6>
5959

6060
<openmrsPlatformVersion>${openmrsVersion2.1}</openmrsPlatformVersion>
6161

0 commit comments

Comments
 (0)