Skip to content

Commit f89bca0

Browse files
aNNiMONaNNiMON
committed
Update deps
1 parent b1cfc6b commit f89bca0

File tree

3 files changed

+27
-67
lines changed

3 files changed

+27
-67
lines changed

‎build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ ext {
22
versions = [
33
project: '2.0.0',
44

5-
json: '20230227', // org.json:json
6-
snakeyaml: '1.20', // org.yaml:snakeyaml
7-
okhttp: '3.8.1', // com.squareup.okhttp3:okhttp
8-
socket: '1.0.2', // io.socket:socket.io-client
5+
json: '20240205', // org.json:json
6+
snakeyaml: '1.33', // org.yaml:snakeyaml
7+
okhttp: '3.14.9', // com.squareup.okhttp3:okhttp
8+
socket: '2.1.0', // io.socket:socket.io-client
99
jline: '2.14.6', // jline:jline
1010

11-
javalin: '5.6.3', // io.javalin:javalin
12-
slf4j: '2.0.9', // org.slf4j:slf4j-simple
13-
jackson: '2.15.3', // com.fasterxml.jackson.core:jackson-databind
11+
javalin: '6.1.0', // io.javalin:javalin
12+
slf4j: '2.0.12', // org.slf4j:slf4j-simple
13+
jackson: '2.16.1', // com.fasterxml.jackson.core:jackson-databind
1414

15-
junit: '5.9.2', // org.junit:junit-bom
15+
junit: '5.10.2', // org.junit:junit-bom
1616
jmh: '1.37', // org.openjdk.jmh:jmh-core
17-
assertj: '3.24.2' // org.assertj:assertj-core
17+
assertj: '3.25.3' // org.assertj:assertj-core
1818
]
1919
}
2020

‎modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java‎

Lines changed: 11 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.socket.client.IO;
77
import io.socket.client.Socket;
88
import java.net.URISyntaxException;
9-
import java.util.LinkedHashMap;
109
import java.util.Map;
1110

1211
/**
@@ -18,22 +17,11 @@ public final class socket implements Module {
1817

1918
@Override
2019
public Map<String, Value> constants() {
21-
final var result = new LinkedHashMap<String, Value>(15);
22-
result.put("EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT));
23-
result.put("EVENT_CONNECTING", new StringValue(Socket.EVENT_CONNECTING));
24-
result.put("EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR));
25-
result.put("EVENT_CONNECT_TIMEOUT", new StringValue(Socket.EVENT_CONNECT_TIMEOUT));
26-
result.put("EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT));
27-
result.put("EVENT_ERROR", new StringValue(Socket.EVENT_ERROR));
28-
result.put("EVENT_MESSAGE", new StringValue(Socket.EVENT_MESSAGE));
29-
result.put("EVENT_PING", new StringValue(Socket.EVENT_PING));
30-
result.put("EVENT_PONG", new StringValue(Socket.EVENT_PONG));
31-
result.put("EVENT_RECONNECT", new StringValue(Socket.EVENT_RECONNECT));
32-
result.put("EVENT_RECONNECTING", new StringValue(Socket.EVENT_RECONNECTING));
33-
result.put("EVENT_RECONNECT_ATTEMPT", new StringValue(Socket.EVENT_RECONNECT_ATTEMPT));
34-
result.put("EVENT_RECONNECT_ERROR", new StringValue(Socket.EVENT_RECONNECT_ERROR));
35-
result.put("EVENT_RECONNECT_FAILED", new StringValue(Socket.EVENT_RECONNECT_FAILED));
36-
return result;
20+
return Map.of(
21+
"EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT),
22+
"EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR),
23+
"EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT)
24+
);
3725
}
3826

3927
@Override
@@ -71,39 +59,20 @@ public SocketValue(Socket socket) {
7159
}
7260

7361
private void init() {
74-
set("close", this::close);
75-
set("connect", this::connect);
76-
set("connected", this::connected);
77-
set("disconnect", this::disconnect);
62+
set("close", Converters.voidToVoid(socket::close));
63+
set("connect", Converters.voidToVoid(socket::connect));
64+
set("connected", Converters.voidToBoolean(socket::connected));
65+
set("disconnect", Converters.voidToVoid(socket::disconnect));
7866
set("emit", this::emit);
7967
set("hasListeners", this::hasListeners);
80-
set("id", this::id);
68+
set("id", Converters.voidToString(socket::id));
8169
set("off", this::off);
8270
set("on", this::on);
8371
set("once", this::once);
84-
set("open", this::open);
72+
set("open", Converters.voidToVoid(socket::open));
8573
set("send", this::send);
8674
}
8775

88-
private Value close(Value[] args) {
89-
socket.close();
90-
return this;
91-
}
92-
93-
private Value connect(Value[] args) {
94-
socket.connect();
95-
return this;
96-
}
97-
98-
private Value connected(Value[] args) {
99-
return NumberValue.fromBoolean(socket.connected());
100-
}
101-
102-
private Value disconnect(Value[] args) {
103-
socket.disconnect();
104-
return this;
105-
}
106-
10776
private Value hasListeners(Value[] args) {
10877
Arguments.check(1, args.length);
10978
return NumberValue.fromBoolean(
@@ -122,10 +91,6 @@ private Value emit(Value[] args) {
12291
return this;
12392
}
12493

125-
private Value id(Value[] args) {
126-
return new StringValue(socket.id());
127-
}
128-
12994
private Value off(Value[] args) {
13095
Arguments.checkOrOr(0, 1, args.length);
13196
if (args.length == 1) {
@@ -156,11 +121,6 @@ private Value once(Value[] args) {
156121
return this;
157122
}
158123

159-
private Value open(Value[] args) {
160-
socket.open();
161-
return this;
162-
}
163-
164124
private Value send(Value[] args) {
165125
Arguments.check(1, args.length);
166126
socket.send(ValueUtils.toObject(args[0]));

‎modules/server/src/main/java/com/annimon/ownlang/modules/server/Config.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ public void setup(JavalinConfig config) {
6161
ifNumber("maxRequestSize", value -> config.http.maxRequestSize = value.asLong());
6262

6363
// routing
64-
ifBoolean("caseInsensitiveRoutes", flag -> config.routing.caseInsensitiveRoutes = flag);
65-
ifBoolean("ignoreTrailingSlashes", flag -> config.routing.ignoreTrailingSlashes = flag);
66-
ifBoolean("multipleSlashesAsSingle", flag -> config.routing.treatMultipleSlashesAsSingleSlash = flag);
67-
ifString("contextPath", path -> config.routing.contextPath = path);
64+
ifBoolean("caseInsensitiveRoutes", flag -> config.router.caseInsensitiveRoutes = flag);
65+
ifBoolean("ignoreTrailingSlashes", flag -> config.router.ignoreTrailingSlashes = flag);
66+
ifBoolean("multipleSlashesAsSingle", flag -> config.router.treatMultipleSlashesAsSingleSlash = flag);
67+
ifString("contextPath", path -> config.router.contextPath = path);
6868

6969
// other
70-
ifArray("basicAuth", arr -> config.plugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString()));
70+
ifArray("basicAuth", arr -> config.bundledPlugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString()));
7171
ifBoolean("showBanner", flag -> config.showJavalinBanner = flag);
72-
ifTrue("dev", config.plugins::enableDevLogging);
73-
ifTrue("sslRedirects", config.plugins::enableSslRedirects);
72+
ifTrue("dev", config.bundledPlugins::enableDevLogging);
73+
ifTrue("sslRedirects", config.bundledPlugins::enableSslRedirects);
7474
}
7575

7676
private void ifTrue(String key, Runnable action) {

0 commit comments

Comments
 (0)