From 30fd62fbd89651a8d2fd2891646040fd7efa6416 Mon Sep 17 00:00:00 2001
From: Soheil Parvizi <soheil.parvizi@gmail.com>
Date: Fri, 25 Aug 2023 15:04:00 +0200
Subject: [PATCH] Implement getBeerById in a better way

---
 .../spring6restmvc/services/BeerServiceJPA.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java b/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
index 2558cb743..06f18fdd7 100644
--- a/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
+++ b/src/main/java/guru/springframework/spring6restmvc/services/BeerServiceJPA.java
@@ -32,8 +32,8 @@ public List<BeerDTO> listBeers() {
 
     @Override
     public Optional<BeerDTO> getBeerById(UUID id) {
-        return Optional.ofNullable(beerMapper.beerToBeerDto(beerRepository.findById(id)
-                .orElse(null)));
+        return beerRepository.findById(id)
+                .map(beerMapper::beerToBeerDto);
     }
 
     @Override