diff --git a/build.gradle b/build.gradle index 4818ed9cc..1418b094b 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ ext { wpilibVersion = "2027.0.0-alpha-6" openCVversion = "2027-4.13.0-3" ejmlVersion = "0.43.1"; - avajeJsonbVersion = "3.14-RC4"; + avajeJsonbVersion = "3.14"; msgpackVersion = "0.9.0"; quickbufVersion = "1.3.3"; jacocoVersion = "0.8.14"; diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java index 0fb75cc65..550922f49 100644 --- a/photon-server/src/main/java/org/photonvision/server/Server.java +++ b/photon-server/src/main/java/org/photonvision/server/Server.java @@ -17,6 +17,7 @@ package org.photonvision.server; +import io.avaje.jsonb.javalin.JavalinJsonb; import io.javalin.Javalin; import io.javalin.plugin.bundled.CorsPlugin; import java.net.InetSocketAddress; @@ -103,6 +104,7 @@ public class Server { return "Got WebSockets binary message from host: " + host; })); }); + javalinConfig.jsonMapper(new JavalinJsonb()); }); /* Web Socket Events for Data Exchange */ diff --git a/shared/common.gradle b/shared/common.gradle index 0db1f2d2c..307bd8636 100644 --- a/shared/common.gradle +++ b/shared/common.gradle @@ -37,6 +37,7 @@ dependencies { implementation group: "io.avaje", name: "avaje-jsonb", version: avajeJsonbVersion annotationProcessor group: "io.avaje", name: "avaje-jsonb-generator", version: avajeJsonbVersion implementation group: "io.avaje", name: "avaje-jsonb-jackson", version: avajeJsonbVersion + implementation group: "io.avaje", name: "avaje-jsonb-javalin-mapper", version: avajeJsonbVersion implementation group: "org.ejml", name: "ejml-simple", version: ejmlVersion implementation group: "us.hebi.quickbuf", name: "quickbuf-runtime", version: quickbufVersion;