From 8100344ae12cccf13e1e8944655335b65be6dfde Mon Sep 17 00:00:00 2001 From: daveotengo <30934250+daveotengo@users.noreply.github.com> Date: Tue, 20 Aug 2024 21:20:54 +0000 Subject: [PATCH] clean up after review --- .../java/de/symeda/sormas/api/user/UserRoleDto.java | 1 - .../sormas/app/login/ChangePasswordActivity.java | 2 +- .../de/symeda/sormas/backend/AbstractBeanTest.java | 2 +- .../environmentsample/EnvironmentSampleEditForm.java | 10 +++------- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java index 9826233aef8..a8c54c57b0e 100644 --- a/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java +++ b/sormas-api/src/main/java/de/symeda/sormas/api/user/UserRoleDto.java @@ -36,7 +36,6 @@ import de.symeda.sormas.api.utils.DataHelper; import de.symeda.sormas.api.utils.FieldConstraints; import de.symeda.sormas.api.utils.ValidationException; -import de.symeda.sormas.api.audit.AuditedClass; public class UserRoleDto extends EntityDto { diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/login/ChangePasswordActivity.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/login/ChangePasswordActivity.java index 0c503c7cf70..ef2150d57a2 100644 --- a/sormas-app/app/src/main/java/de/symeda/sormas/app/login/ChangePasswordActivity.java +++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/login/ChangePasswordActivity.java @@ -120,7 +120,7 @@ public void passwordValidationCheck(View view) { } else { binding.actionPasswordStrength.setVisibility(view.getVisibility()); binding.actionPasswordStrength.setText(R.string.message_password_weak); - NotificationHelper.showNotification(binding, NotificationType.ERROR, R.string.additional_message_passord_weakk); + NotificationHelper.showNotification(binding, NotificationType.ERROR, R.string.additional_message_passord_weak); binding.actionPasswordStrength.setTextColor(Color.parseColor(getString(R.color.errorBackground))); } } diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java index 4af593034e4..8376ca63389 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java @@ -274,7 +274,7 @@ import de.symeda.sormas.backend.vaccination.VaccinationService; import de.symeda.sormas.backend.visit.VisitFacadeEjb.VisitFacadeEjbLocal; import de.symeda.sormas.backend.visit.VisitService; - + @ExtendWith(CdiTestJunitExtension.class) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java index 530e5d69aea..884df0d1fca 100644 --- a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java +++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/environmentsample/EnvironmentSampleEditForm.java @@ -369,14 +369,10 @@ private void addValidators() { } private Date getEarliestPathogenTestDate() { - if (!isCreate) { - List pathogenTests = FacadeProvider.getPathogenTestFacade().getAllByEnvironmentSample(getValue().toReference()); - if (pathogenTests.isEmpty()) { - return null; - } - return pathogenTests.stream().map(PathogenTestDto::getTestDateTime).filter(Objects::nonNull).min(Date::compareTo).orElseGet(() -> null); - } else { + List pathogenTests = FacadeProvider.getPathogenTestFacade().getAllByEnvironmentSample(getValue().toReference()); + if (pathogenTests.isEmpty()) { return null; } + return pathogenTests.stream().map(PathogenTestDto::getTestDateTime).filter(Objects::nonNull).min(Date::compareTo).orElseGet(() -> null); } }