Skip to content
Snippets Groups Projects
Commit 7e8bc2c6 authored by Martin Slovík's avatar Martin Slovík
Browse files

Changing ResourceNotFoundException usage

parent 2391a2e4
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,7 @@ public class FlightFacadeImpl implements FlightFacade<Long> {
@Override
public Optional<FlightDto> findById(Long id) {
var foundFlightEntity = flightService.findById(id)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
var flightDto = flightMapper.toDto(foundFlightEntity);
flightDto.setStewards(mapStewardDtos(foundFlightEntity));
......
......@@ -43,7 +43,7 @@ public class StewardFacadeImpl implements StewardFacade<Long> {
@Override
public Optional<StewardDto> findById(Long id) {
var foundStewardEntity = stewardService.findById(id)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
var stewardDto = stewardMapper.toDto(foundStewardEntity);
stewardDto.setFlights(mapFlightDtos(foundStewardEntity));
......@@ -92,10 +92,10 @@ public class StewardFacadeImpl implements StewardFacade<Long> {
public StewardDto assignStewardFlight(Long stewardId, Long flightId) {
var stewardEntity = stewardService.findByIdWithFlights(stewardId)
.orElse(stewardService.findById(stewardId)
.orElseThrow(() -> new ResourceNotFoundException("Not Found.")));
.orElseThrow(ResourceNotFoundException::new));
var flightEntity = flightService.findById(flightId)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
var flightSteward = new FlightSteward();
flightSteward.setSteward(stewardEntity);
......@@ -111,10 +111,10 @@ public class StewardFacadeImpl implements StewardFacade<Long> {
@Override
public void deleteStewardFlightsAssignment(Long stewardId, Long flightId) {
var stewardEntity = stewardService.findById(stewardId)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
var flightEntity = flightService.findById(flightId)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
stewardService.deleteFlightStewards(stewardEntity, flightEntity);
}
......
......@@ -28,7 +28,7 @@ public class FlightServiceImpl extends BaseServiceImpl<Flight, Long> implements
@Override
public Flight update(Long id, Flight newFlight) {
var entityToUpdate = flightRepository.findById(id)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
entityToUpdate.setDepartureTime(newFlight.getDepartureTime());
entityToUpdate.setArrivalTime(newFlight.getArrivalTime());
......
......@@ -38,14 +38,14 @@ public class StewardServiceImpl extends BaseServiceImpl<Steward, Long> implement
@Override
public void deleteFlightStewards(Steward steward, Flight flight) {
var foundFlightStewards = flightStewardRepository.findByStewardAndFlight(steward, flight)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
flightStewardRepository.delete(foundFlightStewards);
}
@Override
public Steward update(Long id, Steward newSteward) {
var entityToUpdate = stewardRepository.findById(id)
.orElseThrow(() -> new ResourceNotFoundException("Not Found."));
.orElseThrow(ResourceNotFoundException::new);
entityToUpdate.setFirstName(newSteward.getFirstName());
entityToUpdate.setLastName(newSteward.getLastName());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment