Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRUNK-4839: Exposing Patient Search Options Via UI #1873

Merged
merged 1 commit into from
Nov 20, 2016

Conversation

Nishen-Peiris
Copy link

Description

01.Remove unused import org.hibernate.HibernateException
02.Remove 1 redundant type arguments in the new expression at org.openmrs.api.db.hibernate.HibernatePatientDAO#sortDuplicatePatients
03.Remove 2 redundant type arguments in new expressions at org.openmrs.api.db.hibernate.HibernatePatientDAO#getPatients(String, boolean, Integer, Integer)
04.Remove 7 redundant type arguments in the new expression at org.openmrs.api.db.hibernate.HibernatePatientDAO#getDuplicatePatientsSQLString

Related Issue

I haven't implemented the feature completely.
see https://issues.openmrs.org/browse/TRUNK-4839

Checklist:

  • My pull request only contains one single commit.
  • My pull request is based on the latest master branch
    git pull --rebase upstream master.
  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.
  • My code follows the code style of this project.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 55.722% when pulling c550d2e on Nishen-Peiris:TRUNK-4839 into e037b58 on openmrs:master.

@@ -192,7 +191,7 @@ private void insertPatientStubIfNeeded(Patient patient) {
criteriaExactMatch = new PatientSearchCriteria(sessionFactory, criteriaExactMatch).prepareCriteria(query, true,
true, includeVoided);

Set<Patient> patients = new LinkedHashSet<Patient>();
Set<Patient> patients = new LinkedHashSet<>();
Copy link
Member

@dkayiwa dkayiwa Nov 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind sharing the reason behind removing Patient?
The same question applies to the rest of the code below.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dkayiwa, Its a new feature introduced by Java 7 know as the "Diamond" operator. For more info, follow http://openjdk.java.net/projects/jdk7/features/#f618

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Nishen-Peiris oh i see! :)
The ticket under which you are creating these pull requests does not seem related to the changes you are making. Do you mind creating a new ticket? :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

@dkayiwa dkayiwa merged commit 7ce4dfa into openmrs:master Nov 20, 2016
@dkayiwa
Copy link
Member

dkayiwa commented Nov 20, 2016

@Nishen-Peiris thanks again for all that you are doing! 👍
Since you already did this, i have gone ahead and merged it. You will create a new ticket about the code improvements that you are doing and then the upcoming pull requests will be based on it. :)

@Nishen-Peiris
Copy link
Author

@dkayiwa thanks...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants