1.2.7

VictorFrWu · Sep 11, 2024 · 3b474b8 · 3b474b8
1 parent 0fc6489
commit 3b474b8
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,9 +6,9 @@
 
     <groupId>io.github.wuhewuhe</groupId>
     <artifactId>bybit-java-api</artifactId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.7</version>
     <name>bybit-java-api</name>
-    <url>https://github.com/wuhewuhe/bybit-java-api</url>
+    <url>https://github.com/VictorFrWu/bybit-java-api</url>
 
     <licenses>
         <license>
@@ -45,9 +45,9 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/wuhewuhe/bybit-java-api.git</connection>
-        <developerConnection>scm:git:ssh://github.com/wuhewuhe/bybit-java-api.git</developerConnection>
-        <url>https://github.com/wuhewuhe/bybit-java-api</url>
+        <connection>scm:git:git://github.com/VictorFrWu/bybit-java-api.git</connection>
+        <developerConnection>scm:git:ssh://github.com/VictorFrWu/bybit-java-api.git</developerConnection>
+        <url>https://github.com/VictorFrWu/bybit-java-api</url>
     </scm>
 
     <properties>
@@ -157,7 +157,7 @@
                                 <repository>
                                 <id>github</id>
                                 <name>GitHub Packages Repository</name>
-                                <url>https://maven.pkg.github.com/wuhewuhe/bybit-java-api</url>
+                                <url>https://maven.pkg.github.com/VictorFrWu/bybit-java-api</url>
                             </repository>
           -->
                            <snapshotRepository>
@@ -173,6 +173,16 @@
 
     <build>
         <plugins>
+<!--            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.5.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                </configuration>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -190,29 +200,20 @@
                 </configuration>
             </plugin>
 
-            <!-- Sonar Maven Central Package Management -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <goals>deploy</goals>
-                </configuration>
-            </plugin>
+            <!-- Nexus Repository Manager -->
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
+                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
                     <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                 </configuration>
             </plugin>
+
+            <!-- Javadoc and Sources Attachments -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -244,10 +245,12 @@
                     </links>
                 </configuration>
             </plugin>
+
+            <!-- GPG Signed Components -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>1.5</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>

diff --git a/src/main/java/com/bybit/api/client/domain/account/request/AccountDataRequest.java b/src/main/java/com/bybit/api/client/domain/account/request/AccountDataRequest.java
@@ -7,6 +7,7 @@
 import com.bybit.api.client.domain.position.MarginMode;
 import com.bybit.api.client.domain.preupgrade.TransactionType;
 import com.bybit.api.client.domain.user.IsUta;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,6 +17,7 @@
 @Setter
 @ToString
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountDataRequest {
     private AccountType accountType;
     private CategoryType category;

diff --git a/src/main/java/com/bybit/api/client/domain/announcement/request/AnnouncementInfoRequest.java b/src/main/java/com/bybit/api/client/domain/announcement/request/AnnouncementInfoRequest.java
@@ -3,15 +3,17 @@
 import com.bybit.api.client.domain.announcement.AnnouncementTag;
 import com.bybit.api.client.domain.announcement.AnnouncementType;
 import com.bybit.api.client.domain.announcement.LanguageSymbol;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
 @ToString
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnnouncementInfoRequest {
     private LanguageSymbol locale;
     private AnnouncementType type;

diff --git a/src/main/java/com/bybit/api/client/domain/broker/BrokerDataRequest.java b/src/main/java/com/bybit/api/client/domain/broker/BrokerDataRequest.java
@@ -1,14 +1,16 @@
 package com.bybit.api.client.domain.broker;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
 @ToString
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BrokerDataRequest {
     private final BusinessType bizType;
     private final String subMemberId;

diff --git a/src/main/java/com/bybit/api/client/domain/institution/LendingDataRequest.java b/src/main/java/com/bybit/api/client/domain/institution/LendingDataRequest.java
@@ -1,6 +1,7 @@
 package com.bybit.api.client.domain.institution;
 
 import com.bybit.api.client.domain.broker.BusinessType;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -10,6 +11,7 @@
 @Setter
 @ToString
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LendingDataRequest {
     private final String productId;
     private final String orderId;

diff --git a/src/main/java/com/bybit/api/client/domain/market/request/MarketDataRequest.java b/src/main/java/com/bybit/api/client/domain/market/request/MarketDataRequest.java
@@ -5,6 +5,7 @@
 import com.bybit.api.client.domain.announcement.AnnouncementType;
 import com.bybit.api.client.domain.announcement.LanguageSymbol;
 import com.bybit.api.client.domain.market.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,6 +15,7 @@
 @Setter
 @ToString
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class MarketDataRequest {
     private CategoryType category; // always required
     private String coin;

diff --git a/src/main/java/com/bybit/api/client/domain/position/request/PositionDataRequest.java b/src/main/java/com/bybit/api/client/domain/position/request/PositionDataRequest.java
@@ -5,15 +5,17 @@
 import com.bybit.api.client.domain.TriggerBy;
 import com.bybit.api.client.domain.position.*;
 import com.bybit.api.client.domain.trade.PositionIdx;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
 @ToString
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class PositionDataRequest {
     private CategoryType category;
     private String symbol;

diff --git a/src/main/java/com/bybit/api/client/domain/trade/request/TradeOrderRequest.java b/src/main/java/com/bybit/api/client/domain/trade/request/TradeOrderRequest.java
@@ -5,6 +5,7 @@
 import com.bybit.api.client.domain.TriggerBy;
 import com.bybit.api.client.domain.position.ExecType;
 import com.bybit.api.client.domain.trade.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,6 +15,7 @@
 @Setter
 @ToString
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TradeOrderRequest {
     private CategoryType category;  // always Required
     private String symbol;

diff --git a/src/main/java/com/bybit/api/client/impl/BybitApiAccountRestClientImpl.java b/src/main/java/com/bybit/api/client/impl/BybitApiAccountRestClientImpl.java
@@ -20,7 +20,7 @@ public BybitApiAccountRestClientImpl(String apiKey, String secret, String baseUr
     @Override
     public Object getWalletBalance(AccountDataRequest walletBalanceRequest) {
         return executeSync(bybitApiService.getWalletBalance(
-                walletBalanceRequest.getAccountType().getAccountTypeValue(),
+                walletBalanceRequest.getAccountType() == null ? null : walletBalanceRequest.getAccountType().getAccountTypeValue(),
                 walletBalanceRequest.getCoins()
         ));
     }

diff --git a/src/main/java/com/bybit/api/client/impl/BybitApiAsyncLendingRestClientImpl.java b/src/main/java/com/bybit/api/client/impl/BybitApiAsyncLendingRestClientImpl.java
@@ -55,7 +55,7 @@ public void updateInstitutionLoanUid(LendingDataRequest lendingDataRequest, Bybi
         bybitApiService.updateInstitutionLoanUid(updateInsUidRequest).enqueue(new BybitApiCallbackAdapter<>(callback));
     }
 
-    // C2C Lending
+    /*// C2C Lending
     @Override
     public void getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback) {
         bybitApiService.getC2CLendingCoinInfo(lendingDataRequest.getCoin()).enqueue(new BybitApiCallbackAdapter<>(callback));
@@ -95,5 +95,5 @@ public void getC2cOrdersRecords(LendingDataRequest c2cOrdersRecordsRequest, Bybi
     public void getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback) {
         String coin = lendingDataRequest.getCoin();
         bybitApiService.getC2CLendingAccountInfo(coin).enqueue(new BybitApiCallbackAdapter<>(callback));
-    }
+    }*/
 }
diff --git a/src/main/java/com/bybit/api/client/impl/BybitApiLendingRestClientImpl.java b/src/main/java/com/bybit/api/client/impl/BybitApiLendingRestClientImpl.java
@@ -53,7 +53,7 @@ public Object updateInstitutionLoanUid(LendingDataRequest lendingDataRequest) {
     }
 
     // C2C Endpoints
-    @Override
+    /*@Override
     public Object getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest) {
         return executeSync(bybitApiService.getC2CLendingCoinInfo(lendingDataRequest.getCoin()));
     }
@@ -92,5 +92,5 @@ public Object getC2cOrdersRecords(LendingDataRequest c2cOrdersRecordsRequest) {
     public Object getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest) {
         String coin = lendingDataRequest.getCoin();
         return executeSync(bybitApiService.getC2CLendingAccountInfo(coin));
-    }
+    }*/
 }
diff --git a/src/main/java/com/bybit/api/client/restApi/BybitApiAsyncLendingRestClient.java b/src/main/java/com/bybit/api/client/restApi/BybitApiAsyncLendingRestClient.java
@@ -12,10 +12,10 @@ public interface BybitApiAsyncLendingRestClient {
     void updateInstitutionLoanUid(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
 
     // C2C Endpoints
-    void getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
+/*    void getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
     void C2cLendingDepositFunds(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
     void C2cLendingRedeemFunds(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
     void C2cLendingRedeemCancel(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
     void getC2cOrdersRecords(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
-    void getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);
+    void getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback);*/
 }
diff --git a/src/main/java/com/bybit/api/client/restApi/BybitApiLendingRestClient.java b/src/main/java/com/bybit/api/client/restApi/BybitApiLendingRestClient.java
@@ -13,10 +13,10 @@ public interface BybitApiLendingRestClient {
     Object getInsLoanToValue();
     Object updateInstitutionLoanUid(LendingDataRequest lendingDataRequest);
     // C2C Endpoints
-    Object getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest);
+/*    Object getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest);
     Object C2cLendingDepositFunds(LendingDataRequest lendingDataRequest);
     Object C2cLendingRedeemFunds(LendingDataRequest lendingDataRequest);
     Object C2cLendingRedeemCancel(LendingDataRequest lendingDataRequest);
     Object getC2cOrdersRecords(LendingDataRequest lendingDataRequest);
-    Object getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest);
+    Object getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest);*/
 }
diff --git a/src/main/java/com/bybit/api/client/restApi/BybitApiService.java b/src/main/java/com/bybit/api/client/restApi/BybitApiService.java
@@ -1520,7 +1520,7 @@ Call<Object> getSubUIDListUnlimited(@Query("pageSize") String pageSize,
      * Parameter	Type	Comments
      * result	array	Object
      * &gt; id	string	Unique ID. Internal use
-     * &gt; ips	array<string>	IP bound
+     * &gt; ips	array string	IP bound
      * &gt; apiKey	string	Api key
      * &gt; note	string	The remark
      * &gt; status	integer	1: permanent, 2: expired, 3: within the validity period, 4: expires soon (less than 7 days)
@@ -4101,7 +4101,7 @@ Call<Object> getAssetWithdrawalRecords(
      *      * eb_convert_inverse
      * @return Response Parameters
      * Parameter	Type	Comments
-     * coins	array<object>	Coin spec
+     * coins	array object	Coin spec
      * &gt; coin	string	Coin
      * &gt; fullName	string	Full coin name
      * &gt; icon	string	Coin icon url
@@ -4187,7 +4187,7 @@ Call<Object> getConvertCoinStatus(
      * up to 100 records, return 100 when exceeds 100
      * @return Response Parameters
      * Parameter	Type	Comments
-     * list	array<object>	Array of quotes
+     * list	array object	Array of quotes
      * &gt; accountType	string	Wallet type
      * &gt; exchangeTxId	string	Exchange tx ID, same as quote tx ID
      * &gt; userId	string	User ID

diff --git a/src/main/java/com/bybit/api/client/websocket/impl/WebsocketStreamClientImpl.java b/src/main/java/com/bybit/api/client/websocket/impl/WebsocketStreamClientImpl.java
@@ -143,10 +143,10 @@ private Map<String, String> constructWsAPIHeaders(Map<String,Object> params) {
 
     private boolean requiresAuthentication(String path) {
         return BybitApiConfig.V5_TRADE.equals(path) ||
-                BybitApiConfig.V5_PRIVATE.equals(path) ||
-                BybitApiConfig.V3_CONTRACT_PRIVATE.equals(path) ||
+                BybitApiConfig.V5_PRIVATE.equals(path);
+/*                BybitApiConfig.V3_CONTRACT_PRIVATE.equals(path) ||
                 BybitApiConfig.V3_UNIFIED_PRIVATE.equals(path) ||
-                BybitApiConfig.V3_SPOT_PRIVATE.equals(path);
+                BybitApiConfig.V3_SPOT_PRIVATE.equals(path);*/
     }
 
     @NotNull

diff --git a/src/test/java/com/bybit/api/domain/account/AccountBalanceTest.java b/src/test/java/com/bybit/api/domain/account/AccountBalanceTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 
 public class AccountBalanceTest {
-    BybitApiAccountRestClient client = BybitApiClientFactory.newInstance("8wYkmpLsMg10eNQyPm", "Ouxc34myDnXvei54XsBZgoQzfGxO4bkr2Zsj", BybitApiConfig.TESTNET_DOMAIN).newAccountRestClient();
+    BybitApiAccountRestClient client = BybitApiClientFactory.newInstance("d08Wh6P037IXAvcrL2", "gLfd1BLGU9oq6YoRZRlwXkIQRYB4n5KvXDvv", BybitApiConfig.TESTNET_DOMAIN).newAccountRestClient();
 
     @Test
     public void Test_GetAccountBalance() {

diff --git a/src/test/java/com/bybit/api/domain/asset/BybitApiAssetRestClientTest.java b/src/test/java/com/bybit/api/domain/asset/BybitApiAssetRestClientTest.java
@@ -6,7 +6,6 @@
 import com.bybit.api.client.domain.account.AccountType;
 import com.bybit.api.client.domain.asset.request.AssetDataRequest;
 import com.bybit.api.client.impl.BybitApiAssetRestClientImpl;
-import com.bybit.api.client.restApi.BybitApiAssetRestClient;
 import com.bybit.api.client.restApi.BybitApiService;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/com/bybit/api/domain/position/PositionListCursotTest.java b/src/test/java/com/bybit/api/domain/position/PositionListCursotTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 
 public class PositionListCursotTest {
-    BybitApiPositionRestClient client = BybitApiClientFactory.newInstance("YOUR_API_KEY", "YOUR_API_SECRET", BybitApiConfig.TESTNET_DOMAIN).newPositionRestClient();
+    BybitApiPositionRestClient client = BybitApiClientFactory.newInstance("d08Wh6P037IXAvcrL2", "gLfd1BLGU9oq6YoRZRlwXkIQRYB4n5KvXDvv", BybitApiConfig.TESTNET_DOMAIN).newPositionRestClient();
     @Test
     public void Test_SwitchPositionMode()
     {

diff --git a/src/test/java/com/bybit/api/domain/spot_margin/SpotMarginTradeTest.java b/src/test/java/com/bybit/api/domain/spot_margin/SpotMarginTradeTest.java
@@ -16,7 +16,7 @@
 import java.util.Arrays;
 
 public class SpotMarginTradeTest {
-    BybitApiSpotMarginRestClient client = BybitApiClientFactory.newInstance("YOUR_API_KEY", "YOUR_API_SECRET", BybitApiConfig.TESTNET_DOMAIN).newSpotMarginRestClient();
+    BybitApiSpotMarginRestClient client = BybitApiClientFactory.newInstance("xx", "xxx", BybitApiConfig.TESTNET_DOMAIN).newSpotMarginRestClient();
 
     @Test
     public void Test_MovePositions()

diff --git a/src/test/java/com/bybit/api/domain/trade/OpenOrderTest.java b/src/test/java/com/bybit/api/domain/trade/OpenOrderTest.java
@@ -15,9 +15,10 @@
 import java.util.concurrent.TimeUnit;
 
 public class OpenOrderTest {
+    /*
     BybitApiTradeRestClient client = BybitApiClientFactory.newInstance("YOUR_API_KEY", "YOUR_API_SECRET", BybitApiConfig.TESTNET_DOMAIN).newTradeRestClient();
 
-    @Test
+   @Test
     public void Test_PlaceLinearOrder() throws InterruptedException {
 
        List<String> orderLinkIdList = new ArrayList<>();
@@ -94,4 +95,5 @@ public void Test_PlaceLinearOrder() throws InterruptedException {
         System.out.println(firInverseOrderResult);
 
     }
+    */
 }
diff --git a/src/test/java/com/bybit/api/domain/trade/OrderHistoryTest.java b/src/test/java/com/bybit/api/domain/trade/OrderHistoryTest.java
@@ -8,10 +8,10 @@
 import org.junit.Test;
 
 public class OrderHistoryTest {
-    BybitApiTradeRestClient client = BybitApiClientFactory.newInstance("YOUR_API_KEY", "YOUR_API_SECRET", BybitApiConfig.TESTNET_DOMAIN).newTradeRestClient();
+    BybitApiTradeRestClient client = BybitApiClientFactory.newInstance("d08Wh6P037IXAvcrL2", "gLfd1BLGU9oq6YoRZRlwXkIQRYB4n5KvXDvv", BybitApiConfig.TESTNET_DOMAIN).newTradeRestClient();
 
     @Test
-    public void Test_PlaceLinearOrder(){
+    public void Test_GetSpotOrderHistoryWithCursor(){
         var orderHistoryRequest = TradeOrderRequest.builder().category(CategoryType.SPOT)
                 .cursor("1659014836933362176%3A1712505980064%2C1659014836933362176%3A1712505980064")
                 .limit(1)