Skip to content

Commit 0d141d5

Browse files
author
方佳
committed
Merge branch 'main_merge_261017' into 'main'
[API-1816]: add market data api add start_time and end_time for bars/list See merge request webull/webull-openapi-java-sdk!51
2 parents 4bc2596 + c9dd72f commit 0d141d5

23 files changed

Lines changed: 1870 additions & 46 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<groupId>com.webull.openapi</groupId>
2222
<artifactId>webull-openapi-java-sdk-parent</artifactId>
2323
<packaging>pom</packaging>
24-
<version>2.0.3</version>
24+
<version>2.0.4</version>
2525

2626
<name>webull-openapi-java-sdk-parent</name>
2727
<url>https://github.com/webull-inc/webull-openapi-java-sdk/</url>

‎webull-openapi-java-sdk-samples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.webull.openapi</groupId>
2121
<artifactId>webull-openapi-java-sdk-parent</artifactId>
22-
<version>2.0.3</version>
22+
<version>2.0.4</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

‎webull-openapi-java-sdk-samples/src/main/java/com/webull/openapi/samples/data/DataClient.java‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,16 @@ public static void main(String[] args) {
7272
cryptoInstruments = dataClient.getCryptoInstrument(instrumentQueryParam);
7373
logger.info("Crypto instruments: {}", cryptoInstruments);
7474

75-
// get crypto bars
76-
List<NBar> cryptoBars = dataClient.getCryptoBars(cryptoSymbols,Category.US_CRYPTO.name(), Timespan.M1.name(), 100, true);
75+
// get crypto bars (startTime/endTime are optional timestamps in milliseconds; leave them null to omit the time range)
76+
BarsQueryParam cryptoBarsParam = new BarsQueryParam();
77+
cryptoBarsParam.setSymbols(new ArrayList<>(cryptoSymbols));
78+
cryptoBarsParam.setCategory(Category.US_CRYPTO.name());
79+
cryptoBarsParam.setTimespan(Timespan.M1.name());
80+
cryptoBarsParam.setCount(100);
81+
cryptoBarsParam.setRealTimeRequired(true);
82+
cryptoBarsParam.setStartTime(1711262998500L);
83+
cryptoBarsParam.setEndTime(1711349398500L);
84+
List<NBar> cryptoBars = dataClient.getCryptoBars(cryptoBarsParam);
7785
logger.info("Crypto bars: {}", cryptoBars);
7886

7987
//get crypto snapshot
@@ -115,7 +123,16 @@ public static void main(String[] args) {
115123
List<Snapshot> futureSnapshots = dataClient.getFuturesSnapshots(futuresSymbols, Category.US_FUTURES.name());
116124
logger.info("Futures Snapshots: {}", futureSnapshots);
117125

118-
List<NBar> futureBars = dataClient.getFuturesBars(new ArrayList<>(futuresSymbols), Category.US_FUTURES.name(), Timespan.M1.name(), 10, false);
126+
// get futures bars (startTime/endTime are optional timestamps in milliseconds; leave them null to omit the time range)
127+
BarsQueryParam futuresBarsParam = new BarsQueryParam();
128+
futuresBarsParam.setSymbols(new ArrayList<>(futuresSymbols));
129+
futuresBarsParam.setCategory(Category.US_FUTURES.name());
130+
futuresBarsParam.setTimespan(Timespan.M1.name());
131+
futuresBarsParam.setCount(10);
132+
futuresBarsParam.setRealTimeRequired(false);
133+
futuresBarsParam.setStartTime(1711262998500L);
134+
futuresBarsParam.setEndTime(1711349398500L);
135+
List<NBar> futureBars = dataClient.getFuturesBars(futuresBarsParam);
119136
logger.info("Futures Bars: {}", futureBars);
120137

121138
List<FuturesProduct> futuresProducts = dataClient.getFuturesProducts(Category.US_FUTURES.name());
@@ -163,7 +180,16 @@ public static void main(String[] args) {
163180
List<OptionSnapshot> optionSnapshots = dataClient.getOptionSnapshots(optionSymbols, Category.US_OPTION.name());
164181
logger.info("Option Snapshots: {}", optionSnapshots);
165182

166-
List<OptionBars> optionBars = dataClient.getOptionBars(new ArrayList<>(optionSymbols), Category.US_OPTION.name(), Timespan.M1.name(), 10, false);
183+
// get option bars (startTime/endTime are optional timestamps in milliseconds; leave them null to omit the time range)
184+
BarsQueryParam optionBarsParam = new BarsQueryParam();
185+
optionBarsParam.setSymbols(new ArrayList<>(optionSymbols));
186+
optionBarsParam.setCategory(Category.US_OPTION.name());
187+
optionBarsParam.setTimespan(Timespan.M1.name());
188+
optionBarsParam.setCount(10);
189+
optionBarsParam.setRealTimeRequired(false);
190+
optionBarsParam.setStartTime(1711262998500L);
191+
optionBarsParam.setEndTime(1711349398500L);
192+
List<OptionBars> optionBars = dataClient.getOptionBars(optionBarsParam);
167193
logger.info("Option Bars: {}", optionBars);
168194

169195
OptionTick OptionTicks = dataClient.getOptionTicks("AAPL260522C00300000", Category.US_OPTION.name(), 30);

‎webull-openapi-java-sdk-samples/src/main/java/com/webull/openapi/samples/data/DataClientEvent.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,16 @@ public static void main(String[] args) {
6565
EventDepth eventDepth = dataClient.getEventDepth(symbol, Category.US_EVENT.name(), "10");
6666
logger.info("Event Depth: {}", eventDepth);
6767

68-
List<EventBars> eventBars = dataClient.getEventBars(symbols, Category.US_EVENT.name(), Timespan.M1.name(), 200, false);
68+
// get event bars (startTime/endTime are optional timestamps in milliseconds; leave them null to omit the time range)
69+
BarsQueryParam eventBarsParam = new BarsQueryParam();
70+
eventBarsParam.setSymbols(new ArrayList<>(symbols));
71+
eventBarsParam.setCategory(Category.US_EVENT.name());
72+
eventBarsParam.setTimespan(Timespan.M1.name());
73+
eventBarsParam.setCount(200);
74+
eventBarsParam.setRealTimeRequired(false);
75+
eventBarsParam.setStartTime(1711262998500L);
76+
eventBarsParam.setEndTime(1711349398500L);
77+
List<EventBars> eventBars = dataClient.getEventBars(eventBarsParam);
6978
logger.info("Event Bars: {}", eventBars);
7079

7180
EventTick eventTick = dataClient.getEventTick(symbol, Category.US_EVENT.name(), 200);

‎webull-openapi-java-sdk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.webull.openapi</groupId>
99
<artifactId>webull-openapi-java-sdk-parent</artifactId>
10-
<version>2.0.3</version>
10+
<version>2.0.4</version>
1111
</parent>
1212

1313
<artifactId>webull-openapi-java-sdk</artifactId>

‎webull-openapi-java-sdk/src/main/java/com/webull/openapi/core/config/ProjectReaderHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private ProjectReaderHelper() {
2424

2525
private static final String APPLICATION_VERSION = "application.version";
2626

27-
private static final String DEFAULT_APPLICATION_VERSION = "2.0.3";
27+
private static final String DEFAULT_APPLICATION_VERSION = "2.0.4";
2828

2929
private static final String APPLICATION_NAME = "application.name";
3030

0 commit comments

Comments
 (0)