#320 - Displays pre-loader should only run if there are display heade… (#321)

Author: mseaton

README.md

@@ -230,6 +230,7 @@ See the [documentation on Initializer's logging properties](readme/rtprops.md#lo
 #### version 2.12.0
 * Fix conceptsets domain to prevent incorrect unretiring of associated concept
 * Fix to ensure concept lookups correctly handle concepts with % characters
+* Fix for performance to only process displays preloaders if they are present within csvs
 
 #### Version 2.11.0
 * Added support for patient flags (flags, flagpriorities, flagtags) domains

api-bahmni/pom.xml

@@ -118,7 +118,7 @@
 				                <resource>
 				                    <directory>../api/src/test/resources</directory>
 				                    <excludes>
-				                        <exclude>../api/src/test/resources/test-hibernate.cfg.xml</exclude>
+                                        <exclude>test-hibernate.cfg.xml</exclude>
 				                    </excludes>
 				                </resource>
 				            </resources>

api-bahmni/src/test/resources/test-hibernate.cfg.xml

@@ -5,6 +5,41 @@
 
 <hibernate-configuration>
     <session-factory>
+        <!-- AH -->
+        <mapping resource="AddressHierarchyLevel.hbm.xml"/>
+        <mapping resource="AddressHierarchyEntry.hbm.xml"/>
+        <!-- MDS -->
+        <mapping resource="ImportedItem.hbm.xml"/>
+        <mapping resource="ImportedPackage.hbm.xml"/>
+        <!-- Htmlformentry -->
+        <mapping resource="HtmlFormEntryHtmlForm.hbm.xml"/>
+        <!-- Idgen -->
+        <mapping resource="IdentifierSource.hbm.xml"/>
+        <!-- MetadataMapping -->
+        <mapping resource="MetadataSource.hbm.xml"/>
+        <mapping resource="MetadataTermMapping.hbm.xml"/>
+        <mapping resource="MetadataSet.hbm.xml"/>
+        <mapping resource="MetadataSetMember.hbm.xml"/>
+        <!-- Bahmni Appointments -->
+        <mapping resource="Speciality.hbm.xml"/>
+        <mapping resource="AppointmentServiceDefinition.hbm.xml"/>
+        <mapping resource="ServiceWeeklyAvailability.hbm.xml"/>
+        <mapping resource="AppointmentServiceType.hbm.xml"/>
+        <!-- Reporting  - For Validator -->
+        <mapping resource="ReportDesign.hbm.xml"/>
+        <!-- Provider Management -->
+        <mapping resource="ProviderRole.hbm.xml"/>
+        <!-- Cohort -->
+        <mapping resource="CohortAttributeType.hbm.xml"/>
+        <mapping resource="CohortAttribute.hbm.xml"/>
+        <mapping resource="CohortMemberAttribute.hbm.xml"/>
+        <mapping resource="CohortMemberAttributeType.hbm.xml"/>
+        <!-- Patient Flags -->
+        <mapping resource="DisplayPoint.hbm.xml"/>
+        <mapping resource="Flag.hbm.xml"/>
+        <mapping resource="Priority.hbm.xml"/>
+        <mapping resource="Tag.hbm.xml"/>
+        <mapping resource="PatientFlag.hbm.xml"/>
         <!-- Bahmni Core -->
         <mapping resource="ProgramAttributeType.hbm.xml"/>
     </session-factory>

api/src/main/java/org/openmrs/module/initializer/api/display/DisplaysPreLoader.java

@@ -3,10 +3,18 @@
 import org.openmrs.OpenmrsObject;
 import org.openmrs.module.initializer.api.BaseLineProcessor;
 import org.openmrs.module.initializer.api.CsvParser;
+import org.openmrs.module.initializer.api.c.LocalizedHeader;
 import org.openmrs.module.initializer.api.loaders.BaseCsvLoader;
+import org.openmrs.module.initializer.api.utils.IgnoreBOMInputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import static org.openmrs.module.initializer.api.display.DisplayLineProcessor.HEADER_DISPLAY;
+
 @Component
 public class DisplaysPreLoader extends BaseCsvLoader<OpenmrsObject, DisplaysCsvParser> {
 
@@ -40,4 +48,14 @@ public void setBootstrapParser(
 		this.parser.setBootstrapParser(parser);
 	}
 
+	@Override
+	public void load(File file) throws Exception {
+		try (InputStream is = new IgnoreBOMInputStream(new FileInputStream(file))) {
+			final CsvParser<OpenmrsObject, BaseLineProcessor<OpenmrsObject>> parser = getParser(is);
+			LocalizedHeader lh = LocalizedHeader.getLocalizedHeader(parser.getHeaderLine(), HEADER_DISPLAY);
+			if (lh != null && !lh.getLocales().isEmpty()) {
+				super.load(file);
+			}
+		}
+	}
 }

api/src/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitiveTest.java

@@ -153,7 +153,7 @@ protected void initModules() {
 		{
 			try {
 				Class.forName("org.bahmni.module.bahmnicore.Activator");
-				Module mod = new Module("", "bahmnicore", "", "", "", "0.94-SNAPSHOT");
+				Module mod = new Module("", "bahmnicore", "", "", "", "0.93-1.1.0");
 				mod.setFile(new File(""));
 				ModuleFactory.getStartedModulesMap().put(mod.getModuleId(), mod);
 			}