diff --git a/pom.xml b/pom.xml index bfa5e5f..552aa30 100644 --- a/pom.xml +++ b/pom.xml @@ -29,11 +29,11 @@ maven-compiler-plugin - 3.14.1 + 3.16.0 maven-failsafe-plugin - 3.5.4 + 3.6.1 @@ -46,11 +46,11 @@ io.jooby jooby-maven-plugin - 4.0.11 + 4.6.0 maven-shade-plugin - 3.6.1 + 3.6.2 package @@ -83,14 +83,14 @@ io.jooby jooby-bom - 4.0.11 + 4.6.0 pom import software.amazon.awssdk bom - 2.40.13 + 2.57.8 pom import @@ -106,17 +106,17 @@ org.apache.logging.log4j log4j-core - 2.25.4 + 2.26.1 org.apache.logging.log4j log4j-slf4j2-impl - 2.25.3 + 2.26.1 org.apache.logging.log4j log4j-iostreams - 2.25.3 + 2.26.1 com.lmax @@ -127,17 +127,17 @@ com.google.guava guava - 33.5.0-jre + 33.7.2-jre com.google.code.gson gson - 2.13.2 + 2.15.0 com.github.ben-manes.caffeine caffeine - 3.2.3 + 3.3.1 @@ -148,7 +148,7 @@ org.xerial sqlite-jdbc - 3.51.1.0 + 3.54.1.0 @@ -177,7 +177,7 @@ org.junit.jupiter junit-jupiter - 5.14.1 + 6.1.3 test diff --git a/src/main/java/me/lucko/bytebin/http/GetHandler.java b/src/main/java/me/lucko/bytebin/http/GetHandler.java index 9dd67bb..da015ac 100644 --- a/src/main/java/me/lucko/bytebin/http/GetHandler.java +++ b/src/main/java/me/lucko/bytebin/http/GetHandler.java @@ -40,8 +40,6 @@ import me.lucko.bytebin.util.TokenGenerator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import javax.annotation.Nonnull; import java.io.IOException; import java.time.Instant; import java.util.List; @@ -71,7 +69,7 @@ public GetHandler(BytebinServer server, LogHandler logHandler, RateLimiter rateL } @Override - public CompletableFuture apply(@Nonnull Context ctx) { + public CompletableFuture apply(Context ctx) { // get the requested path String path = ctx.path("id").value(); if (path.trim().isEmpty() || TokenGenerator.INVALID_TOKEN_PATTERN.matcher(path).find()) { diff --git a/src/main/java/me/lucko/bytebin/http/MetricsHandler.java b/src/main/java/me/lucko/bytebin/http/MetricsHandler.java index 72a616a..5635e93 100644 --- a/src/main/java/me/lucko/bytebin/http/MetricsHandler.java +++ b/src/main/java/me/lucko/bytebin/http/MetricsHandler.java @@ -31,14 +31,12 @@ import io.jooby.exception.StatusCodeException; import io.prometheus.client.CollectorRegistry; import io.prometheus.client.exporter.common.TextFormat; - -import javax.annotation.Nonnull; import java.io.OutputStreamWriter; public final class MetricsHandler implements Route.Handler { @Override - public Context apply(@Nonnull Context ctx) throws Exception { + public Context apply(Context ctx) throws Exception { // deny requests via the reverse proxy if (ctx.header("X-Forwarded-For").isPresent()) { throw new StatusCodeException(StatusCode.UNAUTHORIZED); diff --git a/src/main/java/me/lucko/bytebin/http/PostHandler.java b/src/main/java/me/lucko/bytebin/http/PostHandler.java index 732ccc8..73fb066 100644 --- a/src/main/java/me/lucko/bytebin/http/PostHandler.java +++ b/src/main/java/me/lucko/bytebin/http/PostHandler.java @@ -44,8 +44,6 @@ import me.lucko.bytebin.util.TokenGenerator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import javax.annotation.Nonnull; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -91,7 +89,7 @@ public PostHandler(BytebinServer server, LogHandler logHandler, RateLimiter rate } @Override - public String apply(@Nonnull Context ctx) { + public String apply(Context ctx) { byte[] content = getBodyAsByteArray(ctx, (int) this.maxContentLength); // ensure something was actually posted diff --git a/src/main/java/me/lucko/bytebin/http/UpdateHandler.java b/src/main/java/me/lucko/bytebin/http/UpdateHandler.java index b7ab24b..4d990de 100644 --- a/src/main/java/me/lucko/bytebin/http/UpdateHandler.java +++ b/src/main/java/me/lucko/bytebin/http/UpdateHandler.java @@ -41,8 +41,6 @@ import me.lucko.bytebin.util.TokenGenerator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import javax.annotation.Nonnull; import java.util.Date; import java.util.List; import java.util.Map; @@ -75,7 +73,7 @@ public UpdateHandler(BytebinServer server, LogHandler logHandler, RateLimiter ra } @Override - public CompletableFuture apply(@Nonnull Context ctx) { + public CompletableFuture apply(Context ctx) { // get the requested path String path = ctx.path("id").value(); if (path.trim().isEmpty() || TokenGenerator.INVALID_TOKEN_PATTERN.matcher(path).find()) { diff --git a/src/main/java/me/lucko/bytebin/http/admin/BulkDeleteHandler.java b/src/main/java/me/lucko/bytebin/http/admin/BulkDeleteHandler.java index 29f19a7..0b923b1 100644 --- a/src/main/java/me/lucko/bytebin/http/admin/BulkDeleteHandler.java +++ b/src/main/java/me/lucko/bytebin/http/admin/BulkDeleteHandler.java @@ -35,8 +35,6 @@ import me.lucko.bytebin.http.BytebinServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; import java.util.Set; @@ -62,7 +60,7 @@ public BulkDeleteHandler(BytebinServer server, ContentStorageHandler storageHand } @Override - public CompletableFuture apply(@Nonnull Context ctx) { + public CompletableFuture apply(Context ctx) { String apiKey = ctx.header(HEADER_API_KEY).value(""); if (apiKey.isEmpty() || !this.apiKeys.contains(apiKey)) { throw new StatusCodeException(StatusCode.UNAUTHORIZED, "API key is invalid");