Updated to use v1beta3 version of Alpaca APIs.

Jesse Thouin · Jesse Thouin · commit 1403348b3b74 · 2023-07-07T15:26:25.000-04:00
diff --git a/schema_json/endpoint/market_data/crypto/common/enums/exchange.json b/schema_json/endpoint/market_data/crypto/common/enums/exchange.json
diff --git a/schema_json/endpoint/market_data/crypto/historical/bar/crypto_bar.json b/schema_json/endpoint/market_data/crypto/historical/bar/crypto_bar.json
@@ -3,13 +3,8 @@
   "extends": {
     "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.common.historical.bar.Bar"
   },
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange."
-    },
     "v": {
       "existingJavaType": "java.lang.Double",
       "javaName": "volume",
diff --git a/schema_json/endpoint/market_data/crypto/historical/bar/crypto_bars_response.json b/schema_json/endpoint/market_data/crypto/historical/bar/crypto_bars_response.json
@@ -1,15 +1,11 @@
 {
   "type": "object",
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
     "bars": {
-      "existingJavaType": "java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.bar.CryptoBar>",
+      "existingJavaType": "java.util.Map<String, java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.bar.CryptoBar>>",
       "title": "The {@link java.util.ArrayList} of {@link net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.bar.CryptoBar}s."
     },
-    "symbol": {
-      "existingJavaType": "java.lang.String",
-      "title": "Symbol that was queried."
-    },
     "next_page_token": {
       "existingJavaType": "java.lang.String",
       "title": "Token that can be used to query the next page."
diff --git a/schema_json/endpoint/market_data/crypto/historical/quote/crypto_quote.json b/schema_json/endpoint/market_data/crypto/historical/quote/crypto_quote.json
@@ -3,13 +3,8 @@
   "extends": {
     "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.common.historical.quote.Quote"
   },
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange."
-    },
     "as": {
       "existingJavaType": "java.lang.Double",
       "javaName": "askSize",
diff --git a/schema_json/endpoint/market_data/crypto/historical/quote/crypto_quotes_response.json b/schema_json/endpoint/market_data/crypto/historical/quote/crypto_quotes_response.json
@@ -1,15 +1,11 @@
 {
   "type": "object",
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
     "quotes": {
-      "existingJavaType": "java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.quote.CryptoQuote>",
+      "existingJavaType": "java.util.Map<String, java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.quote.CryptoQuote>>",
       "title": "The {@link java.util.ArrayList} of {@link net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.quote.CryptoQuote}s."
     },
-    "symbol": {
-      "existingJavaType": "java.lang.String",
-      "title": "Symbol that was queried."
-    },
     "next_page_token": {
       "existingJavaType": "java.lang.String",
       "title": "Token that can be used to query the next page."
diff --git a/schema_json/endpoint/market_data/crypto/historical/quote/latest_crypto_quote_response.json b/schema_json/endpoint/market_data/crypto/historical/quote/latest_crypto_quote_response.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
     "symbol": {
       "existingJavaType": "java.lang.String",
diff --git a/schema_json/endpoint/market_data/crypto/historical/trade/crypto_trade.json b/schema_json/endpoint/market_data/crypto/historical/trade/crypto_trade.json
@@ -3,13 +3,8 @@
   "extends": {
     "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.common.historical.trade.Trade"
   },
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange where the trade happened."
-    },
     "s": {
       "existingJavaType": "java.lang.Double",
       "javaName": "size",
diff --git a/schema_json/endpoint/market_data/crypto/historical/trade/crypto_trades_response.json b/schema_json/endpoint/market_data/crypto/historical/trade/crypto_trades_response.json
@@ -1,15 +1,11 @@
 {
   "type": "object",
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
     "trades": {
-      "existingJavaType": "java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.trade.CryptoTrade>",
+      "existingJavaType": "java.util.Map<String, java.util.ArrayList<net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.trade.CryptoTrade>>",
       "title": "The {@link java.util.ArrayList} of {@link net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.historical.trade.CryptoTrade}s."
     },
-    "symbol": {
-      "existingJavaType": "java.lang.String",
-      "title": "Symbol that was queried."
-    },
     "next_page_token": {
       "existingJavaType": "java.lang.String",
       "title": "Token that can be used to query the next page."
diff --git a/schema_json/endpoint/market_data/crypto/historical/trade/latest_crypto_trade_response.json b/schema_json/endpoint/market_data/crypto/historical/trade/latest_crypto_trade_response.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",
+  "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",
   "properties": {
     "symbol": {
       "existingJavaType": "java.lang.String",
diff --git a/schema_json/endpoint/market_data/crypto/historical/xbbo/xbbo.json b/schema_json/endpoint/market_data/crypto/historical/xbbo/xbbo.json
diff --git a/schema_json/endpoint/market_data/crypto/historical/xbbo/xbbo_response.json b/schema_json/endpoint/market_data/crypto/historical/xbbo/xbbo_response.json
diff --git a/schema_json/endpoint/market_data/crypto/realtime/bar/crypto_bar_message.json b/schema_json/endpoint/market_data/crypto/realtime/bar/crypto_bar_message.json
@@ -5,11 +5,6 @@
   },
   "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/real-time/\">Realtime Crypto Market Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange."
-    },
     "v": {
       "existingJavaType": "java.lang.Double",
       "javaName": "volume",
diff --git a/schema_json/endpoint/market_data/crypto/realtime/quote/crypto_quote_message.json b/schema_json/endpoint/market_data/crypto/realtime/quote/crypto_quote_message.json
@@ -5,11 +5,6 @@
   },
   "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/real-time/\">Realtime Crypto Market Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange."
-    },
     "as": {
       "existingJavaType": "java.lang.Double",
       "javaName": "askSize",
diff --git a/schema_json/endpoint/market_data/crypto/realtime/trade/crypto_trade_message.json b/schema_json/endpoint/market_data/crypto/realtime/trade/crypto_trade_message.json
@@ -5,11 +5,6 @@
   },
   "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/real-time/\">Realtime Crypto Market Data</a>.",
   "properties": {
-    "x": {
-      "existingJavaType": "net.jacobpeterson.alpaca.model.endpoint.marketdata.crypto.common.enums.Exchange",
-      "javaName": "exchange",
-      "title": "Exchange where the trade happened."
-    },
     "s": {
       "existingJavaType": "java.lang.Double",
       "javaName": "size",
diff --git a/src/main/java/net/jacobpeterson/alpaca/AlpacaAPI.java b/src/main/java/net/jacobpeterson/alpaca/AlpacaAPI.java
@@ -44,7 +44,7 @@ public class AlpacaAPI {
     private static final Logger LOGGER = LoggerFactory.getLogger(AlpacaAPI.class);
 
     private static final String VERSION_2_PATH_SEGMENT = "v2";
-    private static final String VERSION_1_BETA_1_PATH_SEGMENT = "v1beta1";
+    private static final String VERSION_1_BETA_3_PATH_SEGMENT = "v1beta3";
 
     private final OkHttpClient okHttpClient;
     private final AlpacaClient brokerClient;
@@ -160,7 +160,7 @@ public AlpacaAPI(OkHttpClient okHttpClient, String keyID, String secretKey, Stri
         if (oAuthToken == null) {
             brokerClient = new AlpacaClient(okHttpClient, keyID, secretKey,
                     brokerHostSubdomain, VERSION_2_PATH_SEGMENT);
-            cryptoDataClient = new AlpacaClient(okHttpClient, keyID, secretKey, "data", VERSION_1_BETA_1_PATH_SEGMENT);
+            cryptoDataClient = new AlpacaClient(okHttpClient, keyID, secretKey, "data", VERSION_1_BETA_3_PATH_SEGMENT);
             stockDataClient = new AlpacaClient(okHttpClient, keyID, secretKey, "data", VERSION_2_PATH_SEGMENT);
         } else {
             brokerClient = new AlpacaClient(okHttpClient, oAuthToken, brokerHostSubdomain, VERSION_2_PATH_SEGMENT);
diff --git a/src/main/java/net/jacobpeterson/alpaca/rest/endpoint/marketdata/crypto/CryptoMarketDataEndpoint.java b/src/main/java/net/jacobpeterson/alpaca/rest/endpoint/marketdata/crypto/CryptoMarketDataEndpoint.java
diff --git a/src/main/java/net/jacobpeterson/alpaca/websocket/marketdata/crypto/CryptoMarketDataWebsocket.java b/src/main/java/net/jacobpeterson/alpaca/websocket/marketdata/crypto/CryptoMarketDataWebsocket.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "object",`
`3`		`- "title": "See <a href=\"https://alpaca.markets/docs/api-documentation/api-v2/market-data/alpaca-crypto-data/historical/\">Historical Crypto Data</a>.",`
	`3`	`+ "title": "See <a href=\"https://alpaca.markets/docs/api-references/market-data-api/crypto-pricing-data/historical/\">Historical Crypto Data</a>.",`
`4`	`4`	`"properties": {`
`5`	`5`	`"symbol": {`
`6`	`6`	`"existingJavaType": "java.lang.String",`