|
9 | 9 |
|
10 | 10 | public final class RequestBuilder { |
11 | 11 | private static final MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8"); |
| 12 | + private static final String USER_AGENT = "binance-connector-java/3.0.0rc3"; |
| 13 | + private static final String CONTENT_TYPE = "application/x-www-form-urlencoded"; |
12 | 14 |
|
13 | 15 | private RequestBuilder() { |
14 | 16 | } |
15 | 17 | public static Request buildPublicRequest(String fullUrl, HttpMethod httpMethod) { |
16 | 18 | try { |
17 | | - final Request request; |
| 19 | + final Request.Builder requestBuilder = new Request.Builder().addHeader("User-Agent", USER_AGENT).addHeader("Content-Type", CONTENT_TYPE).url(fullUrl); |
18 | 20 | switch (httpMethod) { |
19 | 21 | case POST: |
20 | | - request = new Request.Builder().url(fullUrl) |
21 | | - .post(RequestBody.create("", JSON_TYPE)) |
22 | | - .build(); |
23 | | - break; |
| 22 | + return requestBuilder.post(RequestBody.create("", JSON_TYPE)).build(); |
24 | 23 | case GET: |
25 | | - request = new Request.Builder().url(fullUrl) |
26 | | - .get() |
27 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
28 | | - .build(); |
29 | | - break; |
| 24 | + return requestBuilder.get().build(); |
30 | 25 | case PUT: |
31 | | - request = new Request.Builder().url(fullUrl) |
32 | | - .put(RequestBody.create("", JSON_TYPE)) |
33 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
34 | | - .build(); |
35 | | - break; |
| 26 | + return requestBuilder.put(RequestBody.create("", JSON_TYPE)).build(); |
36 | 27 | case DELETE: |
37 | | - request = new Request.Builder().url(fullUrl) |
38 | | - .delete() |
39 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
40 | | - .build(); |
41 | | - break; |
| 28 | + return requestBuilder.delete().build(); |
42 | 29 | default: |
43 | 30 | throw new BinanceConnectorException("Invalid HTTP method: " + httpMethod); |
44 | 31 | } |
45 | | - return request; |
46 | 32 | } catch (IllegalArgumentException e) { |
47 | 33 | throw new BinanceConnectorException("Invalid URL: " + e.getMessage()); |
48 | 34 | } |
49 | 35 | } |
50 | 36 |
|
51 | 37 | public static Request buildApiKeyRequest(String fullUrl, HttpMethod httpMethod, String apiKey) { |
52 | 38 | try { |
53 | | - final Request request; |
| 39 | + final Request.Builder requestBuilder = new Request.Builder().addHeader("User-Agent", USER_AGENT).addHeader("Content-Type", CONTENT_TYPE).addHeader("X-MBX-APIKEY", apiKey).url(fullUrl); |
54 | 40 | switch (httpMethod) { |
55 | 41 | case POST: |
56 | | - request = new Request.Builder().url(fullUrl) |
57 | | - .post(RequestBody.create("", JSON_TYPE)) |
58 | | - .addHeader("X-MBX-APIKEY", apiKey) |
59 | | - .build(); |
60 | | - break; |
| 42 | + return requestBuilder.post(RequestBody.create("", JSON_TYPE)).build(); |
61 | 43 | case GET: |
62 | | - request = new Request.Builder().url(fullUrl) |
63 | | - .get() |
64 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
65 | | - .addHeader("X-MBX-APIKEY", apiKey) |
66 | | - .build(); |
67 | | - break; |
| 44 | + return requestBuilder.get().build(); |
68 | 45 | case PUT: |
69 | | - request = new Request.Builder().url(fullUrl) |
70 | | - .put(RequestBody.create("", JSON_TYPE)) |
71 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
72 | | - .addHeader("X-MBX-APIKEY", apiKey) |
73 | | - .build(); |
74 | | - break; |
| 46 | + return requestBuilder.put(RequestBody.create("", JSON_TYPE)).build(); |
75 | 47 | case DELETE: |
76 | | - request = new Request.Builder().url(fullUrl) |
77 | | - .delete() |
78 | | - .addHeader("Content-Type", "application/x-www-form-urlencoded") |
79 | | - .addHeader("X-MBX-APIKEY", apiKey) |
80 | | - .build(); |
81 | | - break; |
| 48 | + return requestBuilder.delete().build(); |
82 | 49 | default: |
83 | 50 | throw new BinanceConnectorException("Invalid HTTP method: " + httpMethod); |
84 | 51 | } |
85 | | - return request; |
86 | 52 | } catch (IllegalArgumentException e) { |
87 | 53 | throw new BinanceConnectorException("Invalid URL: " + e.getMessage()); |
88 | 54 | } |
|
0 commit comments