From c1b023a45a71a23c8a0b9704a364056493087120 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 21:41:48 +0300 Subject: [PATCH 1/7] Changed gson version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4617f46..275f4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ ${java.version} 1.8.4 3.14.7 - 2.8.6 + 2.8.9 3.10 1.14 1.3.2 From 4ba26e1ebf3d9cdba118fada89c280cacbd8b094 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 22:04:36 +0300 Subject: [PATCH 2/7] Private order to public --- .../java/io/gate/gateapi/models/Order.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/io/gate/gateapi/models/Order.java b/src/main/java/io/gate/gateapi/models/Order.java index 8a20e29..5288483 100644 --- a/src/main/java/io/gate/gateapi/models/Order.java +++ b/src/main/java/io/gate/gateapi/models/Order.java @@ -25,27 +25,27 @@ public class Order { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) - private String id; + public String id; public static final String SERIALIZED_NAME_TEXT = "text"; @SerializedName(SERIALIZED_NAME_TEXT) - private String text; + public String text; public static final String SERIALIZED_NAME_CREATE_TIME = "create_time"; @SerializedName(SERIALIZED_NAME_CREATE_TIME) - private String createTime; + public String createTime; public static final String SERIALIZED_NAME_UPDATE_TIME = "update_time"; @SerializedName(SERIALIZED_NAME_UPDATE_TIME) - private String updateTime; + public String updateTime; public static final String SERIALIZED_NAME_CREATE_TIME_MS = "create_time_ms"; @SerializedName(SERIALIZED_NAME_CREATE_TIME_MS) - private Long createTimeMs; + public Long createTimeMs; public static final String SERIALIZED_NAME_UPDATE_TIME_MS = "update_time_ms"; @SerializedName(SERIALIZED_NAME_UPDATE_TIME_MS) - private Long updateTimeMs; + public Long updateTimeMs; /** * Order status - `open`: to be filled - `closed`: filled - `cancelled`: cancelled @@ -98,11 +98,11 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_STATUS = "status"; @SerializedName(SERIALIZED_NAME_STATUS) - private StatusEnum status; + public StatusEnum status; public static final String SERIALIZED_NAME_CURRENCY_PAIR = "currency_pair"; @SerializedName(SERIALIZED_NAME_CURRENCY_PAIR) - private String currencyPair; + public String currencyPair; /** * Order type. limit - limit order @@ -151,7 +151,7 @@ public TypeEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) - private TypeEnum type = TypeEnum.LIMIT; + public TypeEnum type = TypeEnum.LIMIT; /** * Account type. spot - use spot account; margin - use margin account; cross_margin - use cross margin account @@ -204,7 +204,7 @@ public AccountEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_ACCOUNT = "account"; @SerializedName(SERIALIZED_NAME_ACCOUNT) - private AccountEnum account = AccountEnum.SPOT; + public AccountEnum account = AccountEnum.SPOT; /** * Order side @@ -255,15 +255,15 @@ public SideEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_SIDE = "side"; @SerializedName(SERIALIZED_NAME_SIDE) - private SideEnum side; + public SideEnum side; public static final String SERIALIZED_NAME_AMOUNT = "amount"; @SerializedName(SERIALIZED_NAME_AMOUNT) - private String amount; + public String amount; public static final String SERIALIZED_NAME_PRICE = "price"; @SerializedName(SERIALIZED_NAME_PRICE) - private String price; + public String price; /** * Time in force - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, makes a post-only order that always enjoys a maker fee - fok: FillOrKill, fill either completely or none @@ -318,59 +318,59 @@ public TimeInForceEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_TIME_IN_FORCE = "time_in_force"; @SerializedName(SERIALIZED_NAME_TIME_IN_FORCE) - private TimeInForceEnum timeInForce = TimeInForceEnum.GTC; + public TimeInForceEnum timeInForce = TimeInForceEnum.GTC; public static final String SERIALIZED_NAME_ICEBERG = "iceberg"; @SerializedName(SERIALIZED_NAME_ICEBERG) - private String iceberg; + public String iceberg; public static final String SERIALIZED_NAME_AUTO_BORROW = "auto_borrow"; @SerializedName(SERIALIZED_NAME_AUTO_BORROW) - private Boolean autoBorrow; + public Boolean autoBorrow; public static final String SERIALIZED_NAME_AUTO_REPAY = "auto_repay"; @SerializedName(SERIALIZED_NAME_AUTO_REPAY) - private Boolean autoRepay; + public Boolean autoRepay; public static final String SERIALIZED_NAME_LEFT = "left"; @SerializedName(SERIALIZED_NAME_LEFT) - private String left; + public String left; public static final String SERIALIZED_NAME_FILL_PRICE = "fill_price"; @SerializedName(SERIALIZED_NAME_FILL_PRICE) - private String fillPrice; + public String fillPrice; public static final String SERIALIZED_NAME_FILLED_TOTAL = "filled_total"; @SerializedName(SERIALIZED_NAME_FILLED_TOTAL) - private String filledTotal; + public String filledTotal; public static final String SERIALIZED_NAME_FEE = "fee"; @SerializedName(SERIALIZED_NAME_FEE) - private String fee; + public String fee; public static final String SERIALIZED_NAME_FEE_CURRENCY = "fee_currency"; @SerializedName(SERIALIZED_NAME_FEE_CURRENCY) - private String feeCurrency; + public String feeCurrency; public static final String SERIALIZED_NAME_POINT_FEE = "point_fee"; @SerializedName(SERIALIZED_NAME_POINT_FEE) - private String pointFee; + public String pointFee; public static final String SERIALIZED_NAME_GT_FEE = "gt_fee"; @SerializedName(SERIALIZED_NAME_GT_FEE) - private String gtFee; + public String gtFee; public static final String SERIALIZED_NAME_GT_DISCOUNT = "gt_discount"; @SerializedName(SERIALIZED_NAME_GT_DISCOUNT) - private Boolean gtDiscount; + public Boolean gtDiscount; public static final String SERIALIZED_NAME_REBATED_FEE = "rebated_fee"; @SerializedName(SERIALIZED_NAME_REBATED_FEE) - private String rebatedFee; + public String rebatedFee; public static final String SERIALIZED_NAME_REBATED_FEE_CURRENCY = "rebated_fee_currency"; @SerializedName(SERIALIZED_NAME_REBATED_FEE_CURRENCY) - private String rebatedFeeCurrency; + public String rebatedFeeCurrency; /** From 6798115fb6ffc5bb8692a122db2ef0cf2e114261 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 22:06:59 +0300 Subject: [PATCH 3/7] Log --- src/main/java/io/gate/gateapi/JSON.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/gate/gateapi/JSON.java b/src/main/java/io/gate/gateapi/JSON.java index 10453c5..5688980 100644 --- a/src/main/java/io/gate/gateapi/JSON.java +++ b/src/main/java/io/gate/gateapi/JSON.java @@ -132,6 +132,7 @@ public String serialize(Object obj) { */ @SuppressWarnings("unchecked") public T deserialize(String body, Type returnType) { + System.out.println(returnType); try { if (isLenientOnJson) { JsonReader jsonReader = new JsonReader(new StringReader(body)); From e11d48557f3a644cb4fad92637dc73d740137a61 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 22:17:47 +0300 Subject: [PATCH 4/7] L --- src/main/java/io/gate/gateapi/JSON.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/gate/gateapi/JSON.java b/src/main/java/io/gate/gateapi/JSON.java index 5688980..99a978d 100644 --- a/src/main/java/io/gate/gateapi/JSON.java +++ b/src/main/java/io/gate/gateapi/JSON.java @@ -133,6 +133,7 @@ public String serialize(Object obj) { @SuppressWarnings("unchecked") public T deserialize(String body, Type returnType) { System.out.println(returnType); + try { if (isLenientOnJson) { JsonReader jsonReader = new JsonReader(new StringReader(body)); From 03081bb3eb4c6a4bc7fa479a9211d8b770b6d2e9 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 22:30:58 +0300 Subject: [PATCH 5/7] Exception public --- src/main/java/io/gate/gateapi/ApiException.java | 6 +++--- src/main/java/io/gate/gateapi/GateApiException.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/gate/gateapi/ApiException.java b/src/main/java/io/gate/gateapi/ApiException.java index f546bef..b1cb55b 100644 --- a/src/main/java/io/gate/gateapi/ApiException.java +++ b/src/main/java/io/gate/gateapi/ApiException.java @@ -15,9 +15,9 @@ public class ApiException extends Exception { - private int code = 0; - private Map> responseHeaders = null; - private String responseBody = null; + public int code = 0; + public Map> responseHeaders = null; + public String responseBody = null; public ApiException() {} diff --git a/src/main/java/io/gate/gateapi/GateApiException.java b/src/main/java/io/gate/gateapi/GateApiException.java index 09b21aa..2f7987d 100644 --- a/src/main/java/io/gate/gateapi/GateApiException.java +++ b/src/main/java/io/gate/gateapi/GateApiException.java @@ -8,13 +8,13 @@ public class GateApiException extends ApiException { @SerializedName("label") - private String errorLabel; + public String errorLabel; @SerializedName("message") - private String errorMessage; + public String errorMessage; @SerializedName("detail") - private String errorDetail; + public String errorDetail; public GateApiException() { From 47a00ff1c1eddf04c4d23e13fbfc87b0ca45aa75 Mon Sep 17 00:00:00 2001 From: dablDev Date: Wed, 19 Jan 2022 22:38:24 +0300 Subject: [PATCH 6/7] Exception deleted --- src/main/java/io/gate/gateapi/ApiClient.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/io/gate/gateapi/ApiClient.java b/src/main/java/io/gate/gateapi/ApiClient.java index dd074b9..e93ff5a 100644 --- a/src/main/java/io/gate/gateapi/ApiClient.java +++ b/src/main/java/io/gate/gateapi/ApiClient.java @@ -991,14 +991,6 @@ public T handleResponse(Response response, Type returnType) throws ApiExcept } catch (IOException e) { throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap()); } - try { - GateApiException exp = json.deserialize(respBody, GateApiException.class); - if (exp.getErrorLabel() != null && !"".equals(exp.getErrorLabel())) { - throw new GateApiException(exp, response.message(), response.code(), response.headers().toMultimap(), respBody); - } - } catch (JsonParseException e) { - // use original body - } } String message = response.message() + (respBody != null ? (", " + respBody) : ""); throw new ApiException(message, response.code(), response.headers().toMultimap(), respBody); From 123a1818bf7514e53232c2923d0bdc1fd4a2c374 Mon Sep 17 00:00:00 2001 From: dablDev Date: Thu, 20 Jan 2022 12:08:26 +0300 Subject: [PATCH 7/7] Logs disabled --- src/main/java/io/gate/gateapi/JSON.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/io/gate/gateapi/JSON.java b/src/main/java/io/gate/gateapi/JSON.java index 99a978d..10453c5 100644 --- a/src/main/java/io/gate/gateapi/JSON.java +++ b/src/main/java/io/gate/gateapi/JSON.java @@ -132,8 +132,6 @@ public String serialize(Object obj) { */ @SuppressWarnings("unchecked") public T deserialize(String body, Type returnType) { - System.out.println(returnType); - try { if (isLenientOnJson) { JsonReader jsonReader = new JsonReader(new StringReader(body));