Merge pull request #156 from binance/generate_products_2.0.0

regenerate products v2.0.0

Author: theo-s68

clients/common/pom.xml

@@ -10,6 +10,6 @@
 
     <artifactId>binance-common</artifactId>
     <name>common</name>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
 </project>

clients/common/src/main/AndroidManifest.xml

@@ -89,14 +89,18 @@ public class ApiClient {
 
     private static final int DIFF_TILL_POSITION_INDEX = 1;
 
-    private static final Pattern PATTERN_USED_WEIGHT =
-            Pattern.compile("x-mbx-used-weight-([0-9]+)([shmd])");
-    private static final Pattern PATTERN_ORDER_COUNT =
-            Pattern.compile("x-mbx-order-count-([0-9]+)([smhd])");
+    private static final Map<RateLimitType, Pattern> RATE_LIMIT_PATTERN_MAP =
+            Map.of(
+                    RateLimitType.REQUEST_WEIGHT,
+                            Pattern.compile("x-mbx-used-weight-([0-9]+)([shmd])"),
+                    RateLimitType.ORDERS, Pattern.compile("x-mbx-order-count-([0-9]+)([smhd])"));
 
     private static final String HEADER_TIMEUNIT = "X-MBX-TIME-UNIT";
     private static final String HEADER_API_KEY = "X-MBX-APIKEY";
 
+    private static final String BINANCE_SIGNATURE = "binanceSignature";
+    private static final String BINANCE_API_KEY_ONLY = "binanceApiKeyOnly";
+
     private String basePath = "https://api.binance.com";
     protected List<ServerConfiguration> servers =
             new ArrayList<ServerConfiguration>(
@@ -202,14 +206,14 @@ public ApiClient(
             Authentication authentication =
                     binanceAuthenticationFactory.getAuthentication(signatureConfiguration);
             if (authentication != null) {
-                authentications.put("binanceSignature", authentication);
+                authentications.put(BINANCE_SIGNATURE, authentication);
             }
 
             Authentication binanceApiKeyOnly =
                     (queryParams, headerParams, cookieParams, payload, method, uri) -> {
                         headerParams.put(HEADER_API_KEY, signatureConfiguration.getApiKey());
                     };
-            authentications.put("binanceApiKeyOnly", binanceApiKeyOnly);
+            authentications.put(BINANCE_API_KEY_ONLY, binanceApiKeyOnly);
         }
     }
 
@@ -1531,6 +1535,11 @@ public void updateParamsForAuth(
         for (String authName : authNames) {
             Authentication auth = authentications.get(authName);
             if (auth == null) {
+                if (BINANCE_SIGNATURE.equals(authName)) {
+                    throw new RuntimeException(
+                            "Request is signed, please add signatureConfiguration to"
+                                    + " clientConfiguration");
+                }
                 throw new RuntimeException("Authentication undefined: " + authName);
             }
             try {
@@ -1778,32 +1787,35 @@ private Map<RateLimitType, RateLimit> getRateLimit(Integer responseCode, Headers
         HashMap<RateLimitType, RateLimit> rateLimitMap = new HashMap<>();
         Integer retryAfter = null;
         if (Arrays.asList(HTTP_TEA_POT, HTTP_TOO_MANY_REQS).contains(responseCode)) {
-            retryAfter = Integer.valueOf(headers.get("retry-after"));
+            String retryAfterHeaderVal = headers.get("retry-after");
+            if (retryAfterHeaderVal != null) {
+                retryAfter = Integer.valueOf(retryAfterHeaderVal);
+            }
         }
         for (String name : headers.names()) {
             if (name.startsWith("x-mbx-used-weight-")) {
                 RateLimit usedWeightRateLimit =
                         getRateLimitFromHeader(
-                                name, headers.get(name), PATTERN_USED_WEIGHT, retryAfter);
+                                name, headers.get(name), RateLimitType.REQUEST_WEIGHT, retryAfter);
                 rateLimitMap.put(RateLimitType.REQUEST_WEIGHT, usedWeightRateLimit);
             }
 
             if (name.startsWith("x-mbx-order-count-")) {
                 RateLimit orderCountRateLimit =
                         getRateLimitFromHeader(
-                                name, headers.get(name), PATTERN_ORDER_COUNT, retryAfter);
+                                name, headers.get(name), RateLimitType.ORDERS, retryAfter);
                 rateLimitMap.put(RateLimitType.ORDERS, orderCountRateLimit);
             }
         }
         return rateLimitMap;
     }
 
     private RateLimit getRateLimitFromHeader(
-            String headerName, String value, Pattern pattern, Integer retryAfter) {
+            String headerName, String value, RateLimitType rateLimitType, Integer retryAfter) {
         RateLimit rateLimit = new RateLimit();
-        rateLimit.setRateLimitType(RateLimitType.REQUEST_WEIGHT);
+        rateLimit.setRateLimitType(rateLimitType);
 
-        Matcher usedWeightMatcher = pattern.matcher(headerName);
+        Matcher usedWeightMatcher = RATE_LIMIT_PATTERN_MAP.get(rateLimitType).matcher(headerName);
         if (usedWeightMatcher.find()) {
             String intervalCount = usedWeightMatcher.group(1);
             String intervalType = usedWeightMatcher.group(2);

clients/common/src/main/java/com/binance/connector/client/common/ApiClient.java

@@ -1,7 +1,6 @@
 package com.binance.connector.client.common.auth;
 
 import com.binance.connector.client.common.Pair;
-
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;

clients/common/src/main/java/com/binance/connector/client/common/auth/BinanceBaseAuthentication.java

@@ -2,7 +2,6 @@
 
 import com.binance.connector.client.common.dtos.TimeUnit;
 import java.net.Proxy;
-
 import okhttp3.Authenticator;
 import okhttp3.CertificatePinner;
 

clients/common/src/main/java/com/binance/connector/client/common/configuration/ClientConfiguration.java

@@ -114,7 +114,9 @@ public ConnectionWrapper(
             if (configuration.getWebSocketProxy() != null) {
                 httpClient.getProxyConfiguration().addProxy(configuration.getWebSocketProxy());
                 if (configuration.getWebSocketProxyAuthentication() != null) {
-                    httpClient.getAuthenticationStore().addAuthentication(configuration.getWebSocketProxyAuthentication());
+                    httpClient
+                            .getAuthenticationStore()
+                            .addAuthentication(configuration.getWebSocketProxyAuthentication());
                 }
             }
             webSocketClient = new WebSocketClient(httpClient);

clients/common/src/main/java/com/binance/connector/client/common/websocket/adapter/ConnectionWrapper.java

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.0.0 - 2025-06-02
+
+### Removed (8)
+
+- `flexibleLoanCollateralRepayment()` (`POST /sapi/v2/loan/flexible/repay/collateral`)
+- `cryptoLoanAdjustLtv()` (`POST /sapi/v1/loan/adjust/ltv`)
+- `cryptoLoanBorrow()` (`POST /sapi/v1/loan/borrow`)
+- `cryptoLoanCustomizeMarginCall()` (`POST /sapi/v1/loan/customize/margin_call`)
+- `cryptoLoanRepay()` (`POST /sapi/v1/loan/repay`)
+- `getCollateralAssetsData()` (`GET /sapi/v1/loan/collateral/data`)
+- `getLoanOngoingOrders()` (`GET /sapi/v1/loan/ongoing/orders`)
+- `getLoanableAssetsData()` (`GET /sapi/v1/loan/loanable/data`)
+
 ## 1.1.0 - 2025-05-02
 
 - Update `binance/common` module to version `1.1.0`.
@@ -8,4 +21,4 @@
 
 ## 1.0.0 - 2025-04-24
 
-- Initial release
+- Initial release

clients/common/src/main/java/com/binance/connector/client/common/websocket/configuration/SessionMode.java

@@ -41,7 +41,7 @@ Then add dependency to pom.xml:
 <dependency>
   <groupId>io.github.binance</groupId>
   <artifactId>binance-crypto-loan</artifactId>
-  <version>1.1.0</version>
+  <version>2.0.0</version>
 </dependency>
 ```
 

clients/crypto-loan/CHANGELOG.md

@@ -12,6 +12,7 @@
 |**repayAmount** | **Double** |  |  |
 |**collateralReturn** | **Boolean** |  |  [optional] |
 |**fullRepayment** | **Boolean** |  |  [optional] |
+|**repaymentType** | **Long** |  |  [optional] |
 |**recvWindow** | **Long** |  |  [optional] |