TRUNK-6202 Replace Hibernate Criteria API with JPA for HibernateProviderDAO #4501
Conversation
d85eda4
to
efc1bc2
Compare
| if (!includeRetired) { | ||
| criteria.add(Restrictions.eq("retired", false)); | ||
| cq.where(personPredicate, cb.isFalse(root.get("retired"))) |
There was a problem hiding this comment.
Wasn't the order by clause outside of the if (!includeRetired)?
There was a problem hiding this comment.
Yea, but the logic should be the same, I just restructured it a little to avoid new lists. I updated the code though to make it closer to the original structure
efc1bc2
to
73e56bb
Compare
| CriteriaQuery<Provider> cq = cb.createQuery(Provider.class); | ||
| Root<Provider> root = cq.from(Provider.class); | ||
|
|
||
| List<Predicate> predicates = prepareProviderCriteria(cb, root, name, includeRetired); |
There was a problem hiding this comment.
Is there an easy way of doing distinct(true) from within prepareProviderCriteria?
There was a problem hiding this comment.
I don't think there is while keeping the method flexible enough for reuse. In some of the first migrations I tried doing it by passing the CriteriaQuery object into the method to allow me to do this, but then when we want to do certain things outside the method like counts it doesn't work because the query object specifies the return type of the result
Description of what I changed
This task is to migrate the deprecated hibernate criteria to jpa criteria for the HibernateProviderDAO class. This class had a little more complexity than previous migrations and could do with a closer look during the review.
Issue I worked on
see https://issues.openmrs.org/browse/TRUNK-6202
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master