From f89bca0d68e3d71b9c85e86e1dbfb0ea5d7300d5 Mon Sep 17 00:00:00 2001 From: aNNiMON Date: Wed, 21 Feb 2024 21:02:09 +0200 Subject: [PATCH] Update deps --- build.gradle | 18 +++--- .../ownlang/modules/socket/socket.java | 62 ++++--------------- .../ownlang/modules/server/Config.java | 14 ++--- 3 files changed, 27 insertions(+), 67 deletions(-) diff --git a/build.gradle b/build.gradle index 02eada7..abf982a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,19 +2,19 @@ ext { versions = [ project: '2.0.0', - json: '20230227', // org.json:json - snakeyaml: '1.20', // org.yaml:snakeyaml - okhttp: '3.8.1', // com.squareup.okhttp3:okhttp - socket: '1.0.2', // io.socket:socket.io-client + json: '20240205', // org.json:json + snakeyaml: '1.33', // org.yaml:snakeyaml + okhttp: '3.14.9', // com.squareup.okhttp3:okhttp + socket: '2.1.0', // io.socket:socket.io-client jline: '2.14.6', // jline:jline - javalin: '5.6.3', // io.javalin:javalin - slf4j: '2.0.9', // org.slf4j:slf4j-simple - jackson: '2.15.3', // com.fasterxml.jackson.core:jackson-databind + javalin: '6.1.0', // io.javalin:javalin + slf4j: '2.0.12', // org.slf4j:slf4j-simple + jackson: '2.16.1', // com.fasterxml.jackson.core:jackson-databind - junit: '5.9.2', // org.junit:junit-bom + junit: '5.10.2', // org.junit:junit-bom jmh: '1.37', // org.openjdk.jmh:jmh-core - assertj: '3.24.2' // org.assertj:assertj-core + assertj: '3.25.3' // org.assertj:assertj-core ] } diff --git a/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java b/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java index 78c5ca3..048c8aa 100644 --- a/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java +++ b/modules/main/src/main/java/com/annimon/ownlang/modules/socket/socket.java @@ -6,7 +6,6 @@ import com.annimon.ownlang.modules.Module; import io.socket.client.IO; import io.socket.client.Socket; import java.net.URISyntaxException; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -18,22 +17,11 @@ public final class socket implements Module { @Override public Map constants() { - final var result = new LinkedHashMap(15); - result.put("EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT)); - result.put("EVENT_CONNECTING", new StringValue(Socket.EVENT_CONNECTING)); - result.put("EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR)); - result.put("EVENT_CONNECT_TIMEOUT", new StringValue(Socket.EVENT_CONNECT_TIMEOUT)); - result.put("EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT)); - result.put("EVENT_ERROR", new StringValue(Socket.EVENT_ERROR)); - result.put("EVENT_MESSAGE", new StringValue(Socket.EVENT_MESSAGE)); - result.put("EVENT_PING", new StringValue(Socket.EVENT_PING)); - result.put("EVENT_PONG", new StringValue(Socket.EVENT_PONG)); - result.put("EVENT_RECONNECT", new StringValue(Socket.EVENT_RECONNECT)); - result.put("EVENT_RECONNECTING", new StringValue(Socket.EVENT_RECONNECTING)); - result.put("EVENT_RECONNECT_ATTEMPT", new StringValue(Socket.EVENT_RECONNECT_ATTEMPT)); - result.put("EVENT_RECONNECT_ERROR", new StringValue(Socket.EVENT_RECONNECT_ERROR)); - result.put("EVENT_RECONNECT_FAILED", new StringValue(Socket.EVENT_RECONNECT_FAILED)); - return result; + return Map.of( + "EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT), + "EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR), + "EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT) + ); } @Override @@ -71,39 +59,20 @@ public final class socket implements Module { } private void init() { - set("close", this::close); - set("connect", this::connect); - set("connected", this::connected); - set("disconnect", this::disconnect); + set("close", Converters.voidToVoid(socket::close)); + set("connect", Converters.voidToVoid(socket::connect)); + set("connected", Converters.voidToBoolean(socket::connected)); + set("disconnect", Converters.voidToVoid(socket::disconnect)); set("emit", this::emit); set("hasListeners", this::hasListeners); - set("id", this::id); + set("id", Converters.voidToString(socket::id)); set("off", this::off); set("on", this::on); set("once", this::once); - set("open", this::open); + set("open", Converters.voidToVoid(socket::open)); set("send", this::send); } - private Value close(Value[] args) { - socket.close(); - return this; - } - - private Value connect(Value[] args) { - socket.connect(); - return this; - } - - private Value connected(Value[] args) { - return NumberValue.fromBoolean(socket.connected()); - } - - private Value disconnect(Value[] args) { - socket.disconnect(); - return this; - } - private Value hasListeners(Value[] args) { Arguments.check(1, args.length); return NumberValue.fromBoolean( @@ -122,10 +91,6 @@ public final class socket implements Module { return this; } - private Value id(Value[] args) { - return new StringValue(socket.id()); - } - private Value off(Value[] args) { Arguments.checkOrOr(0, 1, args.length); if (args.length == 1) { @@ -156,11 +121,6 @@ public final class socket implements Module { return this; } - private Value open(Value[] args) { - socket.open(); - return this; - } - private Value send(Value[] args) { Arguments.check(1, args.length); socket.send(ValueUtils.toObject(args[0])); diff --git a/modules/server/src/main/java/com/annimon/ownlang/modules/server/Config.java b/modules/server/src/main/java/com/annimon/ownlang/modules/server/Config.java index fef668a..9146296 100644 --- a/modules/server/src/main/java/com/annimon/ownlang/modules/server/Config.java +++ b/modules/server/src/main/java/com/annimon/ownlang/modules/server/Config.java @@ -61,16 +61,16 @@ class Config { ifNumber("maxRequestSize", value -> config.http.maxRequestSize = value.asLong()); // routing - ifBoolean("caseInsensitiveRoutes", flag -> config.routing.caseInsensitiveRoutes = flag); - ifBoolean("ignoreTrailingSlashes", flag -> config.routing.ignoreTrailingSlashes = flag); - ifBoolean("multipleSlashesAsSingle", flag -> config.routing.treatMultipleSlashesAsSingleSlash = flag); - ifString("contextPath", path -> config.routing.contextPath = path); + ifBoolean("caseInsensitiveRoutes", flag -> config.router.caseInsensitiveRoutes = flag); + ifBoolean("ignoreTrailingSlashes", flag -> config.router.ignoreTrailingSlashes = flag); + ifBoolean("multipleSlashesAsSingle", flag -> config.router.treatMultipleSlashesAsSingleSlash = flag); + ifString("contextPath", path -> config.router.contextPath = path); // other - ifArray("basicAuth", arr -> config.plugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString())); + ifArray("basicAuth", arr -> config.bundledPlugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString())); ifBoolean("showBanner", flag -> config.showJavalinBanner = flag); - ifTrue("dev", config.plugins::enableDevLogging); - ifTrue("sslRedirects", config.plugins::enableSslRedirects); + ifTrue("dev", config.bundledPlugins::enableDevLogging); + ifTrue("sslRedirects", config.bundledPlugins::enableSslRedirects); } private void ifTrue(String key, Runnable action) {