From e2d49b197e8ba6102e099558e3a2d3209077f02d Mon Sep 17 00:00:00 2001 From: Lias Kleisa Date: Wed, 5 Jun 2024 15:50:06 +0200 Subject: [PATCH] Clean up code --- .../okr/service/business/AlignmentBusinessService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/ch/puzzle/okr/service/business/AlignmentBusinessService.java b/backend/src/main/java/ch/puzzle/okr/service/business/AlignmentBusinessService.java index 367b16f63c..9206a2e5e5 100644 --- a/backend/src/main/java/ch/puzzle/okr/service/business/AlignmentBusinessService.java +++ b/backend/src/main/java/ch/puzzle/okr/service/business/AlignmentBusinessService.java @@ -152,7 +152,8 @@ public AlignmentLists getAlignmentsByFilters(Long quarterFilter, List team if (Objects.isNull(quarterFilter)) { quarterFilter = quarterBusinessService.getCurrentQuarter().getId(); } - teamFilter = teamFilter == null ? List.of() : teamFilter; + + teamFilter = Objects.requireNonNullElse(teamFilter, List.of()); alignmentValidationService.validateOnAlignmentGet(quarterFilter, teamFilter); if (teamFilter.isEmpty()) { @@ -204,10 +205,7 @@ protected AlignmentLists generateAlignmentLists(List alignmentVie .add(new AlignmentObjectDto(alignmentView.getId(), alignmentView.getTitle(), alignmentView.getTeamName(), alignmentView.getState(), alignmentView.getObjectType()))); - // Remove duplicated items - List alignmentObjectDtos = alignmentObjectDtoList.stream().distinct().toList(); - - return new AlignmentLists(alignmentObjectDtos, alignmentConnectionDtoList); + return new AlignmentLists(alignmentObjectDtoList.stream().distinct().toList(), alignmentConnectionDtoList); } protected List getAlignmentCounterpart(DividedAlignmentViewLists alignmentViewLists) {