Some sonar cleanup (picking the most prevalent or highest priority)

server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetSender.java

@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Requires(property = MailJetSender.FROM_ADDRESS)
 @Requires(property = MailJetSender.FROM_NAME)
@@ -58,7 +57,7 @@ public static List<JSONArray> getEmailBatches(String... recipients) {
             // Get only the first n elements limited by MailJet's API
             List<String> limitedRecipients = recipientList.stream()
                     .limit(MAILJET_RECIPIENT_LIMIT)
-                    .collect(Collectors.toList());
+                    .toList();
 
             // Add each recipient to a JSON array to be sent in a MailJet request
             JSONArray recipientArray = new JSONArray();

server/src/main/java/com/objectcomputing/checkins/security/CheckinsOpenIdAuthenticationMapper.java

@@ -92,7 +92,7 @@ protected Map<String, Object> buildAttributes(String providerName, OpenIdTokenRe
     protected List<String> getRoles(OpenIdClaims openIdClaims) {
         List<String> roles = new ArrayList<>();
         memberProfileRepository.findByWorkEmail(openIdClaims.getEmail())
-                .ifPresent((memberProfile) -> {
+                .ifPresent(memberProfile -> {
                         LOG.info("MemberProfile of the user: {}", memberProfile);
                         roles.addAll(roleRepository.findUserRoles(memberProfile.getId())
                                 .stream()

server/src/main/java/com/objectcomputing/checkins/security/CustomRefreshTokenPersistence.java

@@ -13,20 +13,23 @@
 import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.token.event.RefreshTokenGeneratedEvent;
 import io.micronaut.security.token.refresh.RefreshTokenPersistence;
+import jakarta.inject.Singleton;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import jakarta.inject.Singleton;
 import reactor.core.publisher.Mono;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 @Singleton
 public class CustomRefreshTokenPersistence implements RefreshTokenPersistence {
 
-    final Logger LOG = LoggerFactory.getLogger(CustomRefreshTokenPersistence.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CustomRefreshTokenPersistence.class);
+
     final MemberProfileRepository memberProfileRepo;
     final RefreshTokenRepository refreshTokenRepo;
     final PermissionServices permissionServices;
@@ -70,10 +73,10 @@ public Publisher<Authentication> getAuthentication(String refreshToken) {
 
     public Authentication createAuthentication(MemberProfile memberProfile) {
         List<Permission> permissions = rolePermissionServices.findUserPermissions(memberProfile.getId());
-        List<String> permissionsAsString = permissions.stream().map(Permission::name).collect(Collectors.toList());
+        List<String> permissionsAsString = permissions.stream().map(Permission::name).toList();
 
         Set<Role> userRoles = roleServices.findUserRoles(memberProfile.getId());
-        List<String> rolesAsString = userRoles.stream().map(Role::getRole).collect(Collectors.toList());
+        List<String> rolesAsString = userRoles.stream().map(Role::getRole).toList();
 
         Map<String, Object> attributes = new HashMap<>();
         attributes.put("permissions", permissionsAsString);

server/src/main/java/com/objectcomputing/checkins/security/LocalUserPasswordAuthProvider.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Singleton
 @Requires(env = {Environments.LOCAL, Environment.TEST})
@@ -77,10 +76,10 @@ public LocalUserPasswordAuthProvider(CurrentUserServices currentUserServices, Us
         }
 
         List<Permission> permissions = rolePermissionServices.findUserPermissions(memberProfile.getId());
-        List<String> permissionsAsString = permissions.stream().map(Enum::name).collect(Collectors.toList());
+        List<String> permissionsAsString = permissions.stream().map(Enum::name).toList();
 
         Set<Role> userRoles = roleServices.findUserRoles(memberProfile.getId());
-        List<String> rolesAsString = userRoles.stream().map(Role::getRole).collect(Collectors.toList());
+        List<String> rolesAsString = userRoles.stream().map(Role::getRole).toList();
 
         Map<String, Object> attributes = new HashMap<>();
         attributes.put("roles", rolesAsString);

server/src/main/java/com/objectcomputing/checkins/services/feedback/suggestions/FeedbackSuggestionServiceImpl.java

@@ -61,7 +61,7 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
 
         for(TeamMember currentMembership: teamMemberships){
             Set<TeamMember> teamMembers = teamMemberServices.findByFields(currentMembership.getTeamId(), null, null);
-            Set<TeamMember> leads = teamMembers.stream().filter((member)-> member.isLead()).collect(Collectors.toSet());
+            Set<TeamMember> leads = teamMembers.stream().filter(member -> member.isLead()).collect(Collectors.toSet());
             leads = filterTerminated(leads);
             for(TeamMember lead: leads) {
                 if(suggestions.size() < maxSuggestions && !lead.getMemberId().equals(id) && !lead.getMemberId().equals(currentUserId)) {
@@ -74,7 +74,7 @@ public List<FeedbackSuggestionDTO> getSuggestionsByProfileId(UUID id) {
 
         for(TeamMember currentMembership: teamMemberships){
             Set<TeamMember> teamMembers = teamMemberServices.findByFields(currentMembership.getTeamId(), null, null);
-            teamMembers = teamMembers.stream().filter((member)-> !member.isLead()).collect(Collectors.toSet());
+            teamMembers = teamMembers.stream().filter(member -> !member.isLead()).collect(Collectors.toSet());
             teamMembers = filterTerminated(teamMembers);
             for(TeamMember teamMember: teamMembers) {
                 if(suggestions.size() < maxSuggestions && !teamMember.getMemberId().equals(id) && !teamMember.getMemberId().equals(currentUserId)) {

server/src/main/java/com/objectcomputing/checkins/services/feedback_answer/FeedbackAnswerServicesImpl.java

@@ -107,7 +107,7 @@ public List<FeedbackAnswer> findByValues(@Nullable UUID questionId, @Nullable UU
         final UUID requestCreatorId = feedbackRequest.getCreatorId();
         final UUID requesteeId = feedbackRequest.getRequesteeId();
         final UUID recipientId = feedbackRequest.getRecipientId();
-        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter((profile) -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
+        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter(profile -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
         MemberProfile requestee = memberProfileServices.getById(requesteeId);
         final UUID requesteePDL = requestee.getPdlId();
         if (currentUserServices.isAdmin() || currentUserId.equals(requesteePDL) || isRequesteesSupervisor || requestCreatorId.equals(currentUserId) || recipientId.equals(currentUserId)) {
@@ -148,7 +148,7 @@ public boolean getIsPermitted(FeedbackRequest feedbackRequest) {
         MemberProfile requestee = memberProfileServices.getById(requesteeId);
         final UUID currentUserId = currentUserServices.getCurrentUser().getId();
         final UUID recipientId = feedbackRequest.getRecipientId();
-        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter((profile) -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
+        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter(profile -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
         final UUID requesteePDL = requestee.getPdlId();
 
         return isAdmin || currentUserId.equals(requesteePDL) || isRequesteesSupervisor || requestCreatorId.equals(currentUserId) || recipientId.equals(currentUserId);

server/src/main/java/com/objectcomputing/checkins/services/feedback_answer/question_and_answer/QuestionAndAnswerServicesImpl.java

@@ -107,7 +107,7 @@ public boolean getIsPermitted(FeedbackRequest feedbackRequest) {
         MemberProfile requestee = memberProfileServices.getById(requesteeId);
         final UUID currentUserId = currentUserServices.getCurrentUser().getId();
         final UUID recipientId = feedbackRequest.getRecipientId();
-        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter((profile) -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
+        boolean isRequesteesSupervisor = requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter(profile -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
         final UUID requesteePDL = requestee.getPdlId();
 
         return isAdmin || currentUserId.equals(requesteePDL) || isRequesteesSupervisor || requestCreatorId.equals(currentUserId) || recipientId.equals(currentUserId);

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java

@@ -270,7 +270,7 @@ public List<FeedbackRequest> findByValues(UUID creatorId, UUID requesteeId, UUID
     }
 
     private boolean isSupervisor(UUID requesteeId, UUID currentUserId) {
-        return requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter((profile) -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
+        return requesteeId != null ? memberProfileServices.getSupervisorsForId(requesteeId).stream().filter(profile -> currentUserId.equals(profile.getId())).findAny().isPresent() : false;
     }
 
     private boolean createIsPermitted(UUID requesteeId) {

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/FeedbackTemplateServicesImpl.java

@@ -12,7 +12,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Singleton
 public class FeedbackTemplateServicesImpl implements FeedbackTemplateServices {
@@ -98,7 +97,7 @@ public List<FeedbackTemplate> findByFields(@Nullable UUID creatorId, @Nullable S
                 .stream()
                 .filter(template -> template.getIsPublic() || isAdmin || template.getCreatorId().equals(currentUserId))
                 .filter(template -> !template.getIsReview() || isAdmin)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override

server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java

@@ -6,7 +6,11 @@
 import com.objectcomputing.checkins.exceptions.PermissionException;
 import com.objectcomputing.checkins.notifications.email.EmailSender;
 import com.objectcomputing.checkins.notifications.email.MailJetConfig;
-import com.objectcomputing.checkins.services.guild.member.*;
+import com.objectcomputing.checkins.services.guild.member.GuildMember;
+import com.objectcomputing.checkins.services.guild.member.GuildMemberHistoryRepository;
+import com.objectcomputing.checkins.services.guild.member.GuildMemberRepository;
+import com.objectcomputing.checkins.services.guild.member.GuildMemberResponseDTO;
+import com.objectcomputing.checkins.services.guild.member.GuildMemberServices;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
 import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
@@ -20,7 +24,12 @@
 
 import java.net.URL;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.objectcomputing.checkins.util.Util.nullSafeUUIDToString;
@@ -122,7 +131,7 @@ public GuildResponseDTO read(@NotNull UUID guildId) {
                     return terminationDate == null || !LocalDate.now().plusDays(1).isAfter(terminationDate);
                 })
                 .map(guildMember ->
-                        fromMemberEntity(guildMember, memberProfileServices.getById(guildMember.getMemberId()))).collect(Collectors.toList());
+                        fromMemberEntity(guildMember, memberProfileServices.getById(guildMember.getMemberId()))).toList();
 
         return fromEntity(foundGuild, guildMembers);
     }
@@ -162,8 +171,8 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     Set<GuildMember> existingGuildMembers = guildMemberServices.findByFields(guildDTO.getId(), null, null);
 
                     //add new members to the guild
-                    guildDTO.getGuildMembers().stream().forEach((updatedMember) -> {
-                        Optional<GuildMember> first = existingGuildMembers.stream().filter((existing) -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
+                    guildDTO.getGuildMembers().stream().forEach(updatedMember -> {
+                        Optional<GuildMember> first = existingGuildMembers.stream().filter(existing -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
                         MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
                         if(first.isEmpty()) {
                             newMembers.add(fromMemberEntity(guildMemberServices.save(fromMemberDTO(updatedMember, newGuildEntity.getId())), existingMember));
@@ -174,8 +183,8 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     });
 
                     //delete any removed members from guild
-                    existingGuildMembers.stream().forEach((existingMember) -> {
-                        if(!guildDTO.getGuildMembers().stream().filter((updatedTeamMember) -> updatedTeamMember.getMemberId().equals(existingMember.getMemberId())).findFirst().isPresent()) {
+                    existingGuildMembers.stream().forEach(existingMember -> {
+                        if(!guildDTO.getGuildMembers().stream().filter(updatedTeamMember -> updatedTeamMember.getMemberId().equals(existingMember.getMemberId())).findFirst().isPresent()) {
                             guildMemberServices.delete(existingMember.getId());
                             removedMembers.add(memberProfileServices.getById(existingMember.getMemberId()));
                         }

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/anniversaryreport/AnniversaryReportServicesImpl.java

@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Singleton
 public class AnniversaryReportServicesImpl implements AnniversaryServices {
@@ -48,7 +47,7 @@ public List<AnniversaryReportResponseDTO> findByValue(@Nullable String[] months)
                             .filter(member -> member.getStartDate() != null
                                     && month.equalsIgnoreCase(member.getStartDate().getMonth().name())
                                     && member.getTerminationDate() == null)
-                            .collect(Collectors.toList());
+                            .toList();
                 }
                 memberProfileAll.addAll(memberProfile);
             }
@@ -66,7 +65,7 @@ public List<AnniversaryReportResponseDTO> getTodaysAnniversaries() {
                 .stream()
                 .filter(member -> member.getStartDate() != null
                         && today.getMonthValue() == member.getStartDate().getMonthValue())
-                .collect(Collectors.toList());
+                .toList();
         return profileToAnniversaryResponseDto(results);
     }
 

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/birthday/BirthDayServicesImpl.java

@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Singleton
 public class BirthDayServicesImpl implements BirthDayServices{
@@ -30,14 +29,14 @@ public List<BirthDayResponseDTO> findByValue(String[] months, Integer[] daysOfMo
         }
 
         Set<MemberProfile> memberProfiles = memberProfileServices.findByValues(null, null, null, null, null, null, false);
-        List<MemberProfile> memberProfileAll = memberProfiles.stream().collect(Collectors.toList());
+        List<MemberProfile> memberProfileAll = new ArrayList<>(memberProfiles);
         if (months != null) {
             for (String month : months) {
                 if (month != null) {
                     memberProfileAll = memberProfileAll
                             .stream()
                             .filter(member -> member.getBirthDate() != null && month.equalsIgnoreCase(member.getBirthDate().getMonth().name()) && member.getTerminationDate() == null)
-                            .collect(Collectors.toList());
+                            .toList();
                 }
             }
         }
@@ -47,21 +46,22 @@ public List<BirthDayResponseDTO> findByValue(String[] months, Integer[] daysOfMo
                     memberProfileAll = memberProfiles
                             .stream()
                             .filter(member -> member.getBirthDate() != null && day.equals(member.getBirthDate().getDayOfMonth()) && member.getTerminationDate() == null)
-                            .collect(Collectors.toList());
+                            .toList();
                 }
             }
         }
 
         return profileToBirthDateResponseDto(memberProfileAll);
     }
+
     @Override
     public List<BirthDayResponseDTO> getTodaysBirthdays() {
         Set<MemberProfile> memberProfiles = memberProfileServices.findByValues(null, null, null, null, null, null, false);
         LocalDate today = LocalDate.now();
         List<MemberProfile> results = memberProfiles
                 .stream()
                 .filter(member -> member.getBirthDate() != null && today.getMonthValue() == member.getBirthDate().getMonthValue())
-                .collect(Collectors.toList());
+                .toList();
         return profileToBirthDateResponseDto(results);
     }
 

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportServicesImpl.java

@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Singleton
 public class MemberProfileReportServicesImpl implements MemberProfileReportServices {
@@ -32,7 +31,7 @@ public File generateFile(MemberProfileReportQueryDTO queryDTO) {
             List<MemberProfileRecord> allRecords = memberProfileReportRepository.findAll();
             memberRecords.addAll(allRecords);
         } else {
-            List<String> memberIds = queryDTO.getMemberIds().stream().map(UUID::toString).collect(Collectors.toList());
+            List<String> memberIds = queryDTO.getMemberIds().stream().map(UUID::toString).toList();
             List<MemberProfileRecord> filteredRecords = memberProfileReportRepository.findAllByMemberIds(memberIds);
             memberRecords.addAll(filteredRecords);
         }

server/src/main/java/com/objectcomputing/checkins/services/permissions/PermissionServicesImpl.java

@@ -2,18 +2,17 @@
 
 import jakarta.inject.Singleton;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.List;
 
 @Singleton
 public class PermissionServicesImpl implements PermissionServices {
 
-
   public List<Permission> findAll() {
-    return Arrays.stream(Permission.values()).collect(Collectors.toList());
+    return Arrays.asList(Permission.values());
   }
 
   public List<Permission> listOrderByPermission() {
-    return Arrays.stream(Permission.values()).sorted().collect(Collectors.toList());
+    return Arrays.stream(Permission.values()).sorted().toList();
   }
 }

server/src/main/java/com/objectcomputing/checkins/services/question_category/QuestionCategory.java

@@ -41,8 +41,7 @@ public QuestionCategory(UUID id, @NotBlank String name) {
     }
 
     public QuestionCategory(@NotBlank String name) {
-        this.id = id;
-        this.name = name;
+        this(null, name);
     }
 
     public QuestionCategory() {}