diff --git a/data-api/java-rest/src/main/java/io/coinapi/rest/REST_methods.java b/data-api/java-rest/src/main/java/io/coinapi/rest/REST_methods.java index 0b5b0b38b1..2c0d25d247 100644 --- a/data-api/java-rest/src/main/java/io/coinapi/rest/REST_methods.java +++ b/data-api/java-rest/src/main/java/io/coinapi/rest/REST_methods.java @@ -252,18 +252,36 @@ public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_ident JSONArray array = new JSONArray(json); return parse_timeseries(array); } + + public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, String time_start) throws IOException { + String json = get_json("/v1/ohlcv/" + symbol_id + "/history?period_id=" + period_id + "&time_start=" + time_start); + JSONArray array = new JSONArray(json); + return parse_timeseries(array); + } public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, Instant time_start, Instant time_end) throws IOException { String json = get_json("/v1/ohlcv/" + symbol_id + "/history?period_id=" + period_id + "&time_start=" + time_start + "&time_end=" + time_end); JSONArray array = new JSONArray(json); return parse_timeseries(array); } + + public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, String time_start, String time_end) throws IOException { + String json = get_json("/v1/ohlcv/" + symbol_id + "/history?period_id=" + period_id + "&time_start=" + time_start + "&time_end=" + time_end); + JSONArray array = new JSONArray(json); + return parse_timeseries(array); + } public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, Instant time_start, int limit) throws IOException { String json = get_json("/v1/ohlcv/" + symbol_id + "/history?period_id=" + period_id + "&time_start=" + time_start + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_timeseries(array); } + + public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, String time_start, int limit) throws IOException { + String json = get_json("/v1/ohlcv/" + symbol_id + "/history?period_id=" + period_id + "&time_start=" + time_start + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_timeseries(array); + } public Timedata[] ohlcv_get_historical_timeseries(String symbol_id, Period_identifier period_id, Instant time_start, Instant time_end, int limit) throws IOException { String json = get_json( @@ -399,24 +417,48 @@ public Trade[] trades_get_historical_data(String symbol_id, Instant time_start) JSONArray array = new JSONArray(json); return parse_trades(array); } + + public Trade[] trades_get_historical_data(String symbol_id, String time_start) throws IOException { + String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start); + JSONArray array = new JSONArray(json); + return parse_trades(array); + } public Trade[] trades_get_historical_data(String symbol_id, Instant time_start, int limit) throws IOException { String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_trades(array); } + + public Trade[] trades_get_historical_data(String symbol_id, String time_start, int limit) throws IOException { + String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_trades(array); + } public Trade[] trades_get_historical_data(String symbol_id, Instant time_start, Instant time_end) throws IOException { String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); JSONArray array = new JSONArray(json); return parse_trades(array); } + + public Trade[] trades_get_historical_data(String symbol_id, String time_start, String time_end) throws IOException { + String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); + JSONArray array = new JSONArray(json); + return parse_trades(array); + } public Trade[] trades_get_historical_data(String symbol_id, Instant time_start, Instant time_end, int limit) throws IOException { String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_trades(array); } + + public Trade[] trades_get_historical_data(String symbol_id, String time_start, String time_end, int limit) throws IOException { + String json = get_json("/v1/trades/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_trades(array); + } public Quote_with_trade[] quotes_get_for_all_symbols() throws IOException { String json = get_json("/v1/quotes/current"); @@ -459,24 +501,47 @@ public Quote[] quotes_get_historical_data(String symbol_id, Instant time_start) JSONArray array = new JSONArray(json); return parse_quotes(array); } + + public Quote[] quotes_get_historical_data(String symbol_id, String time_start) throws IOException { + String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start); + JSONArray array = new JSONArray(json); + return parse_quotes(array); + } public Quote[] quotes_get_historical_data(String symbol_id, Instant time_start, int limit) throws IOException { String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_quotes(array); } - + + public Quote[] quotes_get_historical_data(String symbol_id, String time_start, int limit) throws IOException { + String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_quotes(array); + } + public Quote[] quotes_get_historical_data(String symbol_id, Instant time_start, Instant time_end) throws IOException { String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); JSONArray array = new JSONArray(json); return parse_quotes(array); } - + public Quote[] quotes_get_historical_data(String symbol_id, String time_start, String time_end) throws IOException { + String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); + JSONArray array = new JSONArray(json); + return parse_quotes(array); + } + public Quote[] quotes_get_historical_data(String symbol_id, Instant time_start, Instant time_end, int limit) throws IOException { String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_quotes(array); } + + public Quote[] quotes_get_historical_data(String symbol_id, String time_start, String time_end, int limit) throws IOException { + String json = get_json("/v1/quotes/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_quotes(array); + } public Orderbook[] orderbooks_get_for_all_symbols() throws IOException { String json = get_json("/v1/orderbooks/current"); @@ -507,24 +572,48 @@ public Orderbook[] orderbooks_get_historical_data(String symbol_id, Instant time JSONArray array = new JSONArray(json); return parse_orderbooks(array); } + + public Orderbook[] orderbooks_get_historical_data(String symbol_id, String time_start) throws IOException { + String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start); + JSONArray array = new JSONArray(json); + return parse_orderbooks(array); + } public Orderbook[] orderbooks_get_historical_data(String symbol_id, Instant time_start, int limit) throws IOException { String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_orderbooks(array); } + + public Orderbook[] orderbooks_get_historical_data(String symbol_id, String time_start, int limit) throws IOException { + String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_orderbooks(array); + } public Orderbook[] orderbooks_get_historical_data(String symbol_id, Instant time_start, Instant time_end) throws IOException { String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); JSONArray array = new JSONArray(json); return parse_orderbooks(array); } - + + public Orderbook[] orderbooks_get_historical_data(String symbol_id, String time_start, String time_end) throws IOException { + String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end); + JSONArray array = new JSONArray(json); + return parse_orderbooks(array); + } + public Orderbook[] orderbooks_get_historical_data(String symbol_id, Instant time_start, Instant time_end, int limit) throws IOException { String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); JSONArray array = new JSONArray(json); return parse_orderbooks(array); } + + public Orderbook[] orderbooks_get_historical_data(String symbol_id, String time_start, String time_end, int limit) throws IOException { + String json = get_json("/v1/orderbooks/" + symbol_id + "/history?time_start=" + time_start + "&time_end=" + time_end + "&limit=" + limit); + JSONArray array = new JSONArray(json); + return parse_orderbooks(array); + } private int[] parse_int_array(JSONArray array) { int[] result = new int[array.length()];