JAVA-23837 Verify code for "Java SPI" article

java-spi/exchange-rate-api/src/main/java/com/baeldung/rate/ExchangeRate.java

@@ -16,9 +16,7 @@ public final class ExchangeRate {
     public static List<ExchangeRateProvider> providers() {
         List<ExchangeRateProvider> services = new ArrayList<>();
         ServiceLoader<ExchangeRateProvider> loader = ServiceLoader.load(ExchangeRateProvider.class);
-        loader.forEach(exchangeRateProvider -> {
+        loader.forEach(services::add);
-            services.add(exchangeRateProvider);
-        });
         return services;
     }
 

java-spi/exchange-rate-api/src/main/java/com/baeldung/rate/api/Quote.java

@@ -8,7 +8,12 @@ public class Quote {
     private BigDecimal ask;
     private BigDecimal bid;
     private LocalDate date;
-    //...
+
+    public Quote(String currency, BigDecimal ask, BigDecimal bid) {
+        this.currency = currency;
+        this.ask = ask;
+        this.bid = bid;
+    }
 
     public String getCurrency() {
         return currency;

java-spi/exchange-rate-impl/src/main/java/com/baeldung/rate/impl/QuoteResponse.java

@@ -1,26 +0,0 @@
-package com.baeldung.rate.impl;
-
-import com.baeldung.rate.api.Quote;
-
-import java.util.List;
-
-public class QuoteResponse {
-    private List<Quote> result;
-    private String error;
-
-    public List<Quote> getResult() {
-        return result;
-    }
-
-    public void setResult(List<Quote> result) {
-        this.result = result;
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-}

java-spi/exchange-rate-impl/src/main/java/com/baeldung/rate/impl/QuoteResponseWrapper.java

@@ -1,13 +0,0 @@
-package com.baeldung.rate.impl;
-
-public class QuoteResponseWrapper {
-    private QuoteResponse quoteResponse;
-
-    public QuoteResponse getQuoteResponse() {
-        return quoteResponse;
-    }
-
-    public void setQuoteResponse(QuoteResponse quoteResponse) {
-        this.quoteResponse = quoteResponse;
-    }
-}

java-spi/exchange-rate-impl/src/main/java/com/baeldung/rate/impl/YahooQuoteManagerImpl.java

@@ -2,64 +2,102 @@ package com.baeldung.rate.impl;
 
 import com.baeldung.rate.api.Quote;
 import com.baeldung.rate.api.QuoteManager;
+
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
+import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Currency;
 import java.util.List;
+import java.util.Map;
 
 public class YahooQuoteManagerImpl implements QuoteManager {
 
-    static final String URL_PROVIDER = "https://query1.finance.yahoo.com/v7/finance/quote";
+    static final String URL_PROVIDER = "https://query2.finance.yahoo.com/v6/finance/quoteSummary/%s=X?modules=summaryDetail";
     OkHttpClient client = new OkHttpClient();
 
     @Override
     public List<Quote> getQuotes(String baseCurrency, LocalDate date) {
 
-        StringBuilder sb = new StringBuilder();
+        List<String> currencyQuery = new ArrayList<>();
         Currency.getAvailableCurrencies().forEach(currency -> {
             if (!baseCurrency.equals(currency.getCurrencyCode())) {
-                sb.append(baseCurrency).append(currency.getCurrencyCode()).append("=X").append(",");
+                currencyQuery.add(String.format(URL_PROVIDER, baseCurrency + currency.getCurrencyCode()));
             }
         });
-
+        final List<Quote> quotes = new ArrayList<>();
-        String value = "";
+        for (String url: currencyQuery) {
-        try {
+            String response = doGetRequest(url);
-            value = URLEncoder.encode(sb.toString().substring(0, sb.toString().length() - 1), "UTF-8");
+            if (response != null) {
-        } catch (UnsupportedEncodingException e) {
+                final Quote map = map(response);
-            e.printStackTrace();
+                if (map != null) {
+                    quotes.add(map);
+                }
+            }
         }
-        String queryString = String.format("%s=%s", "symbols", value);
+        return quotes;
-        String response = doGetRequest(queryString);
-        System.out.println(response);
-        return map(response);
     }
 
-    private List<Quote> map(String response) {
+    private Quote map(String response) {
-        QuoteResponseWrapper qrw = JsonbBuilder.create().fromJson(response, QuoteResponseWrapper.class);
+        try (final Jsonb jsonb = JsonbBuilder.create()) {
-        return qrw.getQuoteResponse().getResult();
+            final Map qrw = jsonb.fromJson(response, Map.class);
+            return parseResult(qrw);
+        } catch (Exception e) {
+            System.out.println("Error while trying to read response");
+            return null;
+        }
     }
 
-    String doGetRequest(String queryString) {
+    private static Quote parseResult(Map qrw) {
-        String fullUrl = URL_PROVIDER + "?" + queryString;
+        Quote quote = null;
+        if (qrw != null) {
+            final Map quoteSummary = (Map) qrw.get("quoteSummary");
+            if (quoteSummary != null) {
+                final List<Map> result = (List<Map>) quoteSummary.get("result");
+                if (result != null) {
+                    final Map resultArray = result.get(0);
+                    if (resultArray != null) {
+                        final Map summaryDetail = (Map) resultArray.get("summaryDetail");
+                        if (summaryDetail != null) {
+                            quote = constructQuote(summaryDetail);
+                        }
+                    }
+                }
+            }
+        }
+        return quote;
+    }
 
-        System.out.println(fullUrl);
+    private static Quote constructQuote(Map summaryDetail) {
+        final String currency = (String) summaryDetail.get("currency");
+        final Map ask = (Map) summaryDetail.get("ask");
+        final Map bid = (Map) summaryDetail.get("bid");
+        final BigDecimal askPrice = (BigDecimal) ask.get("raw");
+        final BigDecimal bidPrice = (BigDecimal) bid.get("raw");
+        if (askPrice != null && bidPrice != null) {
+            return new Quote(currency, askPrice, bidPrice);
+        }
+        return null;
+    }
+
+    String doGetRequest(String url) {
+
+        System.out.println(url);
         Request request = new Request.Builder()
-                .url(fullUrl)
+                .url(url)
                 .build();
-        Response response = null;
+        Response response;
         try {
             response = client.newCall(request).execute();
             return response.body().string();
         } catch (IOException e) {
-            e.printStackTrace();
+            return null;
         }
-        return null;
     }
 }