Skip to content

Commit 5d7bd68

Browse files
mherman22mherman22
committed
run initializer-api-2.6 on fhir2:2.0.0
1 parent 3aa66b2 commit 5d7bd68

File tree

6 files changed

+43
-54
lines changed

6 files changed

+43
-54
lines changed

‎api-2.6/pom.xml

+15-34
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
<properties>
1919
<openmrsPlatformVersion>${openmrsVersion2.6}</openmrsPlatformVersion>
20+
<fhir2Version>${fhir2Version2.0.0}</fhir2Version>
2021
</properties>
2122

2223
<dependencies>
@@ -28,45 +29,25 @@
2829
</dependency>
2930

3031
<dependency>
31-
<groupId>${project.parent.groupId}</groupId>
32-
<artifactId>${project.parent.artifactId}-api</artifactId>
33-
<version>${project.parent.version}</version>
34-
<scope>test</scope>
35-
<type>test-jar</type>
36-
</dependency>
37-
38-
<dependency>
39-
<groupId>${project.parent.groupId}</groupId>
40-
<artifactId>${project.parent.artifactId}-api-2.4</artifactId>
41-
<version>${project.parent.version}</version>
42-
<scope>provided</scope>
43-
</dependency>
44-
45-
<dependency>
46-
<groupId>${project.parent.groupId}</groupId>
47-
<artifactId>${project.parent.artifactId}-api-2.3</artifactId>
48-
<version>${project.parent.version}</version>
32+
<groupId>org.openmrs.module</groupId>
33+
<artifactId>fhir2-api</artifactId>
34+
<version>${fhir2Version}</version>
4935
<scope>provided</scope>
36+
<exclusions>
37+
<exclusion>
38+
<groupId>org.openmrs.module</groupId>
39+
<artifactId>fhir2-api-2.1</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>org.openmrs.module</groupId>
43+
<artifactId>fhir2-api-2.2</artifactId>
44+
</exclusion>
45+
</exclusions>
5046
</dependency>
5147

5248
<dependency>
5349
<groupId>${project.parent.groupId}</groupId>
54-
<artifactId>${project.parent.artifactId}-api-2.3</artifactId>
55-
<version>${project.parent.version}</version>
56-
<scope>test</scope>
57-
<type>test-jar</type>
58-
</dependency>
59-
60-
<dependency>
61-
<groupId>${project.parent.groupId}</groupId>
62-
<artifactId>${project.parent.artifactId}-api-2.2</artifactId>
63-
<version>${project.parent.version}</version>
64-
<scope>provided</scope>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>${project.parent.groupId}</groupId>
69-
<artifactId>${project.parent.artifactId}-api-2.2</artifactId>
50+
<artifactId>${project.parent.artifactId}-api</artifactId>
7051
<version>${project.parent.version}</version>
7152
<scope>test</scope>
7253
<type>test-jar</type>

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import org.openmrs.module.initializer.api.CsvParser;
2424
import org.springframework.beans.factory.annotation.Autowired;
2525

26-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
26+
import static org.openmrs.module.initializer.Domain.FHIR_CONTACT_POINT_MAP;
27+
28+
@OpenmrsProfile(modules = { "fhir2:2.0.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
2729
public class FhirContactPointMapCsvParser extends CsvParser<FhirContactPointMap, BaseLineProcessor<FhirContactPointMap>> {
2830

2931
public static final String ATTRIBUTE_TYPE_DOMAIN_HEADER = "Entity name";
@@ -45,8 +47,9 @@ public class FhirContactPointMapCsvParser extends CsvParser<FhirContactPointMap,
4547
private final FhirContactPointMapService fhirContactPointMapService;
4648

4749
@Autowired
48-
protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPointMapService,BaseLineProcessor<FhirContactPointMap> lineProcessor,
49-
LocationService locationService, PersonService personService, ProviderService providerService) {
50+
protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPointMapService,
51+
BaseLineProcessor<FhirContactPointMap> lineProcessor, LocationService locationService, PersonService personService,
52+
ProviderService providerService) {
5053
super(lineProcessor);
5154
this.fhirContactPointMapService = fhirContactPointMapService;
5255
this.locationService = locationService;
@@ -58,8 +61,7 @@ protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPoi
5861
public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentException {
5962
FhirContactPointMap contactPointMap = null;
6063
if (line.getUuid() != null) {
61-
contactPointMap = fhirContactPointMapService.getFhirContactPointMapByUuid(line.getUuid())
62-
.orElse(null);
64+
contactPointMap = fhirContactPointMapService.getFhirContactPointMapByUuid(line.getUuid()).orElse(null);
6365
}
6466

6567
if (contactPointMap != null) {
@@ -74,21 +76,21 @@ public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentExcepti
7476

7577
if (personAttributeType == null) {
7678
throw new IllegalArgumentException("PersonAttributeType " + attributeType
77-
+ " does not exist. Please ensure your Initializer configuration contains this attribute type.");
79+
+ " does not exist. Please ensure your Initializer configuration contains this attribute type.");
7880
}
7981

8082
contactPointMap = fhirContactPointMapService.getFhirContactPointMapForPersonAttributeType(personAttributeType)
81-
.orElse(null);
83+
.orElse(null);
8284
} else {
8385
BaseAttributeType<?> baseAttributeType = getBaseAttributeType(attributeTypeDomain, attributeType);
8486

8587
if (baseAttributeType == null) {
8688
throw new IllegalArgumentException(
87-
"Could not find attribute type " + attributeType + " for attribute domain " + attributeTypeDomain);
89+
"Could not find attribute type " + attributeType + " for attribute domain " + attributeTypeDomain);
8890
}
8991

9092
contactPointMap = fhirContactPointMapService.getFhirContactPointMapForAttributeType(baseAttributeType)
91-
.orElse(null);
93+
.orElse(null);
9294
}
9395

9496
if (contactPointMap != null) {
@@ -97,7 +99,6 @@ public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentExcepti
9799

98100
return new FhirContactPointMap();
99101
}
100-
101102

102103
@Override
103104
public FhirContactPointMap save(FhirContactPointMap instance) {
@@ -106,7 +107,7 @@ public FhirContactPointMap save(FhirContactPointMap instance) {
106107

107108
@Override
108109
public Domain getDomain() {
109-
return Domain.FHIR_CONTACT_POINT_MAP;
110+
return FHIR_CONTACT_POINT_MAP;
110111
}
111112

112113
protected PersonAttributeType getPersonAttributeType(String attributeType) {

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@
1818

1919
import static org.openmrs.module.initializer.api.fhir.cpm.FhirContactPointMapCsvParser.ATTRIBUTE_TYPE_DOMAIN_HEADER;
2020

21-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
21+
@OpenmrsProfile(modules = { "fhir2:2.0.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
2222
public class FhirContactPointMapLineProcessor extends BaseLineProcessor<FhirContactPointMap> {
2323

2424
private static final String SYSTEM_HEADER = "system";
25+
2526
private static final String USE_HEADER = "use";
27+
2628
private static final String RANK_HEADER = "rank";
29+
2730
@Override
2831
public FhirContactPointMap fill(FhirContactPointMap instance, CsvLine line) throws IllegalArgumentException {
2932
String uuid = line.getUuid();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
1515
import org.springframework.beans.factory.annotation.Autowired;
1616

17-
@OpenmrsProfile(modules = { "fhir2:1.11.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
17+
@OpenmrsProfile(modules = { "fhir2:2.0.* - 9.*" }, openmrsPlatformVersion = "2.6.3 - 2.6.*, 2.7.* - 9.*")
1818
public class FhirContactPointMapLoader extends BaseCsvLoader<FhirContactPointMap, FhirContactPointMapCsvParser> {
1919

2020
@Autowired

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import static org.hamcrest.Matchers.is;
3333

3434
public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitive_2_6_Test {
35-
35+
3636
@Autowired
3737
private FhirContactPointMapService fhirContactPointMapService;
3838

@@ -95,13 +95,15 @@ public void loader_shouldLoadFhirContactPointMapAccordingToCSVFiles() {
9595
}
9696

9797
protected FhirContactPointMap assertPersonAttributeType(PersonAttributeType attributeType) {
98-
Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService.getFhirContactPointMapForPersonAttributeType(attributeType);
98+
Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService
99+
.getFhirContactPointMapForPersonAttributeType(attributeType);
99100
assertThat(contactPointMap.isPresent(), is(true));
100101
return contactPointMap.get();
101102
}
102103

103104
protected FhirContactPointMap assertBaseAttributeType(BaseAttributeType<?> attributeType) {
104-
Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService.getFhirContactPointMapForAttributeType(attributeType);
105+
Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService
106+
.getFhirContactPointMapForAttributeType(attributeType);
105107
assertThat(contactPointMap.isPresent(), is(true));
106108
return contactPointMap.get();
107109
}

‎pom.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
<openmrsVersion2.3>2.3.6</openmrsVersion2.3>
5757
<openmrsVersion2.4>2.4.0</openmrsVersion2.4>
5858
<openmrsVersion2.6>2.6.3-SNAPSHOT</openmrsVersion2.6>
59+
<fhir2Version1.11.0>1.11.0</fhir2Version1.11.0>
60+
<fhir2Version2.0.0>2.0.0-SNAPSHOT</fhir2Version2.0.0>
5961

6062
<openmrsPlatformVersion>${openmrsVersion2.1}</openmrsPlatformVersion>
6163

@@ -69,7 +71,7 @@
6971
<metadatasharingVersion>1.2.2</metadatasharingVersion>
7072
<metadatamappingVersion>1.3.4</metadatamappingVersion>
7173
<openconceptlabVersion>1.2.9</openconceptlabVersion>
72-
<fhir2Version>1.11.0</fhir2Version>
74+
<fhir2Version>${fhir2Version1.11.0}</fhir2Version>
7375

7476
<!-- Modules compatibility > Core 2.3.0 -->
7577
<datafilterVersion>1.0.0</datafilterVersion>
@@ -233,21 +235,21 @@
233235
<dependency>
234236
<groupId>org.openmrs.module</groupId>
235237
<artifactId>fhir2-api</artifactId>
236-
<version>${fhir2Version}</version>
238+
<version>${fhir2Version1.11.0}</version>
237239
<scope>provided</scope>
238240
</dependency>
239241

240242
<dependency>
241243
<groupId>org.openmrs.module</groupId>
242244
<artifactId>fhir2-api-2.1</artifactId>
243-
<version>${fhir2Version}</version>
245+
<version>${fhir2Version1.11.0}</version>
244246
<scope>provided</scope>
245247
</dependency>
246248

247249
<dependency>
248250
<groupId>org.openmrs.module</groupId>
249251
<artifactId>fhir2-api-2.2</artifactId>
250-
<version>${fhir2Version}</version>
252+
<version>${fhir2Version1.11.0}</version>
251253
<scope>provided</scope>
252254
</dependency>
253255

0 commit comments

Comments
 (0)