Merge branch 'main_merge_251122' into 'main'

feat: Supports Webull HK and Webull US

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

Author: 袁鸥

README.md

@@ -16,9 +16,10 @@ Subscription to real-time information: Subscribe to order status changes, market
 
 - Please first generate the app key and app secret on the Webull official website.
 
-| Broker    | Link                  |
-|-----------|-----------------------|
-| Webull HK | https://www.webull.hk |
+| Broker    | Link                                            |
+|-----------|-------------------------------------------------|
+| Webull HK | https://www.webull.hk/open-api                  |
+| Webull US | https://www.webull.com/center#openApiManagement |
 
 - Requires JDK 8 and above.
 
@@ -34,6 +35,7 @@ The bottom layer of Webull OpenAPI provides three protocols, HTTP / GRPC / MQTT,
 
 ## Developer documentation
 
-| Broker    | Link                                  |
-|-----------|---------------------------------------|
-| Webull HK | https://developer.webull.hk/apis/docs |
+| Broker    | Link                                   |
+|-----------|----------------------------------------|
+| Webull HK | https://developer.webull.hk/apis/docs  |
+| Webull US | https://developer.webull.com/apis/docs |

pom.xml

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

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

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

webull-openapi-java-sdk-samples/src/main/java/com/webull/openapi/samples/trade/TradeClientV2.java

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.webull.openapi</groupId>
         <artifactId>webull-openapi-java-sdk-parent</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>webull-openapi-java-sdk</artifactId>

webull-openapi-java-sdk/pom.xml

@@ -20,7 +20,7 @@ public final class DefaultHost {
     private DefaultHost() {}
 
     public static final String API_US = "api.webull.com";
-    public static final String QUOTES_US = "usquotes-api.webullfintech.com";
+    public static final String QUOTES_US = "data-api.webull.com";
     public static final String EVENTS_US = "events-api.webull.com";
 
     public static final String API_HK = "api.webull.hk";

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

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

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

@@ -37,6 +37,8 @@ private ErrorCode() {}
 
     public static final String TIMEOUT = "Timeout";
 
+    public static final String GET_CONFIG_ERROR = "GetConfigError";
+
     public static final String INIT_TOKEN_ERROR = "InitTokenError";
 
     public static final String LOAD_TOKEN_ERROR = "LoadTokenError";

webull-openapi-java-sdk/src/main/java/com/webull/openapi/core/execption/ErrorCode.java

@@ -15,12 +15,17 @@
  */
 package com.webull.openapi.core.http.initializer;
 
+import com.google.api.client.util.Lists;
 import com.webull.openapi.core.common.Region;
+import com.webull.openapi.core.execption.ClientException;
+import com.webull.openapi.core.execption.ErrorCode;
+import com.webull.openapi.core.http.HttpApiClient;
+import com.webull.openapi.core.http.initializer.config.ConfigService;
+import com.webull.openapi.core.http.initializer.config.bean.ApiConfig;
+import com.webull.openapi.core.http.initializer.token.TokenManager;
 import com.webull.openapi.core.logger.Logger;
 import com.webull.openapi.core.logger.LoggerFactory;
 import com.webull.openapi.core.utils.StringUtils;
-import com.webull.openapi.core.http.HttpApiClient;
-import com.webull.openapi.core.http.initializer.token.TokenManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +49,14 @@ public static void init(HttpApiClient apiClient){
      */
     private static void initToken(HttpApiClient apiClient){
 
-        if(!checkRegionTokenEnable(apiClient)){
+        List<String> disableConfigRegionIds = new ArrayList<>();
+        disableConfigRegionIds.add(Region.hk.name());
+        String regionId = Objects.nonNull(apiClient) && Objects.nonNull(apiClient.getConfig()) ? apiClient.getConfig().getRegionId() : null;
+        if(disableConfigRegionIds.contains(regionId)){
+            if(!checkRegionTokenEnable(apiClient)){
+                return;
+            }
+        }else if(!checkTokenEnable(apiClient)){
             return;
         }
 
@@ -81,4 +93,28 @@ private static boolean checkRegionTokenEnable(HttpApiClient apiClient){
         logger.info("CheckRegionTokenEnable result is {}, enable regionIds is {}.", result, enableRegionIds);
         return result;
     }
+
+    /**
+     * Check whether token checking is enabled
+     * @param apiClient
+     * @return
+     */
+    private static boolean checkTokenEnable(HttpApiClient apiClient){
+        if(Objects.isNull(apiClient)){
+            logger.warn("checkTokenEnable apiClient is null return false");
+            return false;
+        }
+
+        ConfigService configService = new ConfigService(apiClient);
+        ApiConfig apiConfig = configService.getConfig();
+        if(Objects.isNull(apiConfig)){
+            String msg = "checkTokenEnable apiConfig is null error.";
+            logger.warn(msg);
+            throw new ClientException(ErrorCode.GET_CONFIG_ERROR, msg);
+        }
+
+        boolean result = Boolean.TRUE.equals(apiConfig.getTokenCheckEnabled());
+        logger.info("checkTokenEnable result is {}", result);
+        return result;
+    }
 }

webull-openapi-java-sdk/src/main/java/com/webull/openapi/core/http/initializer/ClientInitializer.java

@@ -0,0 +1,48 @@
+/*
+ * 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.core.http.initializer.config;
+
+import com.webull.openapi.core.common.Versions;
+import com.webull.openapi.core.http.HttpApiClient;
+import com.webull.openapi.core.http.HttpApiConfig;
+import com.webull.openapi.core.http.HttpRequest;
+import com.webull.openapi.core.http.common.HttpMethod;
+import com.webull.openapi.core.http.initializer.config.bean.ApiConfig;
+import com.webull.openapi.core.http.initializer.token.bean.AccessToken;
+
+public class ConfigService {
+
+    private final HttpApiClient apiClient;
+
+    public ConfigService(HttpApiConfig config) {
+        this(new HttpApiClient(config));
+    }
+
+    public ConfigService(HttpApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    /**
+     * get config
+     * @return
+     */
+    public ApiConfig getConfig() {
+
+        HttpRequest request = new HttpRequest("/openapi/config", Versions.V2, HttpMethod.GET);
+        return apiClient.request(request).responseType(ApiConfig.class).doAction();
+
+    }
+}