build

mekomsolutions · Nov 24, 2023 · f3907bf · f3907bf
1 parent 80cd1ff
commit f3907bf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/...c/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java b/...c/main/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapCsvParser.java
@@ -47,8 +47,9 @@ public class FhirContactPointMapCsvParser extends CsvParser<FhirContactPointMap,
 	private final FhirContactPointMapService fhirContactPointMapService;
 
 	@Autowired
-	protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPointMapService,BaseLineProcessor<FhirContactPointMap> lineProcessor,
-			LocationService locationService, PersonService personService, ProviderService providerService) {
+	protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPointMapService,
+	    BaseLineProcessor<FhirContactPointMap> lineProcessor, LocationService locationService, PersonService personService,
+	    ProviderService providerService) {
 		super(lineProcessor);
 		this.fhirContactPointMapService = fhirContactPointMapService;
 		this.locationService = locationService;
@@ -60,8 +61,7 @@ protected FhirContactPointMapCsvParser(FhirContactPointMapService fhirContactPoi
 	public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentException {
 		FhirContactPointMap contactPointMap = null;
 		if (line.getUuid() != null) {
-			contactPointMap = fhirContactPointMapService.getFhirContactPointMapByUuid(line.getUuid())
-					.orElse(null);
+			contactPointMap = fhirContactPointMapService.getFhirContactPointMapByUuid(line.getUuid()).orElse(null);
 		}
 
 		if (contactPointMap != null) {
@@ -76,21 +76,21 @@ public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentExcepti
 
 			if (personAttributeType == null) {
 				throw new IllegalArgumentException("PersonAttributeType " + attributeType
-						+ " does not exist. Please ensure your Initializer configuration contains this attribute type.");
+				        + " does not exist. Please ensure your Initializer configuration contains this attribute type.");
 			}
 
 			contactPointMap = fhirContactPointMapService.getFhirContactPointMapForPersonAttributeType(personAttributeType)
-					.orElse(null);
+			        .orElse(null);
 		} else {
 			BaseAttributeType<?> baseAttributeType = getBaseAttributeType(attributeTypeDomain, attributeType);
 
 			if (baseAttributeType == null) {
 				throw new IllegalArgumentException(
-						"Could not find attribute type " + attributeType + " for attribute domain " + attributeTypeDomain);
+				        "Could not find attribute type " + attributeType + " for attribute domain " + attributeTypeDomain);
 			}
 
 			contactPointMap = fhirContactPointMapService.getFhirContactPointMapForAttributeType(baseAttributeType)
-					.orElse(null);
+			        .orElse(null);
 		}
 
 		if (contactPointMap != null) {
@@ -99,7 +99,6 @@ public FhirContactPointMap bootstrap(CsvLine line) throws IllegalArgumentExcepti
 
 		return new FhirContactPointMap();
 	}
-
 
 	@Override
 	public FhirContactPointMap save(FhirContactPointMap instance) {

diff --git a/...in/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java b/...in/java/org/openmrs/module/initializer/api/fhir/cpm/FhirContactPointMapLineProcessor.java
@@ -24,8 +24,11 @@
 public class FhirContactPointMapLineProcessor extends BaseLineProcessor<FhirContactPointMap> {
 
 	private static final String SYSTEM_HEADER = "system";
+
 	private static final String USE_HEADER = "use";
+
 	private static final String RANK_HEADER = "rank";
+
 	@Override
 	public FhirContactPointMap fill(FhirContactPointMap instance, CsvLine line) throws IllegalArgumentException {
 		String uuid = line.getUuid();

diff --git a/...st/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java b/...st/java/org/openmrs/module/initializer/api/FhirPatientContactPointMapIntegrationTest.java
@@ -32,7 +32,7 @@
 import static org.hamcrest.Matchers.is;
 
 public class FhirPatientContactPointMapIntegrationTest extends DomainBaseModuleContextSensitive_2_6_Test {
-
+	
 	@Autowired
 	private FhirContactPointMapService fhirContactPointMapService;
 
@@ -137,13 +137,15 @@ public void loader_shouldLoadFhirContactPointMapAccordingToCSVFiles() {
 	}
 
 	protected FhirContactPointMap assertPersonAttributeType(PersonAttributeType attributeType) {
-		Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService.getFhirContactPointMapForPersonAttributeType(attributeType);
+		Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService
+		        .getFhirContactPointMapForPersonAttributeType(attributeType);
 		assertThat(contactPointMap.isPresent(), is(true));
 		return contactPointMap.get();
 	}
 
 	protected FhirContactPointMap assertBaseAttributeType(BaseAttributeType<?> attributeType) {
-		Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService.getFhirContactPointMapForAttributeType(attributeType);
+		Optional<FhirContactPointMap> contactPointMap = fhirContactPointMapService
+		        .getFhirContactPointMapForAttributeType(attributeType);
 		assertThat(contactPointMap.isPresent(), is(true));
 		return contactPointMap.get();
 	}

diff --git a/api-2.6/src/test/java/org/openmrs/module/initializer/api/LoadersOrderTest.java b/api-2.6/src/test/java/org/openmrs/module/initializer/api/LoadersOrderTest.java
@@ -32,7 +32,6 @@ public class LoadersOrderTest extends DomainBaseModuleContextSensitive_2_6_Test
 	public void getLoaders_shouldBeUnequivocallyOrdered() {
 		Loader previousLoader = null;
 
-
 		List<Loader> loaders = applicationContext.getBeansOfType(Loader.class).values().stream().sorted()
 		        .collect(Collectors.toList());
 
@@ -47,7 +46,7 @@ public void getLoaders_shouldBeUnequivocallyOrdered() {
 
 		List<Loader> runtimeLoaders = getService().getLoaders();
 		assertThat(runtimeLoaders, everyItem(hasExpectedDomain()));
-
+		
 		assertThat(runtimeLoaders, coversAllDomains());
 	}