Skip to content

Commit 3b474b8

Browse files
VictorFrWuVictorFrWu
committed
1.2.7
1 parent 0fc6489 commit 3b474b8

22 files changed

+65
-47
lines changed

‎pom.xml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<groupId>io.github.wuhewuhe</groupId>
88
<artifactId>bybit-java-api</artifactId>
9-
<version>1.2.7-SNAPSHOT</version>
9+
<version>1.2.7</version>
1010
<name>bybit-java-api</name>
11-
<url>https://github.com/wuhewuhe/bybit-java-api</url>
11+
<url>https://github.com/VictorFrWu/bybit-java-api</url>
1212

1313
<licenses>
1414
<license>
@@ -45,9 +45,9 @@
4545
</developers>
4646

4747
<scm>
48-
<connection>scm:git:git://github.com/wuhewuhe/bybit-java-api.git</connection>
49-
<developerConnection>scm:git:ssh://github.com/wuhewuhe/bybit-java-api.git</developerConnection>
50-
<url>https://github.com/wuhewuhe/bybit-java-api</url>
48+
<connection>scm:git:git://github.com/VictorFrWu/bybit-java-api.git</connection>
49+
<developerConnection>scm:git:ssh://github.com/VictorFrWu/bybit-java-api.git</developerConnection>
50+
<url>https://github.com/VictorFrWu/bybit-java-api</url>
5151
</scm>
5252

5353
<properties>
@@ -157,7 +157,7 @@
157157
<repository>
158158
<id>github</id>
159159
<name>GitHub Packages Repository</name>
160-
<url>https://maven.pkg.github.com/wuhewuhe/bybit-java-api</url>
160+
<url>https://maven.pkg.github.com/VictorFrWu/bybit-java-api</url>
161161
</repository>
162162
-->
163163
<snapshotRepository>
@@ -173,6 +173,16 @@
173173

174174
<build>
175175
<plugins>
176+
<!-- <plugin>
177+
<groupId>org.sonatype.central</groupId>
178+
<artifactId>central-publishing-maven-plugin</artifactId>
179+
<version>0.5.0</version>
180+
<extensions>true</extensions>
181+
<configuration>
182+
<publishingServerId>central</publishingServerId>
183+
<autoPublish>true</autoPublish>
184+
</configuration>
185+
</plugin>-->
176186
<plugin>
177187
<groupId>org.apache.maven.plugins</groupId>
178188
<artifactId>maven-compiler-plugin</artifactId>
@@ -190,29 +200,20 @@
190200
</configuration>
191201
</plugin>
192202

193-
<!-- Sonar Maven Central Package Management -->
194-
<plugin>
195-
<groupId>org.apache.maven.plugins</groupId>
196-
<artifactId>maven-release-plugin</artifactId>
197-
<version>3.0.1</version>
198-
<configuration>
199-
<autoVersionSubmodules>true</autoVersionSubmodules>
200-
<useReleaseProfile>false</useReleaseProfile>
201-
<releaseProfiles>release</releaseProfiles>
202-
<goals>deploy</goals>
203-
</configuration>
204-
</plugin>
203+
<!-- Nexus Repository Manager -->
205204
<plugin>
206205
<groupId>org.sonatype.plugins</groupId>
207206
<artifactId>nexus-staging-maven-plugin</artifactId>
208-
<version>1.6.8</version>
207+
<version>1.6.7</version>
209208
<extensions>true</extensions>
210209
<configuration>
211210
<serverId>ossrh</serverId>
212211
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
213212
<autoReleaseAfterClose>true</autoReleaseAfterClose>
214213
</configuration>
215214
</plugin>
215+
216+
<!-- Javadoc and Sources Attachments -->
216217
<plugin>
217218
<groupId>org.apache.maven.plugins</groupId>
218219
<artifactId>maven-source-plugin</artifactId>
@@ -244,10 +245,12 @@
244245
</links>
245246
</configuration>
246247
</plugin>
248+
249+
<!-- GPG Signed Components -->
247250
<plugin>
248251
<groupId>org.apache.maven.plugins</groupId>
249252
<artifactId>maven-gpg-plugin</artifactId>
250-
<version>3.0.1</version>
253+
<version>1.5</version>
251254
<executions>
252255
<execution>
253256
<id>sign-artifacts</id>

‎src/main/java/com/bybit/api/client/domain/account/request/AccountDataRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.bybit.api.client.domain.position.MarginMode;
88
import com.bybit.api.client.domain.preupgrade.TransactionType;
99
import com.bybit.api.client.domain.user.IsUta;
10+
import com.fasterxml.jackson.annotation.JsonInclude;
1011
import lombok.Builder;
1112
import lombok.Getter;
1213
import lombok.Setter;
@@ -16,6 +17,7 @@
1617
@Setter
1718
@ToString
1819
@Builder
20+
@JsonInclude(JsonInclude.Include.NON_NULL)
1921
public class AccountDataRequest {
2022
private AccountType accountType;
2123
private CategoryType category;

‎src/main/java/com/bybit/api/client/domain/announcement/request/AnnouncementInfoRequest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
import com.bybit.api.client.domain.announcement.AnnouncementTag;
44
import com.bybit.api.client.domain.announcement.AnnouncementType;
55
import com.bybit.api.client.domain.announcement.LanguageSymbol;
6+
import com.fasterxml.jackson.annotation.JsonInclude;
67
import lombok.Builder;
78
import lombok.Getter;
89
import lombok.Setter;
910
import lombok.ToString;
1011

1112
@Getter
1213
@Setter
13-
@Builder
1414
@ToString
15+
@Builder
16+
@JsonInclude(JsonInclude.Include.NON_NULL)
1517
public class AnnouncementInfoRequest {
1618
private LanguageSymbol locale;
1719
private AnnouncementType type;

‎src/main/java/com/bybit/api/client/domain/broker/BrokerDataRequest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package com.bybit.api.client.domain.broker;
22

3+
import com.fasterxml.jackson.annotation.JsonInclude;
34
import lombok.Builder;
45
import lombok.Getter;
56
import lombok.Setter;
67
import lombok.ToString;
78

89
@Getter
910
@Setter
10-
@Builder
1111
@ToString
12+
@Builder
13+
@JsonInclude(JsonInclude.Include.NON_NULL)
1214
public class BrokerDataRequest {
1315
private final BusinessType bizType;
1416
private final String subMemberId;

‎src/main/java/com/bybit/api/client/domain/institution/LendingDataRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.bybit.api.client.domain.institution;
22

33
import com.bybit.api.client.domain.broker.BusinessType;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
45
import lombok.Builder;
56
import lombok.Getter;
67
import lombok.Setter;
@@ -10,6 +11,7 @@
1011
@Setter
1112
@ToString
1213
@Builder
14+
@JsonInclude(JsonInclude.Include.NON_NULL)
1315
public class LendingDataRequest {
1416
private final String productId;
1517
private final String orderId;

‎src/main/java/com/bybit/api/client/domain/market/request/MarketDataRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.bybit.api.client.domain.announcement.AnnouncementType;
66
import com.bybit.api.client.domain.announcement.LanguageSymbol;
77
import com.bybit.api.client.domain.market.*;
8+
import com.fasterxml.jackson.annotation.JsonInclude;
89
import lombok.Builder;
910
import lombok.Getter;
1011
import lombok.Setter;
@@ -14,6 +15,7 @@
1415
@Setter
1516
@ToString
1617
@Builder
18+
@JsonInclude(JsonInclude.Include.NON_NULL)
1719
public class MarketDataRequest {
1820
private CategoryType category; // always required
1921
private String coin;

‎src/main/java/com/bybit/api/client/domain/position/request/PositionDataRequest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
import com.bybit.api.client.domain.TriggerBy;
66
import com.bybit.api.client.domain.position.*;
77
import com.bybit.api.client.domain.trade.PositionIdx;
8+
import com.fasterxml.jackson.annotation.JsonInclude;
89
import lombok.Builder;
910
import lombok.Getter;
1011
import lombok.Setter;
1112
import lombok.ToString;
1213

1314
@Getter
1415
@Setter
15-
@Builder
1616
@ToString
17+
@Builder
18+
@JsonInclude(JsonInclude.Include.NON_NULL)
1719
public class PositionDataRequest {
1820
private CategoryType category;
1921
private String symbol;

‎src/main/java/com/bybit/api/client/domain/trade/request/TradeOrderRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.bybit.api.client.domain.TriggerBy;
66
import com.bybit.api.client.domain.position.ExecType;
77
import com.bybit.api.client.domain.trade.*;
8+
import com.fasterxml.jackson.annotation.JsonInclude;
89
import lombok.Builder;
910
import lombok.Getter;
1011
import lombok.Setter;
@@ -14,6 +15,7 @@
1415
@Setter
1516
@ToString
1617
@Builder
18+
@JsonInclude(JsonInclude.Include.NON_NULL)
1719
public class TradeOrderRequest {
1820
private CategoryType category; // always Required
1921
private String symbol;

‎src/main/java/com/bybit/api/client/impl/BybitApiAccountRestClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public BybitApiAccountRestClientImpl(String apiKey, String secret, String baseUr
2020
@Override
2121
public Object getWalletBalance(AccountDataRequest walletBalanceRequest) {
2222
return executeSync(bybitApiService.getWalletBalance(
23-
walletBalanceRequest.getAccountType().getAccountTypeValue(),
23+
walletBalanceRequest.getAccountType() == null ? null : walletBalanceRequest.getAccountType().getAccountTypeValue(),
2424
walletBalanceRequest.getCoins()
2525
));
2626
}

‎src/main/java/com/bybit/api/client/impl/BybitApiAsyncLendingRestClientImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void updateInstitutionLoanUid(LendingDataRequest lendingDataRequest, Bybi
5555
bybitApiService.updateInstitutionLoanUid(updateInsUidRequest).enqueue(new BybitApiCallbackAdapter<>(callback));
5656
}
5757

58-
// C2C Lending
58+
/*// C2C Lending
5959
@Override
6060
public void getC2CLendingCoinInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback) {
6161
bybitApiService.getC2CLendingCoinInfo(lendingDataRequest.getCoin()).enqueue(new BybitApiCallbackAdapter<>(callback));
@@ -95,5 +95,5 @@ public void getC2cOrdersRecords(LendingDataRequest c2cOrdersRecordsRequest, Bybi
9595
public void getC2CLendingAccountInfo(LendingDataRequest lendingDataRequest, BybitApiCallback<Object> callback) {
9696
String coin = lendingDataRequest.getCoin();
9797
bybitApiService.getC2CLendingAccountInfo(coin).enqueue(new BybitApiCallbackAdapter<>(callback));
98-
}
98+
}*/
9999
}

0 commit comments

Comments
 (0)