EA-205: Support loading dispositionConfig.json from the file system b…

api-reporting/src/test/java/org/openmrs/module/emrapi/adt/reporting/evaluator/AwaitingAdmissionVisitQueryEvaluatorTest.java

@@ -67,6 +67,7 @@ public class AwaitingAdmissionVisitQueryEvaluatorTest extends BaseReportingTest
     @Before
     public void setup() throws Exception {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
         dispositionDescriptor = ContextSensitiveMetadataTestUtils.setupDispositionDescriptor(conceptService, dispositionService);
         ContextSensitiveMetadataTestUtils.setupAdmissionDecisionConcept(conceptService, emrApiProperties);
         query = new AwaitingAdmissionVisitQuery();

api-reporting/src/test/java/org/openmrs/module/emrapi/adt/reporting/evaluator/MostRecentAdmissionRequestVisitDataEvaluatorTest.java

@@ -67,6 +67,7 @@ public class MostRecentAdmissionRequestVisitDataEvaluatorTest extends BaseReport
     @Before
     public void setup() throws Exception {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
         def = new MostRecentAdmissionRequestVisitDataDefinition();
         dispositionDescriptor = ContextSensitiveMetadataTestUtils.setupDispositionDescriptor(conceptService, dispositionService);
         diagnosisMetadata = ContextSensitiveMetadataTestUtils.setupDiagnosisMetadata(conceptService, emrApiProperties);

api/src/main/java/org/openmrs/module/emrapi/disposition/DispositionServiceImpl.java

@@ -30,7 +30,7 @@ public class DispositionServiceImpl extends BaseOpenmrsService implements Dispos
 
     private PathMatchingResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
 
-    // TODO inject this in some better way than using a setter to override?
+    // can also be overwritten by Iniz
     private String dispositionConfig = "dispositionConfig.json";
 
     public DispositionServiceImpl(ConceptService conceptService, EmrConceptService emrConceptService) {
@@ -176,12 +176,15 @@ private List<Disposition> getDispositionsFrom(String configFile)  {
 
             String path;
 
-            if (configFile.indexOf("file:") == -1) {
+            if (!configFile.startsWith("file:")) {  // this is a classpath resource
                 path  = "classpath*:/" + configFile;
             }
-            else {
+            else if (!configFile.startsWith("file:/")) {  // this is a non-absolute file reference, so we need to prepend the application data directory
                 path = "file:" + OpenmrsUtil.getApplicationDataDirectory() + "/" + configFile.replace("file:","");
             }
+            else {  // this is an absolute file reference
+                path = configFile;
+            }
 
             Resource[] dispositionDefinitions = resourceResolver.getResources(path);
             for (Resource dispositionDefinition : dispositionDefinitions) {

api/src/test/java/org/openmrs/module/emrapi/adt/AdtServiceComponentTest.java

@@ -45,7 +45,6 @@
 import org.openmrs.module.emrapi.disposition.DispositionService;
 import org.openmrs.module.emrapi.test.ContextSensitiveMetadataTestUtils;
 import org.openmrs.module.emrapi.visit.VisitDomainWrapper;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -108,6 +107,7 @@ public boolean evaluate(Object o) {
     @Before
     public void setUp() throws Exception {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
     }
 
     @Test

api/src/test/java/org/openmrs/module/emrapi/adt/AdtServiceImplTest.java

@@ -72,6 +72,7 @@ public class AdtServiceImplTest extends EmrApiContextSensitiveTest {
     @Before
     public void setup() throws Exception {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
         dispositionDescriptor = ContextSensitiveMetadataTestUtils.setupDispositionDescriptor(conceptService, dispositionService);
         ContextSensitiveMetadataTestUtils.setupAdmissionDecisionConcept(conceptService, emrApiProperties);
         visitLocation = testDataManager.location().name("Hospital").tag("Visit Location").save();

api/src/test/java/org/openmrs/module/emrapi/disposition/DispositionServiceTest.java

@@ -56,6 +56,7 @@ public void setUp(){
 
         dispositionService = new DispositionServiceImpl(concertService, emrConceptService);
         dispositionService.setDispositionDescriptor(dispositionDescriptor);
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
     }
 
     @Test

api/src/test/java/org/openmrs/module/emrapi/maternal/MaternalServiceImplTest.java

@@ -61,6 +61,7 @@ public class MaternalServiceImplTest extends EmrApiContextSensitiveTest {
     @Before
     public void setUp() {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
         ContextSensitiveMetadataTestUtils.setupDispositionDescriptor(conceptService, dispositionService);
         ContextSensitiveMetadataTestUtils.setupAdmissionDecisionConcept(conceptService, emrApiProperties);
     }

api/src/test/java/org/openmrs/module/emrapi/visit/VisitDomainWrapperComponentTest.java

@@ -71,6 +71,7 @@ public class VisitDomainWrapperComponentTest extends EmrApiContextSensitiveTest
     @Before
     public void setup() throws Exception {
         executeDataSet("baseTestDataset.xml");
+        dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
         dispositionDescriptor = ContextSensitiveMetadataTestUtils.setupDispositionDescriptor(conceptService, dispositionService);
         ContextSensitiveMetadataTestUtils.setupAdmissionDecisionConcept(conceptService, emrApiProperties);
         ContextSensitiveMetadataTestUtils.setupDiagnosisMetadata(conceptService, emrApiProperties);

omod/src/test/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationControllerTest.java

@@ -51,6 +51,7 @@ public class EmrApiConfigurationControllerTest extends BaseModuleWebContextSensi
 	@Before
 	public void setUp() {
 		executeDataSet("baseTestDataset.xml");
+		dispositionService.setDispositionConfig("testDispositionConfig.json"); // use demo disposition config from test resources
 		request = new MockHttpServletRequest();
 		response = new MockHttpServletResponse();
 	}