From 500e33bfb6a22d77e34c4f5d460d3d615b7cddde Mon Sep 17 00:00:00 2001 From: dexter808 Date: Tue, 23 Mar 2021 21:22:57 +0530 Subject: [PATCH] Re RA-1832 --- .../coreapps/htmlformentry/EncounterDiagnosesElement.java | 4 ++-- .../coreapps/htmlformentry/EncounterDiagnosesElement.java | 4 ++-- .../htmlformentry/CodedOrFreeTextAnswerListWidget.java | 2 +- .../htmlformentry/EncounterDiagnosesByObsElement.java | 4 ++-- .../htmlformentry/EncounterDispositionTagHandler.java | 6 +++--- .../fragment/controller/DiagnosesFragmentController.java | 2 +- .../encounter/MostRecentEncounterFragmentController.java | 2 +- .../patientdashboard/VisitIncludesFragmentController.java | 2 +- .../page/controller/MarkPatientDeadPageController.java | 4 ++-- .../coreapps/page/controller/MergeVisitsPageController.java | 2 +- .../providermanagement/ProviderListPageController.java | 2 +- .../module/coreapps/web/resource/LatestObsResource.java | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api-2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java b/api-2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java index 25245d5c5..ac9190066 100644 --- a/api-2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java +++ b/api-2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java @@ -228,10 +228,10 @@ public Collection validateSubmission(FormEntryContext conte JsonNode submittedList = new ObjectMapper().readTree(submitted); List diagnoses = parseDiagnoses(submittedList, null); - if (diagnoses.size() == 0 && required) { + if (diagnoses.isEmpty() && required) { return Collections.singleton(new FormSubmissionError(hiddenDiagnoses, "Required")); } - if (diagnoses.size() > 0) { + if (!diagnoses.isEmpty()) { // at least one diagnosis must be primary boolean foundPrimary = false; for (Diagnosis diagnosis : diagnoses) { diff --git a/api-pre2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java b/api-pre2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java index 4ea88c8f2..a2134a740 100644 --- a/api-pre2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java +++ b/api-pre2.2/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesElement.java @@ -198,10 +198,10 @@ public Collection validateSubmission(FormEntryContext conte try { List diagnoses = parseDiagnoses(submitted, null); - if (diagnoses.size() == 0 && required) { + if (diagnoses.isEmpty() && required) { return Collections.singleton(new FormSubmissionError(hiddenDiagnoses, "Required")); } - if (diagnoses.size() > 0) { + if (!diagnoses.isEmpty()) { // at least one diagnosis must be primary boolean foundPrimary = false; for (Diagnosis diagnosis : diagnoses) { diff --git a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/CodedOrFreeTextAnswerListWidget.java b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/CodedOrFreeTextAnswerListWidget.java index 5275fb735..2a7ab28b9 100644 --- a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/CodedOrFreeTextAnswerListWidget.java +++ b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/CodedOrFreeTextAnswerListWidget.java @@ -101,7 +101,7 @@ public String generateHtml(FormEntryContext context) { } private String initialValueAsJson(List initialValue) { - if (initialValue == null || initialValue.size() == 0) { + if (initialValue == null || initialValue.isEmpty()) { return null; } diff --git a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesByObsElement.java b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesByObsElement.java index 43cf3c7c3..ed2412581 100644 --- a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesByObsElement.java +++ b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDiagnosesByObsElement.java @@ -198,10 +198,10 @@ public Collection validateSubmission(FormEntryContext conte try { List diagnoses = parseDiagnoses(submitted, null); - if (diagnoses.size() == 0 && required) { + if (diagnoses.isEmpty() && required) { return Collections.singleton(new FormSubmissionError(hiddenDiagnoses, "Required")); } - if (diagnoses.size() > 0) { + if (!diagnoses.isEmpty()) { // at least one diagnosis must be primary boolean foundPrimary = false; for (Diagnosis diagnosis : diagnoses) { diff --git a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDispositionTagHandler.java b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDispositionTagHandler.java index c91601cb1..f3d2d59bb 100644 --- a/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDispositionTagHandler.java +++ b/api/src/main/java/org/openmrs/module/coreapps/htmlformentry/EncounterDispositionTagHandler.java @@ -110,7 +110,7 @@ public boolean doStartTag(FormEntrySession session, PrintWriter out, Node parent } // determine if there are any additional observations we need to collect for this disposition - if (disposition.getAdditionalObs() != null && disposition.getAdditionalObs().size() > 0) { + if (disposition.getAdditionalObs() != null && !disposition.getAdditionalObs().isEmpty()) { controls.add(buildNewControl(disposition, disposition.getAdditionalObs())); } } @@ -118,13 +118,13 @@ public boolean doStartTag(FormEntrySession session, PrintWriter out, Node parent dispositionObs.setAttribute("answerConceptIds", answerConceptIds.toString()); dispositionObs.setAttribute("answerCodes", answerCodes.toString()); - if (controls != null && controls.size() > 0) { + if (controls != null && !controls.isEmpty()) { generateControlsElement(dispositionObs, controls); } dispositionObsGroup.appendChild(dispositionObs); - if (controls != null && controls.size() > 0) { + if (controls != null && !controls.isEmpty()) { generateAdditionalObsElements(dispositionObsGroup, controls, exisitingDispositionObsGroup); } diff --git a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/DiagnosesFragmentController.java b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/DiagnosesFragmentController.java index 07b553136..1411b7854 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/DiagnosesFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/DiagnosesFragmentController.java @@ -181,7 +181,7 @@ public FragmentActionResult codeDiagnosis(UiUtils ui, } } List newDiagnoses= diagnosisService.codeNonCodedDiagnosis(nonCodedObs, diagnosisList); - if ((newDiagnoses != null) && (newDiagnoses.size()>0) ){ + if ((newDiagnoses != null) && (!newDiagnoses.isEmpty()) ){ return new SuccessResult(ui.message("coreapps.dataManagement.codeDiagnosis.success")); } } diff --git a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/encounter/MostRecentEncounterFragmentController.java b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/encounter/MostRecentEncounterFragmentController.java index 3b2ac6017..7ce8d4af0 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/encounter/MostRecentEncounterFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/encounter/MostRecentEncounterFragmentController.java @@ -70,7 +70,7 @@ public void controller(FragmentConfiguration config, FragmentModel model, UiUtil model.addAttribute("definitionUiResource", definitionUiResource); - if (encounters.size() > 0) { + if (!encounters.isEmpty()) { model.addAttribute("encounter", encounters.get(encounters.size() - 1)); } else { model.addAttribute("encounter", null); diff --git a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/patientdashboard/VisitIncludesFragmentController.java b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/patientdashboard/VisitIncludesFragmentController.java index 18dca545d..ccfcdb23e 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/patientdashboard/VisitIncludesFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/patientdashboard/VisitIncludesFragmentController.java @@ -61,7 +61,7 @@ public void controller(FragmentConfiguration config, model.addAttribute("patient", wrapper); List visitTypes = visitTypeHelper.getUnRetiredVisitTypes(); - if (visitType != null && visitTypes.size() > 0) { + if (visitType != null && !visitTypes.isEmpty()) { ListIterator iterator = visitTypes.listIterator(); while (iterator.hasNext() ) { if (!iterator.next().getUuid().equals(visitType)) { diff --git a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MarkPatientDeadPageController.java b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MarkPatientDeadPageController.java index b470bfe0a..846ec6f37 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MarkPatientDeadPageController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MarkPatientDeadPageController.java @@ -50,7 +50,7 @@ public void get(@SpringBean PageModel pageModel, } List visits = Context.getVisitService().getVisitsByPatient(patient); - if (visits.size() > 0) { + if (!visits.isEmpty()) { //Current order of visits returned by getVisitsByPatient() of VisitService has first in list as last visit pageModel.put("lastVisitDate", visits.get(0).getStartDatetime()); } else { @@ -111,7 +111,7 @@ private Collection getConceptAnswers(String conceptId) { */ private void closeActiveVisitsAfterDeath(Patient patient) { List visitList = Context.getVisitService().getActiveVisitsByPatient(patient); - if (visitList.size() <= 0) { + if (!visitList.isEmpty()) { for (Visit visit : visitList) { Context.getVisitService().endVisit(visit, patient.getDeathDate()); } diff --git a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MergeVisitsPageController.java b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MergeVisitsPageController.java index 01cfe46bb..d1f2be2cf 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MergeVisitsPageController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/MergeVisitsPageController.java @@ -62,7 +62,7 @@ public String post(@RequestParam("patientId") Patient patient, SimpleObject.create("patientId", patient.getId().toString() )); } - if (mergeVisits!=null && mergeVisits.size() > 0 ){ + if (mergeVisits!=null && !mergeVisits.isEmpty() ){ Visit mergedVisit = service.mergeConsecutiveVisits(mergeVisits, patient); if (mergedVisit != null){ request.getSession().setAttribute(AppUiConstants.SESSION_ATTRIBUTE_INFO_MESSAGE, ui.message("coreapps.task.mergeVisits.success")); diff --git a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/providermanagement/ProviderListPageController.java b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/providermanagement/ProviderListPageController.java index aecae0a46..6bf7ba094 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/page/controller/providermanagement/ProviderListPageController.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/page/controller/providermanagement/ProviderListPageController.java @@ -23,7 +23,7 @@ public void get(PageModel model, Map> providers = new HashMap>(); List providerRoleList = providerManagementService.getRestrictedProviderRoles(false); - if (providerRoleList != null && providerRoleList.size() > 0 ) { + if (providerRoleList != null && !providerRoleList.isEmpty() ) { List providersByRoles = Context.getService(ProviderManagementService.class).getProvidersByRoles(providerRoleList); for (Provider providerByRole : providersByRoles) { List supervisorsForProvider = ProviderManagementUtils.getSupervisors(providerByRole); diff --git a/omod/src/main/java/org/openmrs/module/coreapps/web/resource/LatestObsResource.java b/omod/src/main/java/org/openmrs/module/coreapps/web/resource/LatestObsResource.java index 1abef69dd..8661ab63f 100644 --- a/omod/src/main/java/org/openmrs/module/coreapps/web/resource/LatestObsResource.java +++ b/omod/src/main/java/org/openmrs/module/coreapps/web/resource/LatestObsResource.java @@ -84,7 +84,7 @@ protected PageableResult doSearch(RequestContext context) { questions.add(concept); List latestObs = obsService.getObservations(who, null, questions, null, null, null, sort, nLatestObs, null, null, null, false); - if (latestObs.size() > 0) { + if (!latestObs.isEmpty()) { obsList.addAll(latestObs); } }