Merge branch 'develop' of https://github.com/makarid/XChange into coi…

…nbase-pro
knowm · Aug 16, 2023 · 2fd927f · 2fd927f
2 parents 30ca446 + 937607e
commit 2fd927f
Show file tree

Hide file tree

Showing 248 changed files with 1,491 additions and 1,553 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,16 +34,16 @@
     <version.assertj>3.24.2</version.assertj>
     <version.commons.lang3>3.12.0</version.commons.lang3>
     <version.fasterxml>2.14.1</version.fasterxml>
-    <version.github.mmazi>2.1.0</version.github.mmazi>
+    <version.github.mmazi>3.0</version.github.mmazi>
     <version.resilience4j>1.7.0</version.resilience4j>
-    <version.junit>4.13.2</version.junit>
+    <version.junit>5.9.3</version.junit>
     <version.lombok>1.18.26</version.lombok>
     <version.knowm.xchart>3.8.2</version.knowm.xchart>
     <version.qos.logback>1.4.5</version.qos.logback>
     <version.reflections>0.10.2</version.reflections>
     <version.slf4j>2.0.6</version.slf4j>
     <version.crypto>5.0.0</version.crypto>
-    <version.java-jwt>4.0.0</version.java-jwt>
+    <version.java-jwt>4.4.0</version.java-jwt>
 
     <skipIntegrationTests>true</skipIntegrationTests>
   </properties>
@@ -355,7 +355,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.90.Final</version>
+            <version>4.1.96.Final</version>
         </dependency>
 
     </dependencies>
@@ -387,11 +387,12 @@
 
     <!-- JUnit for testing -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${version.junit}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -461,7 +462,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.4.1</version>
+            <version>3.5.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -499,7 +500,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>3.0.1</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
         </configuration>
@@ -521,7 +522,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -539,7 +540,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.2</version>
       </plugin>
 
       <plugin>
@@ -581,5 +582,4 @@
     </plugins>
   </build>
 
-</project>
-
+</project>
diff --git a/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/IAscendex.java b/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/IAscendex.java
@@ -2,11 +2,11 @@
 
 import java.io.IOException;
 import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.ascendex.dto.AscendexResponse;
 import org.knowm.xchange.ascendex.dto.marketdata.AscendexAssetDto;
 import org.knowm.xchange.ascendex.dto.marketdata.AscendexBarHistDto;
@@ -45,4 +45,4 @@ AscendexResponse<List<AscendexBarHistDto>> getHistoricalBarData(
       @QueryParam("from") Long from,
       @QueryParam("n") Integer noOfBars)
       throws IOException;
-}
+}
diff --git a/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/IAscendexAuthenticated.java b/xchange-ascendex/src/main/java/org/knowm/xchange/ascendex/IAscendexAuthenticated.java
@@ -2,16 +2,16 @@
 
 import java.io.IOException;
 import java.util.List;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.ascendex.dto.AscendexResponse;
 import org.knowm.xchange.ascendex.dto.account.AscendexCashAccountBalanceDto;
 import org.knowm.xchange.ascendex.dto.trade.AscendexOpenOrdersResponse;
@@ -95,4 +95,4 @@ AscendexResponse<List<AscendexOpenOrdersResponse>> getOrdersHistory(
       @QueryParam("symbol") String symbol,
       @QueryParam("executedOnly") boolean executedOnly)
       throws IOException;
-}
+}
diff --git a/xchange-bankera/src/main/java/org/knowm/xchange/bankera/Bankera.java b/xchange-bankera/src/main/java/org/knowm/xchange/bankera/Bankera.java
@@ -1,13 +1,13 @@
 package org.knowm.xchange.bankera;
 
 import java.io.IOException;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.bankera.dto.BankeraException;
 import org.knowm.xchange.bankera.dto.BankeraToken;
 import org.knowm.xchange.bankera.dto.marketdata.BankeraMarketInfo;
@@ -45,4 +45,4 @@ BankeraTradesResponse getRecentTrades(@PathParam("market") String market)
   @GET
   @Path("/general/info")
   BankeraMarketInfo getMarketInfo() throws BankeraException, IOException;
-}
+}
diff --git a/xchange-bankera/src/main/java/org/knowm/xchange/bankera/BankeraAuthenticated.java b/xchange-bankera/src/main/java/org/knowm/xchange/bankera/BankeraAuthenticated.java
@@ -2,15 +2,15 @@
 
 import java.io.IOException;
 import java.util.List;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.bankera.dto.BankeraException;
 import org.knowm.xchange.bankera.dto.BaseBankeraRequest;
 import org.knowm.xchange.bankera.dto.CreateOrderRequest;
@@ -68,4 +68,4 @@ BankeraUserTrades getUserTrades(
   BankeraOrder getUserOrder(
       @HeaderParam("Authorization") String authorization, @QueryParam("orderId") String orderId)
       throws BankeraException, IOException;
-}
+}
diff --git a/xchange-bibox/pom.xml b/xchange-bibox/pom.xml
@@ -29,6 +29,5 @@
 			<artifactId>xchange-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-	</dependencies>
+    </dependencies>
 </project>
diff --git a/xchange-bibox/src/main/java/org/knowm/xchange/bibox/Bibox.java b/xchange-bibox/src/main/java/org/knowm/xchange/bibox/Bibox.java
@@ -2,13 +2,13 @@
 
 import java.io.IOException;
 import java.util.List;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.bibox.dto.BiboxMultipleResponses;
 import org.knowm.xchange.bibox.dto.BiboxResponse;
 import org.knowm.xchange.bibox.dto.marketdata.BiboxMarket;
@@ -88,4 +88,4 @@ BiboxResponse<List<BiboxMarket>> marketAll(@QueryParam("cmd") String cmd)
   @POST
   @Path("mdata")
   BiboxMultipleResponses<BiboxOrderBook> orderBooks(@FormParam(FORM_CMDS) String cmds);
-}
+}
diff --git a/xchange-bibox/src/main/java/org/knowm/xchange/bibox/BiboxAuthenticated.java b/xchange-bibox/src/main/java/org/knowm/xchange/bibox/BiboxAuthenticated.java
@@ -1,11 +1,11 @@
 package org.knowm.xchange.bibox;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.bibox.dto.BiboxMultipleResponses;
 import org.knowm.xchange.bibox.dto.BiboxPagedResponses;
 import org.knowm.xchange.bibox.dto.BiboxSingleResponse;
@@ -128,4 +128,4 @@ BiboxMultipleResponses<String> cancelTrades(
       @FormParam(FORM_CMDS) String cmds,
       @FormParam(FORM_APIKEY) String apiKey,
       @FormParam(FORM_SIGNATURE) ParamsDigest signature);
-}
+}
diff --git a/xchange-bibox/src/main/java/org/knowm/xchange/bibox/service/BiboxDigest.java b/xchange-bibox/src/main/java/org/knowm/xchange/bibox/service/BiboxDigest.java
@@ -1,7 +1,7 @@
 package org.knowm.xchange.bibox.service;
 
 import java.io.UnsupportedEncodingException;
-import javax.ws.rs.FormParam;
+import jakarta.ws.rs.FormParam;
 import org.knowm.xchange.bibox.BiboxAuthenticated;
 import org.knowm.xchange.service.BaseParamsDigest;
 import org.knowm.xchange.utils.DigestUtils;
@@ -37,4 +37,4 @@ public String digestParams(RestInvocation restInvocation) {
       throw new RuntimeException(e1.getMessage());
     }
   }
-}
+}
diff --git a/xchange-binance/src/main/java/org/knowm/xchange/binance/Binance.java b/xchange-binance/src/main/java/org/knowm/xchange/binance/Binance.java
@@ -2,11 +2,11 @@
 
 import java.io.IOException;
 import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.binance.dto.BinanceException;
 import org.knowm.xchange.binance.dto.marketdata.BinanceAggTrades;
 import org.knowm.xchange.binance.dto.marketdata.BinanceOrderbook;
@@ -181,4 +181,4 @@ BinancePrice tickerPrice(@QueryParam("symbol") String symbol)
   @GET
   @Path("api/v3/ticker/bookTicker")
   List<BinancePriceQuantity> tickerAllBookTickers() throws IOException, BinanceException;
-}
+}
diff --git a/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAuthenticated.java b/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceAuthenticated.java
@@ -4,17 +4,17 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import org.knowm.xchange.binance.dto.BinanceException;
 import org.knowm.xchange.binance.dto.account.*;
 import org.knowm.xchange.binance.dto.trade.BinanceCancelledOrder;
@@ -549,4 +549,4 @@ BinanceListenKey startUserDataStream(@HeaderParam(X_MBX_APIKEY) String apiKey)
   Map<?, ?> closeUserDataStream(
       @HeaderParam(X_MBX_APIKEY) String apiKey, @PathParam("listenKey") String listenKey)
       throws IOException, BinanceException;
-}
+}
diff --git a/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceFutures.java b/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceFutures.java
@@ -8,11 +8,11 @@
 import org.knowm.xchange.binance.dto.meta.BinanceSystemStatus;
 import org.knowm.xchange.binance.dto.meta.exchangeinfo.BinanceExchangeInfo;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.util.List;
 
@@ -115,4 +115,4 @@ List<BinanceFundingRate> fundingRates()
     BinanceFundingRate fundingRate(
             @QueryParam("symbol") String symbol)
             throws IOException, BinanceException;
-}
+}
diff --git a/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceFuturesAuthenticated.java b/xchange-binance/src/main/java/org/knowm/xchange/binance/BinanceFuturesAuthenticated.java
@@ -7,8 +7,8 @@
 import si.mazi.rescu.ParamsDigest;
 import si.mazi.rescu.SynchronizedValueFactory;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
@@ -208,4 +208,4 @@ List<BinanceCancelledOrder> cancelAllFutureOpenOrders(
             @QueryParam(SIGNATURE) ParamsDigest signature)
             throws IOException, BinanceException;
 
-}
+}