Skip to content

Switch from collection.stream.foreach to collection.foreach #2525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timyates merged 2 commits into from
Jun 28, 2024
Merged

Switch from collection.stream.foreach to collection.foreach #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c838cef
Switch from collection.stream.foreach to collection.foreach
timyates Jun 25, 2024
780bdfc
Merge branch 'develop' into bugfix-use-collection-foreach-not-stream-…
mkimberlin Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public Set<FileInfoDTO> findFiles(@Nullable UUID checkInID) {

if (checkInID == null && isAdmin) {
FileList driveIndex = getFoldersInRoot(drive, rootDirId);
driveIndex.getFiles().stream().forEach(folder -> {
driveIndex.getFiles().forEach(folder -> {
try {
//find all
FileList fileList = drive.files().list().setSupportsAllDrives(true)
Expand All @@ -83,7 +83,7 @@ public Set<FileInfoDTO> findFiles(@Nullable UUID checkInID) {
.setSpaces("drive")
.setFields("files(id, name, parents, size)")
.execute();
fileList.getFiles().stream()
fileList.getFiles()
.forEach(file -> result.add(setFileInfo(file, null)));
} catch (IOException ioe) {
LOG.error("Error occurred while retrieving files from Google Drive.", ioe);
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ 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 -> {
guildDTO.getGuildMembers().forEach(updatedMember -> {
Optional<GuildMember> first = existingGuildMembers.stream().filter(existing -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
if(first.isEmpty()) {
Expand All @@ -186,7 +186,7 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
});

//delete any removed members from guild
existingGuildMembers.stream().forEach(existingMember -> {
existingGuildMembers.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()));
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/objectcomputing/checkins/services/team/TeamServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public TeamResponseDTO update(TeamUpdateDTO teamDTO) {

Set<TeamMember> existingTeamMembers = teamMemberServices.findByFields(teamDTO.getId(), null, null);
//add any new members & updates
teamDTO.getTeamMembers().stream().forEach(updatedMember -> {
teamDTO.getTeamMembers().forEach(updatedMember -> {
Optional<TeamMember> first = existingTeamMembers.stream().filter(existing -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
if (first.isEmpty()) {
MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
Expand All @@ -114,7 +114,7 @@ public TeamResponseDTO update(TeamUpdateDTO teamDTO) {
});

//delete any removed members
existingTeamMembers.stream().forEach(existingMember -> {
existingTeamMembers.forEach(existingMember -> {
if (!teamDTO.getTeamMembers().stream().filter(updatedTeamMember -> updatedTeamMember.getMemberId().equals(existingMember.getMemberId())).findFirst().isPresent()) {
teamMemberServices.delete(existingMember.getId());
}
Expand Down