Skip to content

Commit bf2a644

Browse files
InsmaelInsmael
committed
updates to java 17
1 parent aea9821 commit bf2a644

File tree

11 files changed

+163
-294
lines changed

11 files changed

+163
-294
lines changed

‎pom.xml‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<groupId>com.cryptomkt.api</groupId>
57
<artifactId>cryptomarket</artifactId>
68
<packaging>jar</packaging>
7-
<version>1.1.0</version>
9+
<version>2.0.0</version>
810

911
<licenses>
1012
<license>
@@ -21,40 +23,10 @@
2123
<artifactId>maven-compiler-plugin</artifactId>
2224
<version>3.8.1</version>
2325
<configuration>
24-
<target>1.8</target>
25-
<source>1.8</source>
26+
<target>17</target>
27+
<source>17</source>
2628
</configuration>
2729
</plugin>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-source-plugin</artifactId>
31-
<version>3.2.1</version>
32-
<executions>
33-
<execution>
34-
<id>attach-sources</id>
35-
<goals>
36-
<goal>jar-no-fork</goal>
37-
</goals>
38-
</execution>
39-
</executions>
40-
</plugin>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-javadoc-plugin</artifactId>
44-
<version>3.1.1</version>
45-
<configuration>
46-
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
47-
<source>8</source>
48-
</configuration>
49-
<executions>
50-
<execution>
51-
<id>attach-javadocs</id>
52-
<goals>
53-
<goal>jar</goal>
54-
</goals>
55-
</execution>
56-
</executions>
57-
</plugin>
5830
<plugin>
5931
<groupId>org.apache.maven.plugins</groupId>
6032
<artifactId>maven-gpg-plugin</artifactId>
@@ -118,7 +90,7 @@
11890
<dependency>
11991
<groupId>com.squareup.okhttp3</groupId>
12092
<artifactId>okhttp</artifactId>
121-
<version>4.9.0</version>
93+
<version>4.11.0</version>
12294
</dependency>
12395
<dependency>
12496
<groupId>com.squareup.moshi</groupId>
@@ -140,7 +112,7 @@
140112
<developers>
141113
<developer>
142114
<name>T. Ismael Verdugo</name>
143-
<email>ismael.verdugo@gmail.com</email>
115+
<email>ismael@dysopsis.com</email>
144116
<organization>CryptoMarket</organization>
145117
<organizationUrl>https://www.cryptomkt.com</organizationUrl>
146118
</developer>

‎src/main/java/com/cryptomarket/params/OrderBuilder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.squareup.moshi.Json;
44

5+
@SuppressWarnings("unused")
56
public class OrderBuilder {
67
@Json(name = "client_order_id")
78
private String clientOrderId;

‎src/main/java/com/cryptomarket/sdk/requests/OrderListRequest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import com.cryptomarket.params.OrderBuilder;
77
import com.squareup.moshi.Json;
88

9+
@SuppressWarnings("unused")
910
public class OrderListRequest {
10-
11+
1112
@Json(name = "contingency_type")
1213
private ContingencyType contingencyType;
13-
14+
1415
@Json(name = "order_list_id")
1516
private String orderListId;
16-
17+
1718
private List<OrderBuilder> orders;
1819

1920
public OrderListRequest(ContingencyType contingencyType, String orderListId, List<OrderBuilder> orders) {

‎src/main/java/com/cryptomarket/sdk/requests/WithdrawRequest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.cryptomarket.params.ParamsBuilder;
77
import com.squareup.moshi.Json;
88

9+
@SuppressWarnings("unused")
910
public class WithdrawRequest {
1011
private String currency;
1112
@Json(name = "network_code")

‎src/test/java/com/cryptomarket/sdk/Checker.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838

3939
public class Checker {
4040

41+
static Consumer<Boolean> checkBooleanTrue = bool -> {
42+
if (bool == null || !bool)
43+
fail("boolean not true");
44+
};
45+
4146
static Consumer<String> checkString = str -> {
4247
if (str == null || str.equals(""))
4348
fail(str);

‎src/test/java/com/cryptomarket/sdk/Helpers.java‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.function.Consumer;
1010

1111
import com.cryptomarket.params.NotificationType;
12+
import com.cryptomarket.sdk.exceptions.CryptomarketSDKException;
1213

1314
public class Helpers {
1415
public static void sleep(int seconds) {
@@ -31,62 +32,90 @@ public Boolean failed() {
3132
}
3233
}
3334

34-
public static <T> BiConsumer<T, NotificationType> checker(FailChecker failCheck, Consumer<T> checker) {
35+
public static <T> BiConsumer<T, NotificationType> checker(FailChecker failChecker, Consumer<T> checker) {
3536
return (data, notificationType) -> {
3637
if (notificationType.isError()) {
37-
failCheck.fail();
38+
failChecker.fail();
3839
return;
3940
}
40-
System.out.println(notificationType);
41-
System.out.println(data);
4241
try {
4342
checker.accept(data);
4443
} catch (AssertionError e) {
45-
failCheck.fail();
44+
failChecker.fail();
4645
}
4746
};
4847
}
4948

50-
public static <T> BiConsumer<List<T>, NotificationType> listChecker(FailChecker failCheck, Consumer<T> checker) {
49+
public static <T> BiConsumer<T, CryptomarketSDKException> objectAndExceptionChecker(FailChecker failChecker,
50+
Consumer<T> checker) {
51+
return (data, error) -> {
52+
if (error != null) {
53+
failChecker.fail();
54+
}
55+
try {
56+
checker.accept(data);
57+
} catch (AssertionError e) {
58+
failChecker.fail();
59+
}
60+
};
61+
}
62+
63+
public static <T> BiConsumer<List<T>, CryptomarketSDKException> listAndExceptionChecker(FailChecker failChecker,
64+
Consumer<T> checker) {
65+
return (data, error) -> {
66+
if (error != null) {
67+
failChecker.fail();
68+
}
69+
try {
70+
data.forEach(v -> checker.accept(v));
71+
} catch (AssertionError e) {
72+
failChecker.fail();
73+
}
74+
};
75+
}
76+
77+
public static <T> BiConsumer<List<T>, NotificationType> notificationListChecker(FailChecker failChecker,
78+
Consumer<T> checker) {
5179
return (data, notificationType) -> {
5280
if (notificationType.isError()) {
53-
failCheck.fail();
81+
failChecker.fail();
5482
return;
5583
}
5684
try {
5785
data.forEach(v -> checker.accept(v));
5886
} catch (AssertionError e) {
59-
failCheck.fail();
87+
failChecker.fail();
6088
}
6189
};
6290
}
6391

64-
public static <T> BiConsumer<Map<String, T>, NotificationType> mapChecker(FailChecker failCheck,
92+
public static <T> BiConsumer<Map<String, T>, NotificationType> notificationMapChecker(FailChecker failChecker,
6593
Consumer<T> checker) {
6694
return (data, notificationType) -> {
6795
if (notificationType.isError()) {
68-
failCheck.fail();
96+
failChecker.fail();
6997
return;
7098
}
7199
try {
72100
data.forEach((k, v) -> checker.accept(v));
73101
} catch (AssertionError e) {
74-
failCheck.fail();
102+
failChecker.fail();
75103
}
76104
};
77105
}
78106

79-
public static <T> BiConsumer<Map<String, List<T>>, NotificationType> mapListChecker(FailChecker failCheck,
107+
public static <T> BiConsumer<Map<String, List<T>>, NotificationType> notificationMapListChecker(
108+
FailChecker failChecker,
80109
Consumer<T> checker) {
81110
return (data, notificationType) -> {
82111
if (notificationType.isError()) {
83-
failCheck.fail();
112+
failChecker.fail();
84113
return;
85114
}
86115
try {
87116
data.forEach((k, v) -> v.forEach(checker));
88117
} catch (AssertionError e) {
89-
failCheck.fail();
118+
failChecker.fail();
90119
}
91120
};
92121
}

0 commit comments

Comments
 (0)