Skip to content

Added mapping function to remove duplicate code #49

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

Open
mborciuch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added mapping function to remove duplicate code #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 16 additions & 19 deletions src/main/java/guru/springframework/msscbeerservice/services/BeerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.springframework.util.StringUtils;

import java.util.UUID;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -46,28 +47,24 @@ public BeerPagedList listBeers(String beerName, BeerStyleEnum beerStyle, PageReq
beerPage = beerRepository.findAll(pageRequest);
}

if (showInventoryOnHand){
beerPagedList = new BeerPagedList(beerPage
.getContent()
.stream()
.map(beerMapper::beerToBeerDtoWithInventory)
.collect(Collectors.toList()),
PageRequest
.of(beerPage.getPageable().getPageNumber(),
beerPage.getPageable().getPageSize()),
beerPage.getTotalElements());
Function<Beer, BeerDto> mappingFunction;

if (showInventoryOnHand) {
mappingFunction = beerMapper::beerToBeerDtoWithInventory;
} else {
beerPagedList = new BeerPagedList(beerPage
.getContent()
.stream()
.map(beerMapper::beerToBeerDto)
.collect(Collectors.toList()),
PageRequest
.of(beerPage.getPageable().getPageNumber(),
beerPage.getPageable().getPageSize()),
beerPage.getTotalElements());
mappingFunction = beerMapper::beerToBeerDto;
}

beerPagedList = new BeerPagedList(beerPage
.getContent()
.stream()
.map(mappingFunction)
.collect(Collectors.toList()),
PageRequest
.of(beerPage.getPageable().getPageNumber(),
beerPage.getPageable().getPageSize()),
beerPage.getTotalElements());

return beerPagedList;
}

Expand Down