Skip to content

Commit eb4edec

Browse files
dkayiwadkayiwa
committedOct 24, 2013
Merging: Replace deprecated method "Expression" with "Restrictions" -
TRUNK-4098 author:lluismf
·
2.7.31.11.0-alpha
1 parent 4f472b5 commit eb4edec

17 files changed

+147
-162
lines changed
 

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateCohortDAO.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.hibernate.Criteria;
2121
import org.hibernate.Query;
2222
import org.hibernate.SessionFactory;
23-
import org.hibernate.criterion.Expression;
2423
import org.hibernate.criterion.MatchMode;
2524
import org.hibernate.criterion.Order;
2625
import org.hibernate.criterion.Restrictions;
@@ -90,7 +89,7 @@ public Cohort deleteCohort(Cohort cohort) throws DAOException {
9089
@SuppressWarnings("unchecked")
9190
public List<Cohort> getCohorts(String nameFragment) throws DAOException {
9291
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Cohort.class);
93-
criteria.add(Expression.ilike("name", nameFragment, MatchMode.ANYWHERE));
92+
criteria.add(Restrictions.ilike("name", nameFragment, MatchMode.ANYWHERE));
9493
criteria.addOrder(Order.asc("name"));
9594
return criteria.list();
9695
}

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public Drug getDrug(Integer drugId) throws DAOException {
378378
@SuppressWarnings("unchecked")
379379
public List<Drug> getDrugs(String drugName, Concept concept, boolean includeRetired) throws DAOException {
380380
Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(Drug.class, "drug");
381-
if (includeRetired == false)
381+
if (!includeRetired)
382382
searchCriteria.add(Restrictions.eq("drug.retired", false));
383383
if (concept != null)
384384
searchCriteria.add(Restrictions.eq("drug.concept", concept));
@@ -453,7 +453,7 @@ public List<ConceptClass> getAllConceptClasses(boolean includeRetired) throws DA
453453
Criteria crit = sessionFactory.getCurrentSession().createCriteria(ConceptClass.class);
454454

455455
// Minor bug - was assigning includeRetired instead of evaluating
456-
if (includeRetired == false)
456+
if (!includeRetired)
457457
crit.add(Restrictions.eq("retired", false));
458458

459459
return crit.list();
@@ -495,7 +495,7 @@ public ConceptDatatype getConceptDatatype(Integer i) {
495495
public List<ConceptDatatype> getAllConceptDatatypes(boolean includeRetired) throws DAOException {
496496
Criteria crit = sessionFactory.getCurrentSession().createCriteria(ConceptDatatype.class);
497497

498-
if (includeRetired == false)
498+
if (!includeRetired)
499499
crit.add(Restrictions.eq("retired", false));
500500

501501
return crit.list();
@@ -791,7 +791,7 @@ public void purgeConceptProposal(ConceptProposal cp) throws DAOException {
791791
public List<ConceptProposal> getAllConceptProposals(boolean includeCompleted) throws DAOException {
792792
Criteria crit = sessionFactory.getCurrentSession().createCriteria(ConceptProposal.class);
793793

794-
if (includeCompleted == false) {
794+
if (!includeCompleted) {
795795
crit.add(Restrictions.eq("state", OpenmrsConstants.CONCEPT_PROPOSAL_UNMAPPED));
796796
}
797797
crit.addOrder(Order.asc("originalText"));
@@ -935,7 +935,7 @@ public ConceptSource getConceptSource(Integer conceptSourceId) {
935935
public List<ConceptSource> getAllConceptSources(boolean includeRetired) throws DAOException {
936936
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(ConceptSource.class);
937937

938-
if (includeRetired == false)
938+
if (!includeRetired)
939939
criteria.add(Restrictions.eq("retired", false));
940940

941941
return criteria.list();
@@ -1353,7 +1353,7 @@ private Criteria createConceptWordSearchCriteria(String phrase, List<Locale> loc
13531353
Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(ConceptWord.class, "cw1");
13541354
searchCriteria.add(Restrictions.in("locale", locales));
13551355

1356-
if (includeRetired == false) {
1356+
if (!includeRetired) {
13571357
searchCriteria.createAlias("concept", "concept");
13581358
searchCriteria.add(Restrictions.eq("concept.retired", false));
13591359
}
@@ -1408,7 +1408,7 @@ public Long getCountOfDrugs(String drugName, Concept concept, boolean searchOnPh
14081408
if (StringUtils.isBlank(drugName) && concept == null)
14091409
return 0L;
14101410

1411-
if (includeRetired == false)
1411+
if (!includeRetired)
14121412
searchCriteria.add(Restrictions.eq("drug.retired", false));
14131413
if (concept != null)
14141414
searchCriteria.add(Restrictions.eq("drug.concept", concept));
@@ -1436,7 +1436,7 @@ public List<Drug> getDrugs(String drugName, Concept concept, boolean searchOnPhr
14361436
if (StringUtils.isBlank(drugName) && concept == null)
14371437
return Collections.emptyList();
14381438

1439-
if (includeRetired == false)
1439+
if (!includeRetired)
14401440
searchCriteria.add(Restrictions.eq("drug.retired", false));
14411441
if (concept != null)
14421442
searchCriteria.add(Restrictions.eq("drug.concept", concept));

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java

+19-20
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.hibernate.SessionFactory;
3131
import org.hibernate.criterion.Conjunction;
3232
import org.hibernate.criterion.Disjunction;
33-
import org.hibernate.criterion.Expression;
3433
import org.hibernate.criterion.MatchMode;
3534
import org.hibernate.criterion.Order;
3635
import org.hibernate.criterion.Projections;
@@ -104,7 +103,7 @@ public Encounter getEncounter(Integer encounterId) throws DAOException {
104103
@SuppressWarnings("unchecked")
105104
public List<Encounter> getEncountersByPatientId(Integer patientId) throws DAOException {
106105
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Encounter.class).createAlias("patient", "p").add(
107-
Expression.eq("p.patientId", patientId)).add(Expression.eq("voided", false)).addOrder(
106+
Restrictions.eq("p.patientId", patientId)).add(Restrictions.eq("voided", false)).addOrder(
108107
Order.desc("encounterDatetime"));
109108

110109
return crit.list();
@@ -124,36 +123,36 @@ public List<Encounter> getEncounters(Patient patient, Location location, Date fr
124123
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Encounter.class);
125124

126125
if (patient != null && patient.getPatientId() != null) {
127-
crit.add(Expression.eq("patient", patient));
126+
crit.add(Restrictions.eq("patient", patient));
128127
}
129128
if (location != null && location.getLocationId() != null) {
130-
crit.add(Expression.eq("location", location));
129+
crit.add(Restrictions.eq("location", location));
131130
}
132131
if (fromDate != null) {
133-
crit.add(Expression.ge("encounterDatetime", fromDate));
132+
crit.add(Restrictions.ge("encounterDatetime", fromDate));
134133
}
135134
if (toDate != null) {
136-
crit.add(Expression.le("encounterDatetime", toDate));
135+
crit.add(Restrictions.le("encounterDatetime", toDate));
137136
}
138137
if (enteredViaForms != null && enteredViaForms.size() > 0) {
139-
crit.add(Expression.in("form", enteredViaForms));
138+
crit.add(Restrictions.in("form", enteredViaForms));
140139
}
141140
if (encounterTypes != null && encounterTypes.size() > 0) {
142-
crit.add(Expression.in("encounterType", encounterTypes));
141+
crit.add(Restrictions.in("encounterType", encounterTypes));
143142
}
144143
if (providers != null && providers.size() > 0) {
145144
crit.createAlias("encounterProviders", "ep");
146-
crit.add(Expression.in("ep.provider", providers));
145+
crit.add(Restrictions.in("ep.provider", providers));
147146
}
148147
if (visitTypes != null && visitTypes.size() > 0) {
149148
crit.createAlias("visit", "v");
150-
crit.add(Expression.in("v.visitType", visitTypes));
149+
crit.add(Restrictions.in("v.visitType", visitTypes));
151150
}
152151
if (visits != null && visits.size() > 0) {
153-
crit.add(Expression.in("visit", visits));
152+
crit.add(Restrictions.in("visit", visits));
154153
}
155154
if (!includeVoided) {
156-
crit.add(Expression.eq("voided", false));
155+
crit.add(Restrictions.eq("voided", false));
157156
}
158157
crit.addOrder(Order.asc("encounterDatetime"));
159158
return crit.list();
@@ -186,8 +185,8 @@ public EncounterType getEncounterType(Integer encounterTypeId) throws DAOExcepti
186185
*/
187186
public EncounterType getEncounterType(String name) throws DAOException {
188187
Criteria crit = sessionFactory.getCurrentSession().createCriteria(EncounterType.class);
189-
crit.add(Expression.eq("retired", false));
190-
crit.add(Expression.eq("name", name));
188+
crit.add(Restrictions.eq("retired", false));
189+
crit.add(Restrictions.eq("name", name));
191190
EncounterType encounterType = (EncounterType) crit.uniqueResult();
192191

193192
return encounterType;
@@ -203,8 +202,8 @@ public List<EncounterType> getAllEncounterTypes(Boolean includeRetired) throws D
203202

204203
criteria.addOrder(Order.asc("name"));
205204

206-
if (includeRetired == false)
207-
criteria.add(Expression.eq("retired", false));
205+
if (!includeRetired)
206+
criteria.add(Restrictions.eq("retired", false));
208207

209208
return criteria.list();
210209
}
@@ -216,7 +215,7 @@ public List<EncounterType> getAllEncounterTypes(Boolean includeRetired) throws D
216215
public List<EncounterType> findEncounterTypes(String name) throws DAOException {
217216
return sessionFactory.getCurrentSession().createCriteria(EncounterType.class)
218217
// 'ilike' case insensitive search
219-
.add(Expression.ilike("name", name, MatchMode.START)).addOrder(Order.asc("name")).addOrder(
218+
.add(Restrictions.ilike("name", name, MatchMode.START)).addOrder(Order.asc("name")).addOrder(
220219
Order.asc("retired")).list();
221220
}
222221

@@ -421,10 +420,10 @@ private Criteria createEncounterByQueryCriteria(String query, Integer patientId,
421420
@Override
422421
@SuppressWarnings("unchecked")
423422
public List<Encounter> getEncountersByVisit(Visit visit, boolean includeVoided) {
424-
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Encounter.class)
425-
.add(Expression.eq("visit", visit));
423+
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Encounter.class).add(
424+
Restrictions.eq("visit", visit));
426425
if (!includeVoided) {
427-
crit.add(Expression.eq("voided", false));
426+
crit.add(Restrictions.eq("voided", false));
428427
}
429428
crit.addOrder(Order.asc("encounterDatetime"));
430429

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java

+21-22
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.hibernate.Query;
2525
import org.hibernate.SessionFactory;
2626
import org.hibernate.criterion.DetachedCriteria;
27-
import org.hibernate.criterion.Expression;
2827
import org.hibernate.criterion.MatchMode;
2928
import org.hibernate.criterion.Order;
3029
import org.hibernate.criterion.Projections;
@@ -104,8 +103,8 @@ public Form getForm(Integer formId) throws DAOException {
104103
*/
105104
@SuppressWarnings("unchecked")
106105
public List<FormField> getFormFields(Form form) throws DAOException {
107-
return sessionFactory.getCurrentSession().createCriteria(FormField.class, "ff").add(Expression.eq("ff.form", form))
108-
.list();
106+
return sessionFactory.getCurrentSession().createCriteria(FormField.class, "ff")
107+
.add(Restrictions.eq("ff.form", form)).list();
109108
}
110109

111110
/**
@@ -125,7 +124,7 @@ public List<Field> getFields(String search) throws DAOException {
125124
@SuppressWarnings("unchecked")
126125
public List<Field> getFieldsByConcept(Concept concept) throws DAOException {
127126
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Field.class);
128-
criteria.add(Expression.eq("concept", concept));
127+
criteria.add(Restrictions.eq("concept", concept));
129128
criteria.addOrder(Order.asc("name"));
130129
return criteria.list();
131130
}
@@ -146,8 +145,8 @@ public Field getField(Integer fieldId) throws DAOException {
146145
public List<Field> getAllFields(boolean includeRetired) throws DAOException {
147146
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Field.class);
148147

149-
if (includeRetired == false)
150-
crit.add(Expression.eq("retired", false));
148+
if (!includeRetired)
149+
crit.add(Restrictions.eq("retired", false));
151150

152151
return crit.list();
153152
}
@@ -168,8 +167,8 @@ public FieldType getFieldType(Integer fieldTypeId) throws DAOException {
168167
public List<FieldType> getAllFieldTypes(boolean includeRetired) throws DAOException {
169168
Criteria crit = sessionFactory.getCurrentSession().createCriteria(FieldType.class);
170169

171-
if (includeRetired == false)
172-
crit.add(Expression.eq("retired", false));
170+
if (!includeRetired)
171+
crit.add(Restrictions.eq("retired", false));
173172

174173
return crit.list();
175174
}
@@ -196,7 +195,7 @@ public FormField getFormField(Form form, Concept concept, Collection<FormField>
196195
return null;
197196
}
198197
Criteria crit = sessionFactory.getCurrentSession().createCriteria(FormField.class, "ff").createAlias("field",
199-
"field").add(Expression.eq("field.concept", concept)).add(Expression.eq("form", form));
198+
"field").add(Restrictions.eq("field.concept", concept)).add(Restrictions.eq("form", form));
200199

201200
// get the list of all formfields with this concept for this form
202201
List<FormField> formFields = crit.list();
@@ -236,8 +235,8 @@ public FormField getFormField(Form form, Concept concept, Collection<FormField>
236235
public List<Form> getAllForms(boolean includeRetired) throws DAOException {
237236
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Form.class);
238237

239-
if (includeRetired == false)
240-
crit.add(Expression.eq("retired", false));
238+
if (!includeRetired)
239+
crit.add(Restrictions.eq("retired", false));
241240

242241
crit.addOrder(Order.asc("name"));
243242
crit.addOrder(Order.asc("formId"));
@@ -313,22 +312,22 @@ public List<Field> getFields(Collection<Form> forms, Collection<FieldType> field
313312
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Field.class);
314313

315314
if (!forms.isEmpty())
316-
crit.add(Expression.in("form", forms));
315+
crit.add(Restrictions.in("form", forms));
317316

318317
if (!fieldTypes.isEmpty())
319-
crit.add(Expression.in("fieldType", fieldTypes));
318+
crit.add(Restrictions.in("fieldType", fieldTypes));
320319

321320
if (!concepts.isEmpty())
322-
crit.add(Expression.in("concept", concepts));
321+
crit.add(Restrictions.in("concept", concepts));
323322

324323
if (!tableNames.isEmpty())
325-
crit.add(Expression.in("tableName", tableNames));
324+
crit.add(Restrictions.in("tableName", tableNames));
326325

327326
if (!attributeNames.isEmpty())
328-
crit.add(Expression.in("attributeName", attributeNames));
327+
crit.add(Restrictions.in("attributeName", attributeNames));
329328

330329
if (selectMultiple != null)
331-
crit.add(Expression.eq("selectMultiple", selectMultiple));
330+
crit.add(Restrictions.eq("selectMultiple", selectMultiple));
332331

333332
if (!containsAllAnswers.isEmpty())
334333
throw new APIException("containsAllAnswers must be empty because this is not yet implemented");
@@ -337,7 +336,7 @@ public List<Field> getFields(Collection<Form> forms, Collection<FieldType> field
337336
throw new APIException("containsAnyAnswer must be empty because this is not yet implemented");
338337

339338
if (retired != null)
340-
crit.add(Expression.eq("retired", retired));
339+
crit.add(Restrictions.eq("retired", retired));
341340

342341
return crit.list();
343342
}
@@ -348,8 +347,8 @@ public List<Field> getFields(Collection<Form> forms, Collection<FieldType> field
348347
public Form getForm(String name, String version) throws DAOException {
349348
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Form.class);
350349

351-
crit.add(Expression.eq("name", name));
352-
crit.add(Expression.eq("version", version));
350+
crit.add(Restrictions.eq("name", name));
351+
crit.add(Restrictions.eq("version", version));
353352

354353
return (Form) crit.uniqueResult();
355354
}
@@ -493,8 +492,8 @@ public FormField getFormFieldByUuid(String uuid) {
493492
public List<Form> getFormsByName(String name) throws DAOException {
494493
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Form.class);
495494

496-
crit.add(Expression.eq("name", name));
497-
crit.add(Expression.eq("retired", false));
495+
crit.add(Restrictions.eq("name", name));
496+
crit.add(Restrictions.eq("retired", false));
498497
crit.addOrder(Order.desc("version"));
499498

500499
return crit.list();

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
import org.apache.commons.lang.StringUtils;
2020
import org.hibernate.Criteria;
2121
import org.hibernate.SessionFactory;
22-
import org.hibernate.criterion.Expression;
2322
import org.hibernate.criterion.MatchMode;
2423
import org.hibernate.criterion.Order;
2524
import org.hibernate.criterion.Projections;
2625
import org.hibernate.criterion.Restrictions;
27-
import org.hibernate.criterion.Restrictions;
2826
import org.openmrs.Location;
2927
import org.openmrs.LocationAttribute;
3028
import org.openmrs.LocationAttributeType;
@@ -76,7 +74,7 @@ public Location getLocation(Integer locationId) {
7674
@SuppressWarnings("unchecked")
7775
public Location getLocation(String name) {
7876
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Location.class).add(
79-
Expression.eq("name", name));
77+
Restrictions.eq("name", name));
8078

8179
List<Location> locations = criteria.list();
8280
if (null == locations || locations.isEmpty()) {
@@ -92,7 +90,7 @@ public Location getLocation(String name) {
9290
public List<Location> getAllLocations(boolean includeRetired) {
9391
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Location.class);
9492
if (!includeRetired) {
95-
criteria.add(Expression.eq("retired", false));
93+
criteria.add(Restrictions.eq("retired", false));
9694
} else {
9795
//push retired locations to the end of the returned list
9896
criteria.addOrder(Order.asc("retired"));
@@ -129,7 +127,7 @@ public LocationTag getLocationTag(Integer locationTagId) {
129127
@SuppressWarnings("unchecked")
130128
public LocationTag getLocationTagByName(String tag) {
131129
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(LocationTag.class).add(
132-
Expression.eq("name", tag));
130+
Restrictions.eq("name", tag));
133131

134132
List<LocationTag> tags = criteria.list();
135133
if (null == tags || tags.isEmpty()) {
@@ -145,7 +143,7 @@ public LocationTag getLocationTagByName(String tag) {
145143
public List<LocationTag> getAllLocationTags(boolean includeRetired) {
146144
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(LocationTag.class);
147145
if (!includeRetired) {
148-
criteria.add(Expression.like("retired", false));
146+
criteria.add(Restrictions.like("retired", false));
149147
}
150148
criteria.addOrder(Order.asc("name"));
151149
return criteria.list();
@@ -158,7 +156,7 @@ public List<LocationTag> getAllLocationTags(boolean includeRetired) {
158156
public List<LocationTag> getLocationTags(String search) {
159157
return sessionFactory.getCurrentSession().createCriteria(LocationTag.class)
160158
// 'ilike' case insensitive search
161-
.add(Expression.ilike("name", search, MatchMode.START)).addOrder(Order.asc("name")).list();
159+
.add(Restrictions.ilike("name", search, MatchMode.START)).addOrder(Order.asc("name")).list();
162160
}
163161

164162
/**
@@ -192,10 +190,10 @@ public LocationTag getLocationTagByUuid(String uuid) {
192190
public Long getCountOfLocations(String nameFragment, Boolean includeRetired) {
193191
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Location.class);
194192
if (!includeRetired)
195-
criteria.add(Expression.eq("retired", false));
193+
criteria.add(Restrictions.eq("retired", false));
196194

197195
if (StringUtils.isNotBlank(nameFragment))
198-
criteria.add(Expression.ilike("name", nameFragment, MatchMode.START));
196+
criteria.add(Restrictions.ilike("name", nameFragment, MatchMode.START));
199197

200198
criteria.setProjection(Projections.rowCount());
201199

@@ -245,9 +243,9 @@ public List<Location> getRootLocations(boolean includeRetired) throws DAOExcepti
245243

246244
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Location.class);
247245
if (!includeRetired)
248-
criteria.add(Expression.eq("retired", false));
246+
criteria.add(Restrictions.eq("retired", false));
249247

250-
criteria.add(Expression.isNull("parentLocation"));
248+
criteria.add(Restrictions.isNull("parentLocation"));
251249

252250
criteria.addOrder(Order.asc("name"));
253251
return criteria.list();

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.hibernate.Criteria;
2323
import org.hibernate.SessionFactory;
2424
import org.hibernate.criterion.DetachedCriteria;
25-
import org.hibernate.criterion.Expression;
2625
import org.hibernate.criterion.Order;
2726
import org.hibernate.criterion.Projections;
2827
import org.hibernate.criterion.Property;
@@ -95,8 +94,8 @@ public MimeType getMimeType(Integer mimeTypeId) throws DAOException {
9594
public List<MimeType> getAllMimeTypes(boolean includeRetired) throws DAOException {
9695
Criteria crit = sessionFactory.getCurrentSession().createCriteria(MimeType.class);
9796

98-
if (includeRetired == false)
99-
crit.add(Expression.eq("retired", Boolean.FALSE));
97+
if (!includeRetired)
98+
crit.add(Restrictions.eq("retired", Boolean.FALSE));
10099

101100
return crit.list();
102101
}
@@ -235,7 +234,7 @@ private Criteria createGetObservationsCriteria(List<Person> whom, List<Encounter
235234
if (CollectionUtils.isNotEmpty(valueCodedNameAnswers))
236235
criteria.add(Restrictions.in("valueCodedName", valueCodedNameAnswers));
237236

238-
if (includeVoidedObs == false)
237+
if (!includeVoidedObs)
239238
criteria.add(Restrictions.eq("voided", false));
240239
return criteria;
241240
}

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java

-6
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,16 @@
2222
import org.apache.commons.logging.LogFactory;
2323
import org.hibernate.Criteria;
2424
import org.hibernate.Query;
25-
import org.hibernate.Session;
26-
import org.hibernate.Transaction;
2725
import org.hibernate.SessionFactory;
2826
import org.hibernate.criterion.Criterion;
2927
import org.hibernate.criterion.Restrictions;
3028
import org.openmrs.Concept;
31-
import org.openmrs.ConceptClass;
32-
import org.openmrs.ConceptWord;
3329
import org.openmrs.DrugOrder;
3430
import org.openmrs.Encounter;
35-
import org.openmrs.Obs;
3631
import org.openmrs.Order;
3732
import org.openmrs.Order.OrderAction;
3833
import org.openmrs.Patient;
3934
import org.openmrs.User;
40-
import org.openmrs.api.context.Context;
4135
import org.openmrs.api.db.DAOException;
4236
import org.openmrs.api.db.OrderDAO;
4337

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.hibernate.Criteria;
3131
import org.hibernate.Query;
3232
import org.hibernate.SessionFactory;
33-
import org.hibernate.criterion.Expression;
3433
import org.hibernate.criterion.Order;
3534
import org.hibernate.criterion.Projections;
3635
import org.hibernate.criterion.Restrictions;
@@ -228,8 +227,8 @@ public List<Patient> getPatients(String name, String identifier, List<PatientIde
228227
public List<Patient> getAllPatients(boolean includeVoided) throws DAOException {
229228
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Patient.class);
230229

231-
if (includeVoided == false)
232-
criteria.add(Expression.eq("voided", false));
230+
if (!includeVoided)
231+
criteria.add(Restrictions.eq("voided", false));
233232

234233
return criteria.list();
235234
}
@@ -257,27 +256,27 @@ public List<PatientIdentifier> getPatientIdentifiers(String identifier,
257256
// join with the patient table to prevent patient identifiers from patients
258257
// that already voided getting returned
259258
criteria.createAlias("patient", "patient");
260-
criteria.add(Expression.eq("patient.voided", false));
259+
criteria.add(Restrictions.eq("patient.voided", false));
261260

262261
// make sure the patient object isn't voided
263-
criteria.add(Expression.eq("voided", false));
262+
criteria.add(Restrictions.eq("voided", false));
264263

265264
if (identifier != null)
266-
criteria.add(Expression.eq("identifier", identifier));
265+
criteria.add(Restrictions.eq("identifier", identifier));
267266

268267
// TODO add junit test for getting by identifier type
269268
if (patientIdentifierTypes.size() > 0)
270-
criteria.add(Expression.in("identifierType", patientIdentifierTypes));
269+
criteria.add(Restrictions.in("identifierType", patientIdentifierTypes));
271270

272271
if (locations.size() > 0)
273-
criteria.add(Expression.in("location", locations));
272+
criteria.add(Restrictions.in("location", locations));
274273

275274
// TODO add junit test for getting by patients
276275
if (patients.size() > 0)
277-
criteria.add(Expression.in("patient", patients));
276+
criteria.add(Restrictions.in("patient", patients));
278277

279278
if (isPreferred != null)
280-
criteria.add(Expression.eq("preferred", isPreferred));
279+
criteria.add(Restrictions.eq("preferred", isPreferred));
281280

282281
return criteria.list();
283282
}
@@ -316,8 +315,8 @@ public PatientIdentifierType getPatientIdentifierType(Integer patientIdentifierT
316315
public List<PatientIdentifierType> getAllPatientIdentifierTypes(boolean includeRetired) throws DAOException {
317316
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(PatientIdentifierType.class);
318317

319-
if (includeRetired == false) {
320-
criteria.add(Expression.eq("retired", false));
318+
if (!includeRetired) {
319+
criteria.add(Restrictions.eq("retired", false));
321320
} else {
322321
criteria.addOrder(Order.asc("retired")); //retired last
323322
}

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.hibernate.FetchMode;
4848
import org.hibernate.Query;
4949
import org.hibernate.SessionFactory;
50-
import org.hibernate.criterion.Expression;
5150
import org.hibernate.criterion.ProjectionList;
5251
import org.hibernate.criterion.Projections;
5352
import org.hibernate.criterion.Restrictions;
@@ -1172,8 +1171,8 @@ public Map<Integer, List<List<Object>>> getObservationsValues(Cohort patients, C
11721171
if (patients != null)
11731172
criteria.add(Restrictions.in("obs.personId", patients.getMemberIds()));
11741173

1175-
criteria.add(Expression.eq("obs.concept", c));
1176-
criteria.add(Expression.eq("obs.voided", false));
1174+
criteria.add(Restrictions.eq("obs.concept", c));
1175+
criteria.add(Restrictions.eq("obs.voided", false));
11771176

11781177
if (showMostRecentFirst)
11791178
criteria.addOrder(org.hibernate.criterion.Order.desc("obs.obsDatetime"));
@@ -1449,10 +1448,10 @@ else if (className.equals("org.openmrs.Person"))
14491448
if (className.equals("org.openmrs.Person"))
14501449
// the voided column on the person table is mapped to the person object
14511450
// through the getPersonVoided() to distinguish it from patient/user.voided
1452-
criteria.add(Expression.eq("personVoided", false));
1451+
criteria.add(Restrictions.eq("personVoided", false));
14531452
else
14541453
// this is here to support PersonName and PersonAddress
1455-
criteria.add(Expression.eq("voided", false));
1454+
criteria.add(Restrictions.eq("voided", false));
14561455
}
14571456
// if one of the Patient tables
14581457
else {
@@ -1463,7 +1462,7 @@ else if (className.equals("org.openmrs.Person"))
14631462
criteria.add(Restrictions.in("patient.personId", patients.getMemberIds()));
14641463

14651464
// do not include voided patients
1466-
criteria.add(Expression.eq("voided", false));
1465+
criteria.add(Restrictions.eq("voided", false));
14671466
}
14681467
criteria.setProjection(projectionList);
14691468

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.hibernate.SessionFactory;
2828
import org.hibernate.criterion.CriteriaSpecification;
2929
import org.hibernate.criterion.Disjunction;
30-
import org.hibernate.criterion.Expression;
3130
import org.hibernate.criterion.MatchMode;
3231
import org.hibernate.criterion.Order;
3332
import org.hibernate.criterion.Restrictions;
@@ -410,7 +409,7 @@ public List<PersonAttributeType> getAllPersonAttributeTypes(boolean includeRetir
410409
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(PersonAttributeType.class, "r");
411410

412411
if (!includeRetired) {
413-
criteria.add(Expression.eq("retired", false));
412+
criteria.add(Restrictions.eq("retired", false));
414413
}
415414

416415
criteria.addOrder(Order.asc("sortWeight"));
@@ -429,16 +428,16 @@ public List<PersonAttributeType> getPersonAttributeTypes(String exactName, Strin
429428
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(PersonAttributeType.class, "r");
430429

431430
if (exactName != null)
432-
criteria.add(Expression.eq("name", exactName));
431+
criteria.add(Restrictions.eq("name", exactName));
433432

434433
if (format != null)
435-
criteria.add(Expression.eq("format", format));
434+
criteria.add(Restrictions.eq("format", format));
436435

437436
if (foreignKey != null)
438-
criteria.add(Expression.eq("foreignKey", foreignKey));
437+
criteria.add(Restrictions.eq("foreignKey", foreignKey));
439438

440439
if (searchable != null)
441-
criteria.add(Expression.eq("searchable", searchable));
440+
criteria.add(Restrictions.eq("searchable", searchable));
442441

443442
return criteria.list();
444443
}
@@ -463,7 +462,7 @@ public List<Relationship> getAllRelationships(boolean includeVoided) throws DAOE
463462
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Relationship.class, "r");
464463

465464
if (!includeVoided) {
466-
criteria.add(Expression.eq("voided", false));
465+
criteria.add(Restrictions.eq("voided", false));
467466
}
468467

469468
return criteria.list();
@@ -480,13 +479,13 @@ public List<Relationship> getRelationships(Person fromPerson, Person toPerson, R
480479
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Relationship.class, "r");
481480

482481
if (fromPerson != null)
483-
criteria.add(Expression.eq("personA", fromPerson));
482+
criteria.add(Restrictions.eq("personA", fromPerson));
484483
if (toPerson != null)
485-
criteria.add(Expression.eq("personB", toPerson));
484+
criteria.add(Restrictions.eq("personB", toPerson));
486485
if (relType != null)
487-
criteria.add(Expression.eq("relationshipType", relType));
486+
criteria.add(Restrictions.eq("relationshipType", relType));
488487

489-
criteria.add(Expression.eq("voided", false));
488+
criteria.add(Restrictions.eq("voided", false));
490489

491490
return criteria.list();
492491
}
@@ -503,27 +502,28 @@ public List<Relationship> getRelationships(Person fromPerson, Person toPerson, R
503502
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Relationship.class, "r");
504503

505504
if (fromPerson != null)
506-
criteria.add(Expression.eq("personA", fromPerson));
505+
criteria.add(Restrictions.eq("personA", fromPerson));
507506
if (toPerson != null)
508-
criteria.add(Expression.eq("personB", toPerson));
507+
criteria.add(Restrictions.eq("personB", toPerson));
509508
if (relType != null)
510-
criteria.add(Expression.eq("relationshipType", relType));
509+
criteria.add(Restrictions.eq("relationshipType", relType));
511510
if (startEffectiveDate != null) {
512511
criteria.add(Restrictions.disjunction().add(
513-
Restrictions.and(Expression.le("startDate", startEffectiveDate), Expression
514-
.ge("endDate", startEffectiveDate))).add(
515-
Restrictions.and(Expression.le("startDate", startEffectiveDate), Restrictions.isNull("endDate"))).add(
516-
Restrictions.and(Restrictions.isNull("startDate"), Expression.ge("endDate", startEffectiveDate))).add(
512+
Restrictions.and(Restrictions.le("startDate", startEffectiveDate), Restrictions.ge("endDate",
513+
startEffectiveDate))).add(
514+
Restrictions.and(Restrictions.le("startDate", startEffectiveDate), Restrictions.isNull("endDate"))).add(
515+
Restrictions.and(Restrictions.isNull("startDate"), Restrictions.ge("endDate", startEffectiveDate))).add(
517516
Restrictions.and(Restrictions.isNull("startDate"), Restrictions.isNull("endDate"))));
518517
}
519518
if (endEffectiveDate != null) {
520519
criteria.add(Restrictions.disjunction().add(
521-
Restrictions.and(Expression.le("startDate", endEffectiveDate), Expression.ge("endDate", endEffectiveDate)))
522-
.add(Restrictions.and(Expression.le("startDate", endEffectiveDate), Restrictions.isNull("endDate")))
523-
.add(Restrictions.and(Restrictions.isNull("startDate"), Expression.ge("endDate", endEffectiveDate)))
524-
.add(Restrictions.and(Restrictions.isNull("startDate"), Restrictions.isNull("endDate"))));
520+
Restrictions.and(Restrictions.le("startDate", endEffectiveDate), Restrictions
521+
.ge("endDate", endEffectiveDate))).add(
522+
Restrictions.and(Restrictions.le("startDate", endEffectiveDate), Restrictions.isNull("endDate"))).add(
523+
Restrictions.and(Restrictions.isNull("startDate"), Restrictions.ge("endDate", endEffectiveDate))).add(
524+
Restrictions.and(Restrictions.isNull("startDate"), Restrictions.isNull("endDate"))));
525525
}
526-
criteria.add(Expression.eq("voided", false));
526+
criteria.add(Restrictions.eq("voided", false));
527527

528528
return criteria.list();
529529
}
@@ -552,7 +552,7 @@ public List<RelationshipType> getRelationshipTypes(String relationshipTypeName,
552552
new StringType()));
553553

554554
if (preferred != null)
555-
criteria.add(Expression.eq("preferred", preferred));
555+
criteria.add(Restrictions.eq("preferred", preferred));
556556

557557
return criteria.list();
558558
}
@@ -779,8 +779,8 @@ public List<RelationshipType> getAllRelationshipTypes(boolean includeRetired) {
779779
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(RelationshipType.class);
780780
criteria.addOrder(Order.asc("weight"));
781781

782-
if (includeRetired == false) {
783-
criteria.add(Expression.eq("retired", false));
782+
if (!includeRetired) {
783+
criteria.add(Restrictions.eq("retired", false));
784784
}
785785

786786
return criteria.list();

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.hibernate.Criteria;
2323
import org.hibernate.Query;
2424
import org.hibernate.SessionFactory;
25-
import org.hibernate.criterion.Expression;
2625
import org.hibernate.criterion.MatchMode;
2726
import org.hibernate.criterion.Order;
2827
import org.hibernate.criterion.Restrictions;
@@ -90,8 +89,8 @@ public Program getProgram(Integer programId) throws DAOException {
9089
@SuppressWarnings("unchecked")
9190
public List<Program> getAllPrograms(boolean includeRetired) throws DAOException {
9291
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Program.class);
93-
if (includeRetired == false) {
94-
criteria.add(Expression.eq("retired", false));
92+
if (!includeRetired) {
93+
criteria.add(Restrictions.eq("retired", false));
9594
}
9695
return criteria.list();
9796
}
@@ -118,7 +117,7 @@ public List<Program> getProgramsByName(String programName, boolean includeRetire
118117
@SuppressWarnings("unchecked")
119118
public List<Program> findPrograms(String nameFragment) throws DAOException {
120119
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Program.class, "program");
121-
criteria.add(Expression.ilike("name", nameFragment, MatchMode.ANYWHERE));
120+
criteria.add(Restrictions.ilike("name", nameFragment, MatchMode.ANYWHERE));
122121
criteria.addOrder(Order.asc("name"));
123122
return criteria.list();
124123
}
@@ -163,25 +162,26 @@ public List<PatientProgram> getPatientPrograms(Patient patient, Program program,
163162
throws DAOException {
164163
Criteria crit = sessionFactory.getCurrentSession().createCriteria(PatientProgram.class);
165164
if (patient != null) {
166-
crit.add(Expression.eq("patient", patient));
165+
crit.add(Restrictions.eq("patient", patient));
167166
}
168167
if (program != null) {
169-
crit.add(Expression.eq("program", program));
168+
crit.add(Restrictions.eq("program", program));
170169
}
171170
if (minEnrollmentDate != null) {
172-
crit.add(Expression.ge("dateEnrolled", minEnrollmentDate));
171+
crit.add(Restrictions.ge("dateEnrolled", minEnrollmentDate));
173172
}
174173
if (maxEnrollmentDate != null) {
175-
crit.add(Expression.le("dateEnrolled", maxEnrollmentDate));
174+
crit.add(Restrictions.le("dateEnrolled", maxEnrollmentDate));
176175
}
177176
if (minCompletionDate != null) {
178-
crit.add(Expression.or(Expression.isNull("dateCompleted"), Expression.ge("dateCompleted", minCompletionDate)));
177+
crit.add(Restrictions.or(Restrictions.isNull("dateCompleted"), Restrictions.ge("dateCompleted",
178+
minCompletionDate)));
179179
}
180180
if (maxCompletionDate != null) {
181-
crit.add(Expression.le("dateCompleted", maxCompletionDate));
181+
crit.add(Restrictions.le("dateCompleted", maxCompletionDate));
182182
}
183183
if (!includeVoided) {
184-
crit.add(Expression.eq("voided", false));
184+
crit.add(Restrictions.eq("voided", false));
185185
}
186186
return crit.list();
187187
}
@@ -262,8 +262,8 @@ public ConceptStateConversion getConceptStateConversion(ProgramWorkflow workflow
262262

263263
if (workflow != null && trigger != null) {
264264
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(ConceptStateConversion.class, "csc");
265-
criteria.add(Expression.eq("csc.programWorkflow", workflow));
266-
criteria.add(Expression.eq("csc.concept", trigger));
265+
criteria.add(Restrictions.eq("csc.programWorkflow", workflow));
266+
criteria.add(Restrictions.eq("csc.concept", trigger));
267267
csc = (ConceptStateConversion) criteria.uniqueResult();
268268
}
269269

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateSerializedObjectDAO.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.commons.logging.LogFactory;
2222
import org.hibernate.Criteria;
2323
import org.hibernate.SessionFactory;
24-
import org.hibernate.criterion.Expression;
2524
import org.hibernate.criterion.MatchMode;
25+
import org.hibernate.criterion.Restrictions;
2626
import org.openmrs.Auditable;
2727
import org.openmrs.OpenmrsData;
2828
import org.openmrs.OpenmrsMetadata;
@@ -93,7 +93,7 @@ public SerializedObject getSerializedObjectByUuid(String uuid) throws DAOExcepti
9393
SerializedObject ret = null;
9494
if (uuid != null) {
9595
Criteria c = sessionFactory.getCurrentSession().createCriteria(SerializedObject.class);
96-
c.add(Expression.eq("uuid", uuid));
96+
c.add(Restrictions.eq("uuid", uuid));
9797
ret = (SerializedObject) c.uniqueResult();
9898
}
9999
return ret;
@@ -117,11 +117,11 @@ public <T extends OpenmrsObject> T getObjectByUuid(Class<T> baseClass, String uu
117117
public List<SerializedObject> getAllSerializedObjectsByName(Class<?> type, String name, boolean exactMatchOnly)
118118
throws DAOException {
119119
Criteria c = sessionFactory.getCurrentSession().createCriteria(SerializedObject.class);
120-
c.add(Expression.or(Expression.eq("type", type.getName()), Expression.eq("subtype", type.getName())));
120+
c.add(Restrictions.or(Restrictions.eq("type", type.getName()), Restrictions.eq("subtype", type.getName())));
121121
if (exactMatchOnly) {
122-
c.add(Expression.eq("name", name));
122+
c.add(Restrictions.eq("name", name));
123123
} else {
124-
c.add(Expression.ilike("name", name, MatchMode.ANYWHERE));
124+
c.add(Restrictions.ilike("name", name, MatchMode.ANYWHERE));
125125
}
126126
return (List<SerializedObject>) c.list();
127127
}
@@ -145,9 +145,9 @@ public <T extends OpenmrsMetadata> List<T> getAllObjectsByName(Class<T> type, St
145145
@SuppressWarnings("unchecked")
146146
public List<SerializedObject> getAllSerializedObjects(Class<?> type, boolean includeRetired) throws DAOException {
147147
Criteria c = sessionFactory.getCurrentSession().createCriteria(SerializedObject.class);
148-
c.add(Expression.or(Expression.eq("type", type.getName()), Expression.eq("subtype", type.getName())));
148+
c.add(Restrictions.or(Restrictions.eq("type", type.getName()), Restrictions.eq("subtype", type.getName())));
149149
if (!includeRetired) {
150-
c.add(Expression.like("retired", false));
150+
c.add(Restrictions.like("retired", false));
151151
}
152152
return (List<SerializedObject>) c.list();
153153
}

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ private Query createUserSearchQuery(String name, List<Role> roles, boolean inclu
546546
}
547547
}
548548

549-
if (includeRetired == false)
549+
if (!includeRetired)
550550
criteria.add("user.retired = false");
551551

552552
// build the hql query

‎api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.hibernate.SessionFactory;
2323
import org.hibernate.criterion.Conjunction;
2424
import org.hibernate.criterion.Criterion;
25-
import org.hibernate.criterion.Expression;
2625
import org.hibernate.criterion.LogicalExpression;
2726
import org.hibernate.criterion.MatchMode;
2827
import org.hibernate.criterion.Order;
@@ -291,10 +290,10 @@ private LogicalExpression getNameSearch(String name) {
291290
OpenmrsConstants.GLOBAL_PROPERTY_MIN_SEARCH_CHARACTERS,
292291
OpenmrsConstants.GLOBAL_PROPERTY_DEFAULT_MIN_SEARCH_CHARACTERS);
293292
if (name != null && name.length() < minChars) {
294-
givenName = Expression.eq(givenNameProperty, name).ignoreCase();
295-
middleName = Expression.eq(middleNameProperty, name).ignoreCase();
296-
familyName = Expression.eq(familyNameProperty, name).ignoreCase();
297-
familyName2 = Expression.eq(familyName2Property, name).ignoreCase();
293+
givenName = Restrictions.eq(givenNameProperty, name).ignoreCase();
294+
middleName = Restrictions.eq(middleNameProperty, name).ignoreCase();
295+
familyName = Restrictions.eq(familyNameProperty, name).ignoreCase();
296+
familyName2 = Restrictions.eq(familyName2Property, name).ignoreCase();
298297
} else {
299298
MatchMode mode = MatchMode.START;
300299
String matchModeConstant = OpenmrsConstants.GLOBAL_PROPERTY_PATIENT_SEARCH_MATCH_MODE;
@@ -304,14 +303,14 @@ private LogicalExpression getNameSearch(String name) {
304303
mode = MatchMode.ANYWHERE;
305304
}
306305

307-
givenName = Expression.like(givenNameProperty, name, mode);
308-
middleName = Expression.like(middleNameProperty, name, mode);
309-
familyName = Expression.like(familyNameProperty, name, mode);
310-
familyName2 = Expression.like(familyName2Property, name, mode);
306+
givenName = Restrictions.like(givenNameProperty, name, mode);
307+
middleName = Restrictions.like(middleNameProperty, name, mode);
308+
familyName = Restrictions.like(familyNameProperty, name, mode);
309+
familyName2 = Restrictions.like(familyName2Property, name, mode);
311310
}
312311

313-
return Expression.and(Expression.eq("name.voided", false), Expression.or(familyName2, Expression.or(familyName,
314-
Expression.or(middleName, givenName))));
312+
return Restrictions.and(Restrictions.eq("name.voided", false), Restrictions.or(familyName2, Restrictions.or(
313+
familyName, Restrictions.or(middleName, givenName))));
315314
}
316315

317316
/**

‎api/src/main/java/org/openmrs/notification/db/hibernate/HibernateAlertDAO.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.commons.logging.LogFactory;
2222
import org.hibernate.Criteria;
2323
import org.hibernate.SessionFactory;
24-
import org.hibernate.criterion.Expression;
2524
import org.hibernate.criterion.Order;
25+
import org.hibernate.criterion.Restrictions;
2626
import org.openmrs.User;
2727
import org.openmrs.api.db.DAOException;
2828
import org.openmrs.notification.Alert;
@@ -82,8 +82,8 @@ public List<Alert> getAllAlerts(boolean includeExpired) throws DAOException {
8282
Criteria crit = sessionFactory.getCurrentSession().createCriteria(Alert.class);
8383

8484
// exclude the expired alerts unless requested
85-
if (includeExpired == false)
86-
crit.add(Expression.or(Expression.isNull("dateToExpire"), Expression.gt("dateToExpire", new Date())));
85+
if (!includeExpired)
86+
crit.add(Restrictions.or(Restrictions.isNull("dateToExpire"), Restrictions.gt("dateToExpire", new Date())));
8787

8888
return crit.list();
8989
}
@@ -99,7 +99,7 @@ public List<Alert> getAlerts(User user, boolean includeRead, boolean includeExpi
9999

100100
if (user != null && user.getUserId() != null) {
101101
crit.createCriteria("recipients", "recipient");
102-
crit.add(Expression.eq("recipient.recipient", user));
102+
crit.add(Restrictions.eq("recipient.recipient", user));
103103
} else {
104104
// getting here means we passed in no user or a blank user.
105105
// a null recipient column means get stuff for the anonymous user
@@ -111,13 +111,13 @@ public List<Alert> getAlerts(User user, boolean includeRead, boolean includeExpi
111111
}
112112

113113
// exclude the expired alerts unless requested
114-
if (includeExpired == false)
115-
crit.add(Expression.or(Expression.isNull("dateToExpire"), Expression.gt("dateToExpire", new Date())));
114+
if (!includeExpired)
115+
crit.add(Restrictions.or(Restrictions.isNull("dateToExpire"), Restrictions.gt("dateToExpire", new Date())));
116116

117117
// exclude the read alerts unless requested
118-
if (includeRead == false && (user != null && user.getUserId() != null)) {
119-
crit.add(Expression.eq("alertRead", false));
120-
crit.add(Expression.eq("recipient.alertRead", false));
118+
if (!includeRead && (user != null && user.getUserId() != null)) {
119+
crit.add(Restrictions.eq("alertRead", false));
120+
crit.add(Restrictions.eq("recipient.alertRead", false));
121121
}
122122

123123
crit.addOrder(Order.desc("dateChanged"));

‎api/src/main/java/org/openmrs/report/db/hibernate/HibernateReportDAO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.commons.logging.LogFactory;
2020
import org.hibernate.Criteria;
2121
import org.hibernate.SessionFactory;
22-
import org.hibernate.criterion.Expression;
22+
import org.hibernate.criterion.Restrictions;
2323
import org.openmrs.report.ReportSchemaXml;
2424
import org.openmrs.report.db.ReportDAO;
2525

@@ -62,7 +62,7 @@ public ReportSchemaXml getReportSchemaXml(Integer reportSchemaXmlId) {
6262
// .get(ReportSchemaXml.class, reportSchemaXmlId);
6363

6464
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(ReportSchemaXml.class, "rsx").add(
65-
Expression.eq("rsx.reportSchemaId", reportSchemaXmlId));
65+
Restrictions.eq("rsx.reportSchemaId", reportSchemaXmlId));
6666
return (ReportSchemaXml) criteria.uniqueResult();
6767
}
6868

‎api/src/main/java/org/openmrs/scheduler/db/hibernate/HibernateSchedulerDAO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.commons.logging.LogFactory;
2020
import org.hibernate.Criteria;
2121
import org.hibernate.SessionFactory;
22-
import org.hibernate.criterion.Expression;
22+
import org.hibernate.criterion.Restrictions;
2323
import org.openmrs.api.db.DAOException;
2424
import org.openmrs.scheduler.Schedule;
2525
import org.openmrs.scheduler.TaskDefinition;
@@ -92,7 +92,7 @@ public TaskDefinition getTask(Integer taskId) throws DAOException {
9292
*/
9393
public TaskDefinition getTaskByName(String name) throws DAOException {
9494
Criteria crit = sessionFactory.getCurrentSession().createCriteria(TaskDefinition.class).add(
95-
Expression.eq("name", name));
95+
Restrictions.eq("name", name));
9696

9797
TaskDefinition task = (TaskDefinition) crit.uniqueResult();
9898

0 commit comments

Comments
 (0)
Please sign in to comment.