Skip to content

Commit 2ce2535

Browse files
VictorFrWuVictorFrWu
committed
1.2.3
1 parent 6242110 commit 2ce2535

File tree

12 files changed

+144
-35
lines changed

12 files changed

+144
-35
lines changed

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,26 @@ Maven Example
4040
<dependency>
4141
<groupId>io.github.wuhewuhe</groupId>
4242
<artifactId>bybit-java-api</artifactId>
43-
<version>1.1.5</version>
43+
<version>1.2.3</version>
4444
</dependency>
4545
```
4646
Gradle Example
4747
```java
48-
implementation group: 'io.github.wuhewuhe', name: 'bybit-java-api', version: '1.1.5'
48+
implementation group: 'io.github.wuhewuhe', name: 'bybit-java-api', version: '1.2.3'
4949
```
50-
Furthermore, build tool, please check [sonar type central repository](https://central.sonatype.com/artifact/io.github.wuhewuhe/bybit-java-api/1.1.5)
50+
Furthermore, build tool, please check [sonar type central repository](https://central.sonatype.com/artifact/io.github.wuhewuhe/bybit-java-api/1.2.3)
5151

5252
## Release-Notes
5353
### HTTP Sync & Async Request
5454
- Position new endpoints: Move Positions and Get Move Positions History
5555
- Account new endpoint: Batch Set Collateral Coin
56+
- TradeOrderRequest add a new parameter: marketUnit
5657

5758
### Improvements
5859
- Fix Switch Position Mode Issue
5960

6061
### Change Log
62+
- C:\Net\GithubProjects\open-api-sdk\bybit-java-api
6163
- Set Tp/SL and Set Risk Limit endpoints are deprecated
6264
- GetExecutionList move from PositionService to TradeService and rename to GetTradeHistory
6365

‎pom.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.wuhewuhe</groupId>
88
<artifactId>bybit-java-api</artifactId>
9-
<version>1.1.5</version>
9+
<version>1.2.3</version>
1010
<name>bybit-java-api</name>
1111
<url>https://github.com/wuhewuhe/bybit-java-api</url>
1212

@@ -148,22 +148,22 @@
148148
</dependencies>
149149

150150
<distributionManagement>
151-
152-
<repository>
153-
<id>github</id>
154-
<name>GitHub Packages Repository</name>
155-
<url>https://maven.pkg.github.com/wuhewuhe/bybit-java-api</url>
156-
</repository>
157151
<!--
158-
<snapshotRepository>
159-
<id>ossrh</id>
160-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
161-
</snapshotRepository>
162-
<repository>
163-
<id>ossrh</id>
164-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
165-
</repository>
166-
-->
152+
<repository>
153+
<id>github</id>
154+
<name>GitHub Packages Repository</name>
155+
<url>https://maven.pkg.github.com/wuhewuhe/bybit-java-api</url>
156+
</repository>
157+
-->
158+
<snapshotRepository>
159+
<id>ossrh</id>
160+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
161+
</snapshotRepository>
162+
<repository>
163+
<id>ossrh</id>
164+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
165+
</repository>
166+
167167
</distributionManagement>
168168

169169
<build>
@@ -185,7 +185,7 @@
185185
</configuration>
186186
</plugin>
187187

188-
<!-- Sonar Maven Central Package Management
188+
<!-- Sonar Maven Central Package Management -->
189189
<plugin>
190190
<groupId>org.apache.maven.plugins</groupId>
191191
<artifactId>maven-release-plugin</artifactId>
@@ -253,7 +253,7 @@
253253
</execution>
254254
</executions>
255255
</plugin>
256-
-->
256+
257257
</plugins>
258258
</build>
259259
</project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ public class PlaceOrderRequest {
3636
private String slLimitPrice;
3737
private String tpOrderType;
3838
private String slOrderType;
39+
private String marketUnit;
3940
}
4041

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@ public class TradeOrderRequest {
5555
private OrderStatus orderStatus;
5656
private Integer timeWindow; // only to Disconnect Cancel All options
5757
private ExecType execType;
58+
private String marketUnit;
5859
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public BybitApiTradeAsyncRestClientImpl(String apiKey, String secret, String bas
2121
}
2222

2323
@Override
24-
public void getHistoryOrderResult(TradeOrderRequest orderHistoryRequest, BybitApiCallback<Object> callback) {
25-
bybitApiService.getHistoryOrderResult(
24+
public void getOrderHistory(TradeOrderRequest orderHistoryRequest, BybitApiCallback<Object> callback) {
25+
bybitApiService.getOrderHistory(
2626
orderHistoryRequest.getCategory().getCategoryTypeId(),
2727
orderHistoryRequest.getSymbol(),
2828
orderHistoryRequest.getBaseCoin(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public Object getBorrowQuota(TradeOrderRequest borrowQuotaRequest) {
3737
}
3838

3939
@Override
40-
public Object getHistoryOrderResult(TradeOrderRequest orderHistoryRequest) {
41-
return executeSync(bybitApiService.getHistoryOrderResult(
40+
public Object getOrderHistory(TradeOrderRequest orderHistoryRequest) {
41+
return executeSync(bybitApiService.getOrderHistory(
4242
orderHistoryRequest.getCategory().getCategoryTypeId(),
4343
orderHistoryRequest.getSymbol(),
4444
orderHistoryRequest.getBaseCoin(),

‎src/main/java/com/bybit/api/client/restApi/BybitApiAsyncTradeRestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
public interface BybitApiAsyncTradeRestClient {
1212
// Trade
13-
void getHistoryOrderResult(TradeOrderRequest orderHistoryRequest, BybitApiCallback<Object> callback);
13+
void getOrderHistory(TradeOrderRequest orderHistoryRequest, BybitApiCallback<Object> callback);
1414
void setDisconnectCancelAllTime(TradeOrderRequest tradeOrderRequest, BybitApiCallback<Object> callback);
1515
void getBorrowQuota(TradeOrderRequest borrowQuotaRequest, BybitApiCallback<Object> callback);
1616
void getOpenOrders(TradeOrderRequest order, BybitApiCallback<Object> callback);

‎src/main/java/com/bybit/api/client/restApi/BybitApiService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ Call<Object> getMarketAccountRatio(@Query("category") String category,
771771
*/
772772
@Headers(BybitApiConstants.ENDPOINT_SECURITY_TYPE_SIGNED_HEADER)
773773
@GET("/v5/order/history")
774-
Call<Object> getHistoryOrderResult(@Query("category") String category,
774+
Call<Object> getOrderHistory(@Query("category") String category,
775775
@Query("symbol") String symbol,
776776
@Query("baseCoin") String baseCoin,
777777
@Query("settleCoin") String settleCoin,

‎src/main/java/com/bybit/api/client/restApi/BybitApiTradeRestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public interface BybitApiTradeRestClient {
1111

1212
// Trade
13-
Object getHistoryOrderResult(TradeOrderRequest orderHistoryRequest);
13+
Object getOrderHistory(TradeOrderRequest orderHistoryRequest);
1414
Object setDisconnectCancelAllTime(TradeOrderRequest setDcpRequest);
1515
Object getBorrowQuota(TradeOrderRequest borrowQuotaRequest);
1616
Object getOpenOrders(TradeOrderRequest order);

‎src/main/java/com/bybit/api/client/service/BybitJsonConverter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ private TradeOrderRequest getTradeOrderRequest(Map<String, Object> orderMap, Str
9191
.slLimitPrice((String) orderMap.getOrDefault("slLimitPrice", null)) // Optional
9292
.tpOrderType(orderMap.containsKey("tpOrderType") ? TradeOrderType.valueOf(orderMap.get("tpOrderType").toString().toUpperCase()) : null) // Optional, default to Market
9393
.slOrderType(orderMap.containsKey("slOrderType") ? TradeOrderType.valueOf(orderMap.get("slOrderType").toString().toUpperCase()) : null) // Optional, default to Market
94+
.marketUnit((String)orderMap.getOrDefault("marketUnit", null))
9495
.build();
9596
}
9697

@@ -131,6 +132,7 @@ public TradeOrderRequest getTradeOrderRequest(JsonNode requestNode, String categ
131132
.slLimitPrice(requestNode.has("slLimitPrice") ? requestNode.get("slLimitPrice").asText() : null)
132133
.tpOrderType(requestNode.has("tpOrderType") ? TradeOrderType.valueOf(requestNode.get("tpOrderType").asText().toUpperCase()) : null)
133134
.slOrderType(requestNode.has("slOrderType") ? TradeOrderType.valueOf(requestNode.get("slOrderType").asText().toUpperCase()) : null)
135+
.marketUnit(requestNode.has("marketUnit") ? requestNode.get("marketUnit").asText() : null)
134136
.build();
135137
}
136138

@@ -305,6 +307,7 @@ public PlaceOrderRequest convertTradeToPlaceOrderRequest(TradeOrderRequest trade
305307
.slLimitPrice(tradeOrderRequest.getSlLimitPrice()) // Optional
306308
.tpOrderType(tradeOrderRequest.getTpOrderType() == null ? null : tradeOrderRequest.getTpOrderType().getOType()) // Optional, default to Market
307309
.slOrderType(tradeOrderRequest.getSlOrderType() == null ? null : tradeOrderRequest.getSlOrderType().getOType()) // Optional, default to Market
310+
.marketUnit(tradeOrderRequest.getMarketUnit())
308311
.build();
309312
}
310313

0 commit comments

Comments
 (0)