Refactor for readability

donfiguerres · Jun 3, 2023 · 4e19417 · 4e19417
1 parent ef4ee59
commit 4e19417
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/main/java/com/europeanexchangerates/exchangeapi/service/ExchangeRateService.java b/src/main/java/com/europeanexchangerates/exchangeapi/service/ExchangeRateService.java
@@ -41,7 +41,6 @@ public ExchangeRateService(DataDownloader downloader) throws Exception {
      * @return exchange rates
      */
     public ExchangeRate getRatesForDate(LocalDate date) {
-        // Return exchange rate data for the given date
         return exchangeRates.get(date);
     }
 
@@ -114,12 +113,11 @@ public CurrencyAverageRate getAverageRate(LocalDate startDate,
                 .mapToDouble(BigDecimal::doubleValue)
                 .average();
 
-        BigDecimal averageRate = average.isPresent()
-                ? BigDecimal.valueOf(average.getAsDouble())
-                        .setScale(2, RoundingMode.HALF_UP)
-                : null;
-        return averageRate == null
-                ? null
-                : new CurrencyAverageRate(currency, startDate, endDate, averageRate);
+        if (!average.isPresent())
+            return null;
+
+        BigDecimal averageRate = BigDecimal.valueOf(average.getAsDouble())
+                .setScale(2, RoundingMode.HALF_UP);
+        return new CurrencyAverageRate(currency, startDate, endDate, averageRate);
     }
 }