diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8a1aa7f..b37fcda 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a8b8805..acad9be 100644 --- a/build.gradle +++ b/build.gradle @@ -16,3 +16,11 @@ dependencies { implementation 'tools.jackson.core:jackson-databind:3.1.3' } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(26) + } + sourceCompatibility = JavaVersion.VERSION_26 + targetCompatibility = JavaVersion.VERSION_26 +} + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a06ba8..22893e0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri May 08 10:10:06 CEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/dev/coph/nextusweb/server/json/Json.java b/src/main/java/dev/coph/nextusweb/server/json/JsonMapper.java similarity index 50% rename from src/main/java/dev/coph/nextusweb/server/json/Json.java rename to src/main/java/dev/coph/nextusweb/server/json/JsonMapper.java index f149b27..b49e32f 100644 --- a/src/main/java/dev/coph/nextusweb/server/json/Json.java +++ b/src/main/java/dev/coph/nextusweb/server/json/JsonMapper.java @@ -1,14 +1,12 @@ package dev.coph.nextusweb.server.json; import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.json.JsonMapper; - -public final class Json { - public static final ObjectMapper MAPPER = JsonMapper.builder() +public final class JsonMapper { + public static final ObjectMapper MAPPER = tools.jackson.databind.json.JsonMapper.builder() // .addModule(new JavaTimeModule()) .build(); - private Json() {} + private JsonMapper() {} } \ No newline at end of file diff --git a/src/main/java/dev/coph/nextusweb/server/router/Request.java b/src/main/java/dev/coph/nextusweb/server/router/Request.java index c82c58f..8939c7c 100644 --- a/src/main/java/dev/coph/nextusweb/server/router/Request.java +++ b/src/main/java/dev/coph/nextusweb/server/router/Request.java @@ -1,6 +1,6 @@ package dev.coph.nextusweb.server.router; -import dev.coph.nextusweb.server.json.Json; +import dev.coph.nextusweb.server.json.JsonMapper; import dev.coph.nextusweb.server.router.exception.BadRequestException; import io.netty.handler.codec.http.*; import io.netty.util.CharsetUtil; @@ -54,9 +54,9 @@ public final class Request { byte[] bytes = new byte[raw.content().readableBytes()]; raw.content().getBytes(raw.content().readerIndex(), bytes); if (bytes.length == 0) { - jsonCache = Json.MAPPER.nullNode(); + jsonCache = JsonMapper.MAPPER.nullNode(); } else { - jsonCache = Json.MAPPER.readTree(bytes); + jsonCache = JsonMapper.MAPPER.readTree(bytes); } } catch (JacksonException e) { throw new BadRequestException("Invalid JSON: " + e.getOriginalMessage()); @@ -69,7 +69,7 @@ public final class Request { try { byte[] bytes = new byte[raw.content().readableBytes()]; raw.content().getBytes(raw.content().readerIndex(), bytes); - return Json.MAPPER.readValue(bytes, type); + return JsonMapper.MAPPER.readValue(bytes, type); } catch (JacksonException e) { throw new BadRequestException( "Could not deserialize body as " + type.getSimpleName() + ": " + e.getOriginalMessage()); diff --git a/src/main/java/dev/coph/nextusweb/server/router/Response.java b/src/main/java/dev/coph/nextusweb/server/router/Response.java index 88eec36..93136cf 100644 --- a/src/main/java/dev/coph/nextusweb/server/router/Response.java +++ b/src/main/java/dev/coph/nextusweb/server/router/Response.java @@ -1,6 +1,6 @@ package dev.coph.nextusweb.server.router; -import dev.coph.nextusweb.server.json.Json; +import dev.coph.nextusweb.server.json.JsonMapper; import io.netty.handler.codec.http.*; import io.netty.util.CharsetUtil; import tools.jackson.core.JacksonException; @@ -32,7 +32,7 @@ public final class Response { public Response json(Object value) { try { - this.body = Json.MAPPER.writeValueAsBytes(value); + this.body = JsonMapper.MAPPER.writeValueAsBytes(value); headers.set(HttpHeaderNames.CONTENT_TYPE, "application/json; charset=utf-8"); } catch (JacksonException e) { throw new RuntimeException("JSON serialization failed", e);