BAH-643 Upgrade dependencies and where necessary the code to java 8

.gitignore

@@ -18,3 +18,4 @@ deploy.sh
 openelis/WebContent/.sass-cache
 openElisCore.css
 OpenElis.zip
+.java-version

README.md

@@ -10,7 +10,7 @@ OpenElis
 forked from OpenElis_v3.1_r2013_02_21 branch in svn
 
 *Requirements to build OpeneLIS*
-* `java` version <= "1.7"
+* `java` version <= "1.8"
 * `ant` version <= "1.9.1"
 * `ruby` version <= "2.2" and `gem install compass`
 

build.xml

@@ -47,14 +47,14 @@
     </target>
 
 
-    <target name="compile" depends="init, java.compile,jasper.compile, compass.compile"
+    <target name="compile" depends="init, java.compile, jasper.compile, compass.compile"
         description="compile the source ">
     </target>
 
     <target name="java.compile"
             description="compile the source ">
         <mkdir dir="${target}"/>
-        <javac srcdir="${src}" destdir="${target}" encoding="iso-8859-1" classpathref="lib" source="1.7" target="1.7" debug="on"/>
+        <javac srcdir="${src}" destdir="${target}" encoding="iso-8859-1" classpathref="lib" source="1.8" target="1.8" debug="on"/>
         <copy todir="${target}">
             <fileset dir="${src}" includes="**/*.xml"/>
             <fileset dir="${src}" includes="**/*.properties"/>

openelis/src/us/mn/state/health/lims/common/provider/reports/ResultsReportProvider.java

@@ -170,17 +170,17 @@ public boolean processRequest(Map parameters, HttpServletRequest request,
 
 			//turn subreport jasper files into JasperReport objects to pass in as parameters
 			JasperReport providerDetailsReport = (JasperReport) JRLoader
-					.loadObject(providerDetailsReportFile.getPath());
+					.loadObject(providerDetailsReportFile);
 			JasperReport projectDetailsReport = (JasperReport) JRLoader
-					.loadObject(projectDetailsReportFile.getPath());
+					.loadObject(projectDetailsReportFile);
 			JasperReport sourceTypeDetailsReport = (JasperReport) JRLoader
-					.loadObject(sourceTypeDetailsReportFile.getPath());
+					.loadObject(sourceTypeDetailsReportFile);
 			JasperReport patientDetailsReport = (JasperReport) JRLoader
-					.loadObject(patientDetailsReportFile.getPath());
+					.loadObject(patientDetailsReportFile);
 			JasperReport testResultsReport = (JasperReport) JRLoader
-					.loadObject(testResultsReportFile.getPath());
+					.loadObject(testResultsReportFile);
 			JasperReport resultValueReport = (JasperReport) JRLoader
-					.loadObject(resultValueReportFile.getPath());
+					.loadObject(resultValueReportFile);
 
 			parameters.put("Provider_Details", providerDetailsReport);
 			parameters.put("Project_Details", projectDetailsReport);

openelis/src/us/mn/state/health/lims/dashboard/daoimpl/OrderListDAOHelper.java

@@ -245,7 +245,7 @@ private Order getOrderWithPriority(ResultSet accessionResultSet, String comments
                 accessionResultSet.getBoolean("is_printed"),
                 accessionResultSet.getInt("pending_tests_count"),
                 accessionResultSet.getInt("pending_validation_count"),
-                accessionResultSet.getInt("referred_test_count"),
+                accessionResultSet.getInt("referred_tests_count"),
                 accessionResultSet.getInt("total_test_count"),
                 accessionResultSet.getDate("collection_date"),
                 accessionResultSet.getDate("entered_date"),

openelis/src/us/mn/state/health/lims/reports/action/CommonReportPrintAction.java

@@ -33,7 +33,7 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
+import java.util.Map;
 
 public class CommonReportPrintAction extends BaseAction {
 
@@ -58,7 +58,7 @@ protected ActionForward performAction(ActionMapping mapping, ActionForm form, Ht
 			reportCreator.initializeReport(dynaForm);
 			reportCreator.setReportPath(getReportPath());
 
-			HashMap<String, String> parameterMap = (HashMap<String, String>) reportCreator.getReportParameters();
+			Map<String, Object> parameterMap = reportCreator.getReportParameters();
 			parameterMap.put("SUBREPORT_DIR", getReportPath());
 
 			try {

openelis/src/us/mn/state/health/lims/reports/action/implementation/CollectionReport.java

@@ -22,9 +22,11 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.Collections;
 
 import net.sf.jasperreports.engine.JasperRunManager;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
@@ -68,15 +70,15 @@ public void initializeReport(BaseActionForm dynaForm) {
 	}
 
 	@Override
-	public HashMap<String, ?> getReportParameters() throws IllegalStateException {
-		return new HashMap<String, String>();
+	public Map<String, Object> getReportParameters() throws IllegalStateException {
+		return Collections.emptyMap();
 	}
 
 	@Override
 	public byte[] runReport() throws Exception {
 		List<byte[]> byteList = generateReports();
 		if (byteList.isEmpty()) {
-			HashMap<String, String> parameterMap = new HashMap<String, String>();
+			HashMap<String, Object> parameterMap = new HashMap<String, Object>();
 			parameterMap.put("SUBREPORT_DIR", reportPath);
 			parameterMap.put("directorName", ConfigurationProperties.getInstance().getPropertyValue(Property.labDirectorName));
 			List<ErrorMessages> errorMsgs = new ArrayList<ErrorMessages>();
@@ -150,7 +152,7 @@ protected byte[] createReport(String reportName) {
 			reportCreator.setReportPath(reportPath);
 
 			@SuppressWarnings("unchecked")
-			HashMap<String, String> parameterMap = (HashMap<String, String>) reportCreator.getReportParameters();
+			Map<String, Object> parameterMap = reportCreator.getReportParameters();
 			parameterMap.put("SUBREPORT_DIR", reportPath);
 			handledOrders.addAll(reportCreator.getReportedOrders());
 			try {

openelis/src/us/mn/state/health/lims/reports/action/implementation/IReportCreator.java

@@ -16,7 +16,7 @@
 */
 package us.mn.state.health.lims.reports.action.implementation;
 
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import us.mn.state.health.lims.common.action.BaseActionForm;
@@ -31,7 +31,7 @@ public interface IReportCreator {
 	public String getContentType();
 	public String getResponseHeaderName();
 	public String getResponseHeaderContent();
-	public HashMap<String, ?> getReportParameters() throws IllegalStateException;
+	public Map<String, Object> getReportParameters() throws IllegalStateException;
 	public byte[] runReport( ) throws Exception;
 	public void setReportPath( String path);
 	public List<String> getReportedOrders();

openelis/src/us/mn/state/health/lims/reports/action/implementation/IndicatorSectionPerformanceReport.java

@@ -107,8 +107,8 @@ public JRDataSource getReportDataSource() throws IllegalStateException {
 		return new JRBeanCollectionDataSource(reportItems);
 	}
 
-	public HashMap<String, ?> getReportParameters() throws IllegalStateException {
-		return new HashMap<String, String>();
+	public Map<String, Object> getReportParameters() throws IllegalStateException {
+		return Collections.emptyMap();
 	}
 
 	public void initializeReport(BaseActionForm dynaForm) {
@@ -226,7 +226,7 @@ private void addIntakeItems() throws LIMSInvalidConfigurationException {
 		List<ObservationHistory> initialRegisteredList = observationHistoryDAO.getObservationHistoryByDictonaryValues(initialRegisteredID);
 
 		fillDataForRecords(notRegisteredList, "Pas d'inscription initiale");
-		fillDataForRecords(initialRegisteredList, "Entr�e non valid�");
+		fillDataForRecords(initialRegisteredList, "Entr�e non valid�");
 	}
 
 	private void fillDataForRecords(List<ObservationHistory> observationList, String category) throws LIMSInvalidConfigurationException {

openelis/src/us/mn/state/health/lims/reports/action/implementation/PatientIndeterminateByLocationReport.java

@@ -17,7 +17,7 @@
 package us.mn.state.health.lims.reports.action.implementation;
 
 
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import net.sf.jasperreports.engine.JRDataSource;
@@ -116,7 +116,7 @@ protected void createReportItems() {
         reportPatient = null;
     }
 
-    public HashMap<String, ?> getReportParameters() throws IllegalStateException {
+    public Map<String, Object> getReportParameters() throws IllegalStateException {
         return super.getReportParameters();
     }
     public JRDataSource getReportDataSource() throws IllegalStateException {

openelis/src/us/mn/state/health/lims/reports/action/implementation/Report.java

@@ -118,7 +118,7 @@ public byte[] runReport( ) throws Exception {
      */
     public abstract JRDataSource getReportDataSource() throws IllegalStateException;
 
-    public HashMap<String, ?> getReportParameters() throws IllegalStateException {
+    public Map<String, Object> getReportParameters() throws IllegalStateException {
         if (!initialized) {
             throw new IllegalStateException("initializeReport not called first");
         }

openelis/src/us/mn/state/health/lims/workplan/action/PrintWorkplanReportAction.java

@@ -19,6 +19,7 @@
 
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import javax.servlet.ServletOutputStream;
@@ -81,7 +82,7 @@ protected ActionForward performAction(ActionMapping mapping, ActionForm form, Ht
 		workplanReport = getWorkplanReport(workplanType, workplanName);
 
 		//set jasper report parameters
-		HashMap<String, ?> parameterMap = workplanReport.getParameters();
+		Map<String, Object> parameterMap = workplanReport.getParameters();
 
 		//prepare report
 		List<?> workplanRows = workplanReport.prepareRows(dynaForm);
@@ -173,4 +174,4 @@ public IWorkplanReport getWorkplanReport(String testType, String name) {
 
 
 }
-
+	

openelis/src/us/mn/state/health/lims/workplan/reports/ElisaWorkplanReport.java

@@ -18,6 +18,7 @@
 package us.mn.state.health.lims.workplan.reports;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import us.mn.state.health.lims.common.action.BaseActionForm;
@@ -41,7 +42,7 @@ public String getFileName() {
 		return fileName;
 	}
 
-	public HashMap<String, Object> getParameters() {
+	public Map<String, Object> getParameters() {
 		parameterMap.put("testSection", testSection);
 		return parameterMap;	
 

openelis/src/us/mn/state/health/lims/workplan/reports/IWorkplanReport.java

@@ -18,15 +18,15 @@
 
 package us.mn.state.health.lims.workplan.reports;
 
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import us.mn.state.health.lims.common.action.BaseActionForm;
 import us.mn.state.health.lims.test.beanItems.TestResultItem;
 
 public interface IWorkplanReport {
 
-    public HashMap<String, ?> getParameters();
+    public Map<String, Object> getParameters();
 
     public String getFileName();
 

openelis/test/org/bahmni/feed/openelis/feed/event/EncounterFeedWorkerTest.java

@@ -1,14 +1,14 @@
 package org.bahmni.feed.openelis.feed.event;
 
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.bahmni.feed.openelis.feed.contract.openmrs.encounter.OpenMRSEncounter;
 import org.bahmni.feed.openelis.utils.AuditingService;
 import org.bahmni.webclients.HttpClient;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import us.mn.state.health.lims.login.daoimpl.LoginDAOImpl;
@@ -24,17 +24,16 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Logger.class, EncounterFeedWorker.class})
-public class EncounterFeedWorkerTest {
+@PowerMockIgnore("javax.management.*")
+public class
+EncounterFeedWorkerTest {
 
     @Mock
     private HttpClient httpClient;
 
     @Mock
     private OpenMRSEncounter openMRSEncounter;
 
-    @Mock
-    private Logger logger;
-
     @Mock
     private LoginDAOImpl loginDAO;
 
@@ -60,9 +59,7 @@ public void setUp() throws Exception {
         whenNew(SiteInformationDAOImpl.class).withNoArguments().thenReturn(siteInformationDAO);
         whenNew(AuditingService.class).withArguments(loginDAO, siteInformationDAO).thenReturn(auditingService);
 
-        when(LogManager.getLogger(EncounterFeedWorker.class)).thenReturn(logger);
         when(openMRSEncounter.getEncounterUuid()).thenReturn("encounter uuid");
-        doNothing().when(logger).info("Processing encounter with ID='encounter uuid'");
         when(auditingService.getSysUserId()).thenReturn("1");
     }