Merge branch 'main_merge_25081501' into 'main'

feat: updated HK market and JP asset interfaces

See merge request webull/openapi-java-sdk!24

Author: 方佳

pom.xml

@@ -21,7 +21,7 @@
     <groupId>com.webull.openapi</groupId>
     <artifactId>webull-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.14</version>
+    <version>0.2.15</version>
 
     <name>webull-java-sdk</name>
     <url>https://github.com/webull-inc/openapi-java-sdk/</url>

webull-java-sdk-core/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.webull.openapi</groupId>
         <artifactId>webull-java-sdk</artifactId>
-        <version>0.2.14</version>
+        <version>0.2.15</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

webull-java-sdk-core/src/main/java/com/webull/openapi/common/dict/Category.java

@@ -60,5 +60,16 @@ public enum Category {
     /**
      * Stock/ETF CFDs
      */
-    US_CFDONSTOCK
+    US_CFDONSTOCK,
+
+    /**
+     * Japan stock
+     */
+    JP_STOCK,
+
+    /**
+     * Japan etf
+     */
+    JP_ETF;
+
 }

webull-java-sdk-core/src/main/java/com/webull/openapi/common/dict/TradingSession.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 Webull
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.webull.openapi.common.dict;
+
+public enum TradingSession {
+
+    /** Pre-Market */
+    PRE,
+
+    /** Regular Trading Hours */
+    RTH,
+
+    /** After-Trading Hours */
+    ATH,
+
+    /** Overnight */
+    OVN,
+}

webull-java-sdk-core/src/main/java/com/webull/openapi/common/dict/YesOrNo.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 Webull
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.webull.openapi.common.dict;
+
+public enum YesOrNo {
+
+    /** Yes */
+    Y,
+
+    /** No */
+    N,
+}

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

@@ -24,7 +24,7 @@ private ProjectReaderHelper() {
 
     private static final String APPLICATION_VERSION = "application.version";
 
-    private static final String DEFAULT_APPLICATION_VERSION = "0.2.14";
+    private static final String DEFAULT_APPLICATION_VERSION = "0.2.15";
 
     private static final String APPLICATION_NAME = "application.name";
 

webull-java-sdk-example/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.webull.openapi</groupId>
         <artifactId>webull-java-sdk</artifactId>
-        <version>0.2.14</version>
+        <version>0.2.15</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

webull-java-sdk-example/src/main/java/com/webull/openapi/example/quotes/QuotesGrpcApi.java

@@ -3,6 +3,8 @@
 import com.google.api.client.util.Lists;
 import com.webull.openapi.common.dict.Category;
 import com.webull.openapi.common.dict.Timespan;
+import com.webull.openapi.common.dict.TradingSession;
+import com.webull.openapi.common.dict.YesOrNo;
 import com.webull.openapi.example.config.Env;
 import com.webull.openapi.execption.ClientException;
 import com.webull.openapi.execption.ServerException;
@@ -17,6 +19,7 @@
 import com.webull.openapi.quotes.domain.Tick;
 import com.webull.openapi.serialize.JsonSerializer;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -39,6 +42,12 @@ public static void main(String[] args) {
             symbols.add("AAPL");
             symbols.add("TSLA");
 
+            List<String> tradingSessions = new ArrayList<>();
+            tradingSessions.add(TradingSession.PRE.name());
+            tradingSessions.add(TradingSession.RTH.name());
+            tradingSessions.add(TradingSession.ATH.name());
+            tradingSessions.add(TradingSession.OVN.name());
+
             List<Instrument> instruments = quotesApiClient.getInstruments(symbols, Category.US_STOCK.name());
             logger.info("Instruments: {}", JsonSerializer.toJson(instruments));
 
@@ -50,6 +59,14 @@ public static void main(String[] args) {
             BatchBarResponse batchBars = quotesApiClient.getBatchBars(Lists.newArrayList(symbols), Category.US_STOCK.name(), Timespan.M1.name(), 2);
             logger.info("Batch bars: {}", JsonSerializer.toJson(batchBars));
 
+            // get bars. Only supports HK.
+            bars = quotesApiClient.getBars(symbol, Category.US_STOCK.name(), Timespan.M5.name(), 10, YesOrNo.N.name() , tradingSessions);
+            logger.info("Bars: {}", JsonSerializer.toJson(bars));
+
+            // get bars with symbols. Only supports HK.
+            batchBars = quotesApiClient.getBatchBars(Lists.newArrayList(symbols), Category.US_STOCK.name(), Timespan.M15.name(), 2, YesOrNo.N.name() , tradingSessions);
+            logger.info("Batch bars: {}", JsonSerializer.toJson(batchBars));
+
             // get quote
             Quote quote = quotesApiClient.getQuote(symbol, Category.US_STOCK.name());
             logger.info("Quote: {}", JsonSerializer.toJson(quote));

webull-java-sdk-example/src/main/java/com/webull/openapi/example/quotes/QuotesHttpApi.java

@@ -3,6 +3,8 @@
 import com.webull.openapi.common.dict.Category;
 import com.webull.openapi.common.dict.EventType;
 import com.webull.openapi.common.dict.Timespan;
+import com.webull.openapi.common.dict.TradingSession;
+import com.webull.openapi.common.dict.YesOrNo;
 import com.webull.openapi.example.config.Env;
 import com.webull.openapi.execption.ClientException;
 import com.webull.openapi.execption.ServerException;
@@ -36,6 +38,12 @@ public static void main(String[] args) {
         eventTypes.add(EventType.Reverse_Stock_Split.getCode());
         eventTypes.add(EventType.Stock_Split.getCode());
 
+        List<String> tradingSessions = new ArrayList<>();
+        tradingSessions.add(TradingSession.PRE.name());
+        tradingSessions.add(TradingSession.RTH.name());
+        tradingSessions.add(TradingSession.ATH.name());
+        tradingSessions.add(TradingSession.OVN.name());
+
         HttpApiConfig apiConfig = HttpApiConfig.builder()
                 .appKey(Env.APP_KEY)
                 .appSecret(Env.APP_SECRET)
@@ -52,6 +60,14 @@ public static void main(String[] args) {
             BatchBarResponse batchBars = quotesApiClient.getBatchBars(new ArrayList<>(symbols), Category.US_STOCK.name(), Timespan.D.name(), 2);
             logger.info("Batch bars: {}", JsonSerializer.toJson(batchBars));
 
+            // get bars. Only supports HK.
+            bars = quotesApiClient.getBars("AAPL", Category.US_STOCK.name(), Timespan.D.name(), 10, YesOrNo.N.name() , tradingSessions);
+            logger.info("Bars: {}", bars);
+
+            // get bars with symbols. Only supports HK.
+            batchBars = quotesApiClient.getBatchBars(new ArrayList<>(symbols), Category.US_STOCK.name(), Timespan.D.name(), 2, YesOrNo.N.name() , tradingSessions);
+            logger.info("Batch bars: {}", JsonSerializer.toJson(batchBars));
+
             // get snapshots
             List<Snapshot> snapshots = quotesApiClient.getSnapshots(symbols, Category.US_STOCK.name());
             logger.info("Snapshots: {}", snapshots);

webull-java-sdk-example/src/main/java/com/webull/openapi/example/trade/TradeApi.java

@@ -22,16 +22,7 @@
 import com.webull.openapi.trade.api.request.v2.OptionOrder;
 import com.webull.openapi.trade.api.request.v2.OptionOrderItem;
 import com.webull.openapi.trade.api.request.v2.OptionOrderItemLeg;
-import com.webull.openapi.trade.api.response.Account;
-import com.webull.openapi.trade.api.response.AccountDetail;
-import com.webull.openapi.trade.api.response.AccountPositions;
-import com.webull.openapi.trade.api.response.BalanceBase;
-import com.webull.openapi.trade.api.response.InstrumentInfo;
-import com.webull.openapi.trade.api.response.Order;
-import com.webull.openapi.trade.api.response.OrderResponse;
-import com.webull.openapi.trade.api.response.Orders;
-import com.webull.openapi.trade.api.response.TradableInstruments;
-import com.webull.openapi.trade.api.response.TradeCalendar;
+import com.webull.openapi.trade.api.response.*;
 import com.webull.openapi.trade.api.response.v2.PreviewOrderResponse;
 import com.webull.openapi.trade.api.response.v2.TradeOrderResponse;
 import com.webull.openapi.utils.CollectionUtils;
@@ -209,6 +200,10 @@ public static void main(String[] args) {
             TradeOrderResponse cancelOptionResponse = apiService.cancelOption(accountId, cancelTradeOption);
             logger.info("cancelOptionResponse: {}", cancelOptionResponse);
 
+            String tickerId = "", startId = "";
+            Integer size = 10;
+            OAuthCommonPositionContractVO contractVO = apiService.getCommonPositionDetail(accountId, tickerId, startId, size);
+            logger.info("OAuthCommonPositionContractVO: {}", contractVO);
         } catch (ClientException ex) {
             logger.error("Client error", ex);
         } catch (ServerException ex) {