From f778a034ae109c0f7013d0cd4b3adfc41ae2b72a Mon Sep 17 00:00:00 2001 From: mherman22 Date: Sun, 22 Oct 2023 20:49:14 +0300 Subject: [PATCH] change 2.5 to 2.6 --- README.md | 1 + {api-2.5 => api-2.6}/pom.xml | 38 ++----------------- .../cpm/FhirContactPointMapCsvParser.java | 13 +++++-- .../cpm/FhirContactPointMapLineProcessor.java | 11 +++++- .../fhir/cpm/FhirContactPointMapLoader.java | 11 +++++- ...inBaseModuleContextSensitive_2_6_Test.java | 4 +- ...PatientContactPointMapIntegrationTest.java | 13 ++++++- .../fhircontactpointmap/contactPointMap.csv | 0 pom.xml | 4 +- 9 files changed, 50 insertions(+), 45 deletions(-) rename {api-2.5 => api-2.6}/pom.xml (51%) rename {api-2.5 => api-2.6}/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java (90%) rename {api-2.5 => api-2.6}/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java (76%) rename {api-2.5 => api-2.6}/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java (53%) rename 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 (90%) rename {api => api-2.6}/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java (88%) rename {api-2.5 => api-2.6}/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv (100%) diff --git a/README.md b/README.md index 0fd4abcd..4bb5ba1e 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ configuration/ ├── encounterroles/ ├── fhirconceptsources/ ├── fhirpatientidentifiersystems/ + ├── fhirContactPointMap/ ├── globalproperties/ ├── htmlforms/ ├── idgen/ diff --git a/api-2.5/pom.xml b/api-2.6/pom.xml similarity index 51% rename from api-2.5/pom.xml rename to api-2.6/pom.xml index bbbfceff..830bf16b 100644 --- a/api-2.5/pom.xml +++ b/api-2.6/pom.xml @@ -10,13 +10,13 @@ 4.0.0 - initializer-api-2.5 + initializer-api-2.6 jar - Initializer API 2.5 - API 2.5 project for Initializer + Initializer API 2.6 + API 2.6 project for Initializer - ${openmrsVersion2.5} + ${openmrsVersion2.6} @@ -41,36 +41,6 @@ ${project.parent.version} provided - - - ${project.parent.groupId} - ${project.parent.artifactId}-api-2.3 - ${project.parent.version} - provided - - - - ${project.parent.groupId} - ${project.parent.artifactId}-api-2.3 - ${project.parent.version} - test - test-jar - - - - ${project.parent.groupId} - ${project.parent.artifactId}-api-2.2 - ${project.parent.version} - provided - - - - ${project.parent.groupId} - ${project.parent.artifactId}-api-2.2 - ${project.parent.version} - test - test-jar - diff --git a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java b/api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java similarity index 90% rename from api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java rename to api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java index d70b6279..fd98ad5a 100644 --- a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java +++ b/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. + *

+ * 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> { 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; } diff --git a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java b/api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java similarity index 76% rename from api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java rename to api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java index 92323ce9..25dde14f 100644 --- a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java +++ b/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. + *

+ * 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 { private static final String SYSTEM_HEADER = "system"; diff --git a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java b/api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java similarity index 53% rename from api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java rename to api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java index 02d3cda9..5b148cbc 100644 --- a/api-2.5/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.java +++ b/api-2.6/src/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLoader.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. + *

+ * 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; @@ -5,7 +14,7 @@ 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 { @Autowired diff --git a/api-2.5/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_5_Test.java b/api-2.6/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_6_Test.java similarity index 90% rename from api-2.5/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_5_Test.java rename to api-2.6/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_6_Test.java index 422b23a8..018fc5c0 100644 --- a/api-2.5/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_5_Test.java +++ b/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. - * + *

* 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() { diff --git a/api/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java b/api-2.6/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java similarity index 88% rename from api/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java rename to api-2.6/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java index 2416d461..d0b1dde2 100644 --- a/api/src/test/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java +++ b/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. + *

+ * 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; diff --git a/api-2.5/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv b/api-2.6/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv similarity index 100% rename from api-2.5/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv rename to api-2.6/src/test/resources/testAppDataDir/configuration/fhircontactpointmap/contactPointMap.csv diff --git a/pom.xml b/pom.xml index 81c9c1c6..4c17fca2 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ api-2.2 api-2.3 api-2.4 - api-2.5 + api-2.6 omod @@ -55,7 +55,7 @@ 2.2.0 2.3.6 2.4.0 - 2.5.13-SNAPSHOT + 2.6.3-SNAPSHOT ${openmrsVersion2.1}