Clean up code

puzzle · Jun 5, 2024 · e2d49b1 · e2d49b1
1 parent 6e02cb5
commit e2d49b1
Showing 1 changed file with 3 additions and 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
@@ -152,7 +152,8 @@ public AlignmentLists getAlignmentsByFilters(Long quarterFilter, List<Long> 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<AlignmentView> alignmentVie
                 .add(new AlignmentObjectDto(alignmentView.getId(), alignmentView.getTitle(),
                         alignmentView.getTeamName(), alignmentView.getState(), alignmentView.getObjectType())));
 
-        // Remove duplicated items
-        List<AlignmentObjectDto> alignmentObjectDtos = alignmentObjectDtoList.stream().distinct().toList();
-
-        return new AlignmentLists(alignmentObjectDtos, alignmentConnectionDtoList);
+        return new AlignmentLists(alignmentObjectDtoList.stream().distinct().toList(), alignmentConnectionDtoList);
     }
 
     protected List<AlignmentView> getAlignmentCounterpart(DividedAlignmentViewLists alignmentViewLists) {