Add class to query the query2 api

pom.xml

@@ -58,13 +58,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.slf4j </groupId>
-            <artifactId>slf4j-api </artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j </groupId>
-            <artifactId>slf4j-simple </artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
             <version>1.7.25</version>
             <scope>test</scope>
         </dependency>

src/main/java/yahoofinance/YahooFinance.java

@@ -46,6 +46,7 @@ public class YahooFinance {
     public static final String HISTQUOTES_BASE_URL = System.getProperty("yahoofinance.baseurl.histquotes", "https://ichart.yahoo.com/table.csv");
     public static final String HISTQUOTES2_ENABLED = System.getProperty("yahoofinance.histquotes2.enabled", "true");
     public static final String HISTQUOTES2_BASE_URL = System.getProperty("yahoofinance.baseurl.histquotes2", "https://query1.finance.yahoo.com/v7/finance/download/");
+    public static final String HISTQUOTESQUERY2V8_BASE_URL = System.getProperty("yahoofinance.baseurl.histquotesquery2v8", "https://query2.finance.yahoo.com/v8/finance/chart/");
     public static final String HISTQUOTES2_SCRAPE_URL = System.getProperty("yahoofinance.scrapeurl.histquotes2", "https://finance.yahoo.com/quote/%5EGSPC/options");
     public static final String HISTQUOTES2_CRUMB_URL = System.getProperty("yahoofinance.crumburl.histquotes2", "https://query1.finance.yahoo.com/v1/test/getcrumb");
     public static final String HISTQUOTES2_CRUMB = System.getProperty("yahoofinance.crumb", "");

src/main/java/yahoofinance/query2v8/HistQuotesQuery2V8Request.java

@@ -0,0 +1,172 @@
+package yahoofinance.query2v8;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import yahoofinance.Utils;
+import yahoofinance.YahooFinance;
+import yahoofinance.histquotes.HistoricalQuote;
+import yahoofinance.histquotes2.QueryInterval;
+import yahoofinance.util.RedirectableRequest;
+
+/**
+ * @author Stijn Strickx
+ */
+public class HistQuotesQuery2V8Request {
+
+    private static final Logger log = LoggerFactory.getLogger(HistQuotesQuery2V8Request.class);
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final String symbol;
+    private final Calendar from;
+    private final Calendar to;
+    private final QueryInterval interval;
+
+    public static final Calendar DEFAULT_FROM = Calendar.getInstance();
+
+    static {
+        DEFAULT_FROM.add(Calendar.YEAR, -1);
+    }
+    public static final Calendar DEFAULT_TO = Calendar.getInstance();
+    public static final QueryInterval DEFAULT_INTERVAL = QueryInterval.MONTHLY;
+
+    public HistQuotesQuery2V8Request(String symbol) {
+        this(symbol, DEFAULT_INTERVAL);
+    }
+
+    public HistQuotesQuery2V8Request(String symbol, QueryInterval interval) {
+        this(symbol, DEFAULT_FROM, DEFAULT_TO, interval);
+    }
+
+
+    public HistQuotesQuery2V8Request(String symbol, Calendar from, Calendar to) {
+        this(symbol, from, to, DEFAULT_INTERVAL);
+    }
+
+    public HistQuotesQuery2V8Request(String symbol, Calendar from, Calendar to, QueryInterval interval) {
+        this.symbol = symbol;
+        this.from = this.cleanHistCalendar(from);
+        this.to = this.cleanHistCalendar(to);
+        this.interval = interval;
+    }
+
+    public HistQuotesQuery2V8Request(String symbol, Date from, Date to) {
+        this(symbol, from, to, DEFAULT_INTERVAL);
+    }
+
+    public HistQuotesQuery2V8Request(String symbol, Date from, Date to, QueryInterval interval) {
+        this(symbol, interval);
+        this.from.setTime(from);
+        this.to.setTime(to);
+        this.cleanHistCalendar(this.from);
+        this.cleanHistCalendar(this.to);
+    }
+
+    /**
+     * Put everything smaller than days at 0
+     * @param cal calendar to be cleaned
+     */
+    private Calendar cleanHistCalendar(Calendar cal) {
+        cal.set(Calendar.MILLISECOND, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.HOUR, 0);
+        return cal;
+    }
+
+    public List<HistoricalQuote> getResult() throws IOException {
+        String json = getJson();
+        JsonNode resultNode = objectMapper.readTree(json).get("chart").get("result").get(0);
+        JsonNode timestamps = resultNode.get("timestamp");
+        JsonNode indicators = resultNode.get("indicators");
+        JsonNode quotes = indicators.get("quote").get(0);
+        JsonNode closes = quotes.get("close");
+        JsonNode volumes = quotes.get("volume");
+        JsonNode opens = quotes.get("open");
+        JsonNode highs = quotes.get("high");
+        JsonNode lows = quotes.get("low");
+        JsonNode adjCloses = indicators.get("adjclose").get(0).get("adjclose");
+
+        List<HistoricalQuote> result = new ArrayList<HistoricalQuote>();
+        for (int i = 0; i < timestamps.size(); i++) {
+            long timestamp = timestamps.get(i).asLong();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(timestamp * 1000);
+            BigDecimal adjClose = adjCloses.get(i).decimalValue();
+            long volume = volumes.get(i).asLong();
+            BigDecimal open = opens.get(i).decimalValue();
+            BigDecimal high = highs.get(i).decimalValue();
+            BigDecimal low = lows.get(i).decimalValue();
+            BigDecimal close = closes.get(i).decimalValue();
+
+            HistoricalQuote quote = new HistoricalQuote(
+                symbol,
+                calendar,
+                open,
+                low,
+                high,
+                close,
+                adjClose,
+                volume);
+            result.add(quote);
+        }
+
+        return result;
+    }
+
+    public String getJson() throws IOException {
+
+        if(this.from.after(this.to)) {
+            log.warn("Unable to retrieve historical quotes. "
+                    + "From-date should not be after to-date. From: "
+                    + this.from.getTime() + ", to: " + this.to.getTime());
+            return "";
+        }
+
+        Map<String, String> params = new LinkedHashMap<String, String>();
+        params.put("period1", String.valueOf(this.from.getTimeInMillis() / 1000));
+        params.put("period2", String.valueOf(this.to.getTimeInMillis() / 1000));
+        params.put("interval", this.interval.getTag());
+        params.put("events", "div|split");
+
+        String url = YahooFinance.HISTQUOTESQUERY2V8_BASE_URL + URLEncoder.encode(this.symbol , "UTF-8") + "?" + Utils.getURLParameters(params);
+
+        // Get CSV from Yahoo
+        log.info("Sending request: " + url);
+
+        URL request = new URL(url);
+        RedirectableRequest redirectableRequest = new RedirectableRequest(request, 5);
+        redirectableRequest.setConnectTimeout(YahooFinance.CONNECTION_TIMEOUT);
+        redirectableRequest.setReadTimeout(YahooFinance.CONNECTION_TIMEOUT);
+        URLConnection connection = redirectableRequest.openConnection();
+
+        InputStreamReader is = new InputStreamReader(connection.getInputStream());
+        BufferedReader br = new BufferedReader(is);
+        StringBuilder builder = new StringBuilder();
+        for (String line = br.readLine(); line != null; line = br.readLine()) {
+            if (builder.length() > 0) {
+                builder.append("\n");
+            }
+            builder.append(line);
+        }
+        return builder.toString();
+    }
+
+}