Skip to content

Commit adc7cc5

Browse files
wikumChamithwikumChamith
committed
Migrate to 2.4.0
1 parent 5419198 commit adc7cc5

File tree

21 files changed

+109
-274
lines changed

21 files changed

+109
-274
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
matrix:
1515
platform: [ ubuntu-latest ]
1616
java-version: [ 8 ]
17-
profile: [ 1.10, 1.11, 1.12, 2.0, 2.1, 2.2, 2.3, 2.4 ]
1817

1918
runs-on: ${{ matrix.platform }}
2019
env:
@@ -36,5 +35,5 @@ jobs:
3635
restore-keys: |
3736
${{ runner.os }}-maven-
3837
- name: Build with Maven
39-
run: mvn clean install -P ${{ matrix.profile }} --batch-mode --show-version --file pom.xml
38+
run: mvn clean install --batch-mode --show-version --file pom.xml
4039

‎api-1.10/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<name>reporting Module api 1.10</name>
1313
<description>1.10 api project for reporting</description>
1414

15-
<properties>
16-
<openMRSVersion>1.10.6</openMRSVersion>
17-
</properties>
1815

1916
<dependencies>
2017
<dependency>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
<patient patient_id="24" creator="1" date_created="2009-01-18 00:00:00.0" voided="false" void_reason=""/>
7575
<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"/>
7676

77-
<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"/>
77+
<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"/>
7878
<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"/>
79-
<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"/>
80-
<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"/>
79+
<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"/>
80+
<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"/>
8181

8282
<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"/>
8383
<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‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<name>reporting Module api 1.9</name>
1313
<description>1.9 api project for reporting</description>
1414

15-
<properties>
16-
<openMRSVersion>1.9.9</openMRSVersion>
17-
</properties>
1815

1916
<dependencies>
2017
<dependency>
@@ -46,6 +43,12 @@
4643
<type>pom</type>
4744
<scope>test</scope>
4845
</dependency>
46+
<dependency>
47+
<groupId>org.openmrs.module</groupId>
48+
<artifactId>reportingcompatibility-api</artifactId>
49+
<version>3.0.0-SNAPSHOT</version>
50+
<scope>compile</scope>
51+
</dependency>
4952

5053
</dependencies>
5154

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public DataSet evaluate(DataSetDefinition definition, EvaluationContext context)
5555
try {
5656
DataExportDataSetDefinition dataExportDefinition = (DataExportDataSetDefinition) definition;
5757
DataExportReportObject dataExport = dataExportDefinition.getDataExport();
58-
DataExportUtil.generateExport(dataExport, context.getBaseCohort(), null);
58+
DataExportUtil.generateExport(dataExport, convertCohort(context.getBaseCohort()), null);
5959

6060
File dataFile = DataExportUtil.getGeneratedFile(dataExportDefinition.getDataExport());
6161

@@ -89,4 +89,24 @@ public DataSet evaluate(DataSetDefinition definition, EvaluationContext context)
8989
}
9090
return dataSet;
9191
}
92+
93+
private org.openmrs.cohort.Cohort convertCohort(org.openmrs.Cohort cohort) {
94+
org.openmrs.cohort.Cohort c = new org.openmrs.cohort.Cohort();
95+
c.setCohortId(cohort.getId());
96+
c.setName(cohort.getName());
97+
c.setDescription(cohort.getDescription());
98+
c.setMemberIds(cohort.getMemberIds());
99+
100+
c.setUuid(cohort.getUuid());
101+
c.setCreator(cohort.getCreator());
102+
c.setDateCreated(cohort.getDateCreated());
103+
c.setChangedBy(cohort.getChangedBy());
104+
c.setDateChanged(cohort.getDateChanged());
105+
c.setVoided(cohort.getVoided());
106+
c.setVoidedBy(cohort.getVoidedBy());
107+
c.setDateVoided(cohort.getDateVoided());
108+
c.setVoidReason(cohort.getVoidReason());
109+
110+
return c;
111+
}
92112
}

‎api-1.9/src/main/java/org/openmrs/module/reporting/report/service/db/MappedDefinitionType.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.commons.lang.StringUtils;
2121
import org.hibernate.Hibernate;
2222
import org.hibernate.HibernateException;
23-
import org.hibernate.engine.SessionImplementor;
23+
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2424
import org.hibernate.type.Type;
2525
import org.hibernate.usertype.CompositeUserType;
2626
import org.hibernate.usertype.ParameterizedType;
@@ -116,9 +116,9 @@ public Object deepCopy(Object value) throws HibernateException {
116116
}
117117

118118
/**
119-
* @see CompositeUserType#nullSafeGet(ResultSet, String[], SessionImplementor, Object)
119+
* @see CompositeUserType#nullSafeGet(ResultSet, String[], SharedSessionContractImplementor, Object)
120120
*/
121-
public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
121+
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
122122
String parameterizableUuid = (String) HibernateUtil.standardType("STRING").nullSafeGet(rs, names[0], session, owner);
123123
if (StringUtils.isEmpty(parameterizableUuid)) { return null; }
124124
String serializedMappings = (String) HibernateUtil.standardType("STRING").nullSafeGet(rs, names[1], session, owner);
@@ -136,9 +136,9 @@ public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessi
136136
}
137137

138138
/**
139-
* @see CompositeUserType#nullSafeSet(PreparedStatement, Object, int, SessionImplementor)
139+
* @see CompositeUserType#nullSafeSet(PreparedStatement, Object, int, SharedSessionContractImplementor)
140140
*/
141-
public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException {
141+
public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
142142
String definitionUuid = null;
143143
String serializedMappings = null;
144144
if (value != null) {
@@ -160,9 +160,9 @@ public void nullSafeSet(PreparedStatement st, Object value, int index, SessionIm
160160
}
161161

162162
/**
163-
* @see CompositeUserType#replace(Object, Object, SessionImplementor, Object)
163+
* @see CompositeUserType#replace(Object, Object, SharedSessionContractImplementor, Object)
164164
*/
165-
public Object replace(Object original, Object target, SessionImplementor session, Object owner) throws HibernateException {
165+
public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner) throws HibernateException {
166166
return original;
167167
}
168168

@@ -181,16 +181,16 @@ public int hashCode(Object x) throws HibernateException {
181181
}
182182

183183
/**
184-
* @see CompositeUserType#disassemble(Object, SessionImplementor)
184+
* @see CompositeUserType#disassemble(Object, SharedSessionContractImplementor)
185185
*/
186-
public Serializable disassemble(Object value, SessionImplementor session) throws HibernateException {
186+
public Serializable disassemble(Object value, SharedSessionContractImplementor session) throws HibernateException {
187187
return (Serializable) deepCopy(value);
188188
}
189189

190190
/**
191-
* @see CompositeUserType#assemble(Serializable, SessionImplementor, Object)
191+
* @see CompositeUserType#assemble(Serializable, SharedSessionContractImplementor, Object)
192192
*/
193-
public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException {
193+
public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) throws HibernateException {
194194
return deepCopy(cached);
195195
}
196196

‎api-1.9/src/main/java/org/openmrs/module/reporting/report/service/db/PropertiesType.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.openmrs.module.reporting.report.service.db;
1111

1212
import org.hibernate.HibernateException;
13+
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1314
import org.hibernate.usertype.UserType;
1415

1516
import java.io.IOException;
@@ -103,17 +104,17 @@ public boolean isMutable() {
103104
}
104105

105106
/**
106-
* @see UserType#nullSafeGet(ResultSet, String[], Object)
107+
* @see UserType#nullSafeGet(ResultSet, String[], SharedSessionContractImplementor ,Object)
107108
*/
108-
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException {
109+
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session ,Object owner) throws HibernateException, SQLException {
109110
String s = rs.getString(names[0]);
110111
return assemble(s, null);
111112
}
112113

113114
/**
114-
* @see UserType#nullSafeSet(PreparedStatement, Object, int)
115+
* @see UserType#nullSafeSet(PreparedStatement, Object, int, SharedSessionContractImplementor)
115116
*/
116-
public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException {
117+
public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
117118
String val = (String) disassemble(value);
118119
st.setString(index, val);
119120
}

‎api-1.9/src/main/java/org/openmrs/module/reporting/report/service/db/RenderingModeType.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.sql.SQLException;
1616

1717
import org.hibernate.HibernateException;
18-
import org.hibernate.engine.SessionImplementor;
18+
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1919
import org.hibernate.type.Type;
2020
import org.hibernate.usertype.CompositeUserType;
2121
import org.hibernate.usertype.UserType;
@@ -104,9 +104,9 @@ public Object deepCopy(Object value) throws HibernateException {
104104
}
105105

106106
/**
107-
* @see CompositeUserType#nullSafeGet(ResultSet, String[], SessionImplementor, Object)
107+
* @see CompositeUserType#nullSafeGet(ResultSet, String[], SharedSessionContractImplementor, Object)
108108
*/
109-
public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
109+
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
110110
Class rendererClass = (Class) HibernateUtil.standardType("CLASS").nullSafeGet(rs, names[0], session, owner);
111111
if (rendererClass == null) { return null; }
112112
String argument = (String) HibernateUtil.standardType("STRING").nullSafeGet(rs, names[1], session, owner);
@@ -121,18 +121,18 @@ public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessi
121121
}
122122

123123
/**
124-
* @see CompositeUserType#nullSafeSet(PreparedStatement, Object, int, SessionImplementor)
124+
* @see CompositeUserType#nullSafeSet(PreparedStatement, Object, int, SharedSessionContractImplementor)
125125
*/
126-
public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException {
126+
public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
127127
RenderingMode mode = (RenderingMode) value;
128128
HibernateUtil.standardType("CLASS").nullSafeSet(st, mode == null ? null : mode.getRenderer().getClass(), index, session);
129129
HibernateUtil.standardType("STRING").nullSafeSet(st, mode == null ? null : mode.getArgument(), index+1, session);
130130
}
131131

132132
/**
133-
* @see CompositeUserType#replace(java.lang.Object, java.lang.Object, org.hibernate.engine.SessionImplementor, java.lang.Object)
133+
* @see CompositeUserType#replace(java.lang.Object, java.lang.Object, org.hibernate.engine.spi.SharedSessionContractImplementor, java.lang.Object)
134134
*/
135-
public Object replace(Object original, Object target, SessionImplementor session, Object owner) throws HibernateException {
135+
public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner) throws HibernateException {
136136
return original;
137137
}
138138

@@ -151,16 +151,16 @@ public int hashCode(Object x) throws HibernateException {
151151
}
152152

153153
/**
154-
* @see CompositeUserType#disassemble(Object, SessionImplementor)
154+
* @see CompositeUserType#disassemble(Object, SharedSessionContractImplementor)
155155
*/
156-
public Serializable disassemble(Object value, SessionImplementor session) throws HibernateException {
156+
public Serializable disassemble(Object value, SharedSessionContractImplementor session) throws HibernateException {
157157
return (Serializable) deepCopy(value);
158158
}
159159

160160
/**
161-
* @see CompositeUserType#assemble(Serializable, SessionImplementor, Object)
161+
* @see CompositeUserType#assemble(Serializable, SharedSessionContractImplementor, Object)
162162
*/
163-
public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException {
163+
public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) throws HibernateException {
164164
return deepCopy(cached);
165165
}
166166
}

‎api-1.9/src/main/java/org/openmrs/module/reporting/report/service/db/ReportDefinitionType.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import java.sql.Types;
1717

1818
import org.hibernate.HibernateException;
19+
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1920
import org.hibernate.usertype.UserType;
2021
import org.openmrs.api.context.Context;
2122
import org.openmrs.module.reporting.report.definition.ReportDefinition;
@@ -75,9 +76,9 @@ public boolean isMutable() {
7576
}
7677

7778
/**
78-
* @see UserType#nullSafeGet(ResultSet, String[], Object)
79+
* @see UserType#nullSafeGet(ResultSet, String[], SharedSessionContractImplementor,Object)
7980
*/
80-
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException {
81+
public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
8182
String uuid = rs.getString(names[0]);
8283
if (uuid == null) {
8384
return null;
@@ -86,9 +87,9 @@ public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws Hib
8687
}
8788

8889
/**
89-
* @see UserType#nullSafeSet(PreparedStatement, Object, int)
90+
* @see UserType#nullSafeSet(PreparedStatement, Object, int, SharedSessionContractImplementor)
9091
*/
91-
public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, SQLException {
92+
public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
9293
ReportDefinition d = (ReportDefinition) value;
9394
String val = (d == null ? null : d.getUuid());
9495
st.setString(index, val);

0 commit comments

Comments
 (0)