Update to Platform 2.7.0 and Support Java 21

Revert PropertiesType

Annotate ReportingSerializer as a Component

Convert org.openmrs.Cohort cohort to  org.openmrs.cohort.Cohort

Update UserType sub classes

Add scope to reportingcompatibility-api

Remove deprecated tests

Fix test errors

Make powermock an exclusion

Remove XStream sub modules

org.mockito.ArgumentMatchers.argThat;

Update Xstream

Remove groovy

Remove profiles

Remove jackson

Update the Java version to 8

Update maven.yml

Update all sub modules

Update 1.9 and 2.0

Update surefire-plugin

Author: wikumChamith

.github/workflows/maven.yml

@@ -13,8 +13,7 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        java-version: [ 8 ]
-        profile: [ 1.10, 1.11, 1.12, 2.0, 2.1, 2.2, 2.3, 2.4 ]
+        java-version: [ 8, 11, 17, 21, 24 ]
 
     runs-on: ${{ matrix.platform }}
     env:
@@ -36,5 +35,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Build with Maven
-        run: mvn clean install -P ${{ matrix.profile }} --batch-mode --show-version --file pom.xml
+        run: mvn clean install --batch-mode --show-version --file pom.xml
 

api-1.10/pom.xml

@@ -13,7 +13,7 @@
     <description>1.10 api project for reporting</description>
 
     <properties>
-        <openMRSVersion>1.10.6</openMRSVersion>
+        <openMRSVersion>2.7.0</openMRSVersion>
     </properties>
 
     <dependencies>
@@ -45,6 +45,16 @@
             <type>test-jar</type>            
             <version>${openMRSVersion}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito2</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -53,6 +63,16 @@
             <version>${openMRSVersion}</version>
             <type>pom</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.powermock</groupId>
+                    <artifactId>powermock-api-mockito2</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

api-1.10/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/DrugOrderCohortDefinitionEvaluator.java

@@ -10,7 +10,6 @@
 
 package org.openmrs.module.reporting.cohort.definition.evaluator;
 
-import org.apache.commons.lang3.time.DateUtils;
 import org.openmrs.Cohort;
 import org.openmrs.DrugOrder;
 import org.openmrs.module.reporting.cohort.definition.CohortDefinition;
@@ -25,7 +24,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
-import java.util.Date;
 
 @Handler(supports = { DrugOrderCohortDefinition.class })
 public class DrugOrderCohortDefinitionEvaluator implements CohortDefinitionEvaluator {

api-1.10/src/test/resources/org/openmrs/module/reporting/include/DrugOrderCohortEvaluationData.xml

@@ -74,10 +74,10 @@
   <patient patient_id="24" creator="1" date_created="2009-01-18 00:00:00.0" voided="false" void_reason=""/> 
   <patient patient_id="999" creator="1" date_created="2006-01-18 00:00:00.0" changed_by="1" date_changed="2008-08-18 12:24:34.0" voided="true" void_reason="For test purposes"/>
 
-  <patient_identifier_type patient_identifier_type_id="1" name="OpenMRS Identification Number" description="Unique number used in OpenMRS" format="" check_digit="true" creator="1" date_created="2005-09-22 00:00:00.0" required="false" validator="org.openmrs.patient.impl.LuhnIdentifierValidator" retired="false" uuid="1a339fe9-38bc-4ab3-b180-320988c0b968"/>
+  <patient_identifier_type patient_identifier_type_id="1" name="OpenMRS Identification Number" description="Unique number used in OpenMRS" format="" creator="1" date_created="2005-09-22 00:00:00.0" required="false" validator="org.openmrs.patient.impl.LuhnIdentifierValidator" retired="false" uuid="1a339fe9-38bc-4ab3-b180-320988c0b968"/>
  <patient_identifier patient_identifier_id="4" patient_id="7" identifier="6TS-4" identifier_type="1" preferred="0" location_id="1" creator="1" date_created="2006-01-18 00:00:00.0" voided="false" void_reason="" uuid="489edb7f-0786-4726-88a3-f0fcd2505d1a"/>  
-  <patient_identifier_type patient_identifier_type_id="2" name="Old Identification Number" description="Number given out prior to the OpenMRS system (No check digit)" format="" check_digit="false" creator="1" date_created="2005-09-22 00:00:00.0" required="false" retired="false" uuid="2f470aa8-1d73-43b7-81b5-01f0c0dfa53c"/>
-  <patient_identifier_type patient_identifier_type_id="4" name="Social Security Number" description="Soc security ID" format="" check_digit="false" creator="1" date_created="2008-08-15 15:59:20.0" required="false" format_description="" validator="" retired="true" retired_by="1" date_retired="2008-08-15 00:00:00.0" retire_reason="test" uuid="158d6b17-a8ab-435b-8fe3-952a04bda757"/>
+  <patient_identifier_type patient_identifier_type_id="2" name="Old Identification Number" description="Number given out prior to the OpenMRS system (No check digit)" format=""  creator="1" date_created="2005-09-22 00:00:00.0" required="false" retired="false" uuid="2f470aa8-1d73-43b7-81b5-01f0c0dfa53c"/>
+  <patient_identifier_type patient_identifier_type_id="4" name="Social Security Number" description="Soc security ID" format=""  creator="1" date_created="2008-08-15 15:59:20.0" required="false" format_description="" validator="" retired="true" retired_by="1" date_retired="2008-08-15 00:00:00.0" retire_reason="test" uuid="158d6b17-a8ab-435b-8fe3-952a04bda757"/>
 
   <patient_identifier patient_identifier_id="1" patient_id="2" identifier="101" identifier_type="2" preferred="0" location_id="1" creator="1" date_created="2005-09-22 00:00:00.0" voided="false" void_reason="" uuid="ff41928c-3bca-48d9-a4dc-9198f6b2873b"/>
   <patient_identifier patient_identifier_id="2" patient_id="2" identifier="101-6" identifier_type="1" preferred="1" location_id="1" creator="1" date_created="2005-09-22 00:00:00.0" voided="false" void_reason="" uuid="8a9aac6e-3f9f-4ed2-8fb5-25215f8bb614"/>

api-1.9/pom.xml

@@ -13,7 +13,7 @@
     <description>1.9 api project for reporting</description>
 
     <properties>
-        <openMRSVersion>1.9.9</openMRSVersion>
+        <openMRSVersion>2.7.0</openMRSVersion>
     </properties>
 
     <dependencies>
@@ -47,6 +47,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>reportingcompatibility-api</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

api-1.9/src/main/java/org/openmrs/module/reporting/dataset/definition/evaluator/DataExportDataSetEvaluator.java

@@ -36,57 +36,77 @@
 @Handler(supports={DataExportDataSetDefinition.class})
 @SuppressWarnings("deprecation")
 public class DataExportDataSetEvaluator implements DataSetEvaluator {
-	
+
 	private Log log = LogFactory.getLog(this.getClass());
-	
+
 	/**
 	 * Public constructor
 	 */
-	public DataExportDataSetEvaluator() {} 
-	
+	public DataExportDataSetEvaluator() {}
+
     /**
      * @see DataSetEvaluator#evaluate(DataSetDefinition, EvaluationContext)
      * @should evaluate a DataExportDataSetDefinition
      */
 	public DataSet evaluate(DataSetDefinition definition, EvaluationContext context) {
-		
+
 		context = ObjectUtil.nvl(context, new EvaluationContext());
 		SimpleDataSet dataSet = new SimpleDataSet(definition, context);
 		try {
 			DataExportDataSetDefinition dataExportDefinition = (DataExportDataSetDefinition) definition;
 			DataExportReportObject dataExport = dataExportDefinition.getDataExport();
-			DataExportUtil.generateExport(dataExport, context.getBaseCohort(), null);
-			
+			DataExportUtil.generateExport(dataExport, convertCohort(context.getBaseCohort()), null);
+
 			File dataFile = DataExportUtil.getGeneratedFile(dataExportDefinition.getDataExport());
 
-			// Get contents as a string 
+			// Get contents as a string
 			// TODO Test whether this is faster than another approach
-			String contents = OpenmrsUtil.getFileAsString(dataFile);		
+			String contents = OpenmrsUtil.getFileAsString(dataFile);
 			String [] rows = contents.split("\\n");
-	
-			// Get column names 
+
+			// Get column names
 			String [] columns = rows[0].split("\\t");
 			Map<String, DataSetColumn> cols = new HashMap<String, DataSetColumn>();
 			for (String s : columns) {
 				DataSetColumn c = new DataSetColumn(s, s, String.class);
 				cols.put(s, c);
 				dataSet.getMetaData().addColumn(c);
 			}
-	
+
 			// Iterate over remaining rows
-			for (int i=1; i<rows.length;i++) { 
+			for (int i=1; i<rows.length;i++) {
 				DataSetRow row = new DataSetRow();
 				String [] cells = rows[i].split("\\t");
-				for (int j=0; j<cells.length; j++) { 	
+				for (int j=0; j<cells.length; j++) {
 					row.addColumnValue(cols.get(columns[j]), cells[j]);
 				}
-				dataSet.addRow(row);	
+				dataSet.addRow(row);
 			}
-		} 
+		}
 		catch (Exception e) {
 			log.error("An error occurred while generating a data export.", e);
 			throw new RuntimeException("An error occurred while generating a data export.", e);
 		}
 		return dataSet;
 	}
+
+    private org.openmrs.cohort.Cohort convertCohort(org.openmrs.Cohort cohort) {
+        org.openmrs.cohort.Cohort c = new org.openmrs.cohort.Cohort();
+        c.setCohortId(cohort.getId());
+        c.setName(cohort.getName());
+        c.setDescription(cohort.getDescription());
+        c.setMemberIds(cohort.getMemberIds());
+
+        c.setUuid(cohort.getUuid());
+        c.setCreator(cohort.getCreator());
+        c.setDateCreated(cohort.getDateCreated());
+        c.setChangedBy(cohort.getChangedBy());
+        c.setDateChanged(cohort.getDateChanged());
+        c.setVoided(cohort.getVoided());
+        c.setVoidedBy(cohort.getVoidedBy());
+        c.setDateVoided(cohort.getDateVoided());
+        c.setVoidReason(cohort.getVoidReason());
+
+        return c;
+    }
 }