From 31a9e27c7f885169fe16376483b5bdc378f7d2a7 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sun, 18 Feb 2024 14:08:47 +0000 Subject: [PATCH 1/2] Switch to `@Positive` instead of `@Pattern` for buildNumber --- .../papermc/bibliothek/controller/v2/DownloadController.java | 3 ++- .../bibliothek/controller/v2/VersionBuildController.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java b/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java index 4e46f7b..e752370 100644 --- a/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java +++ b/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java @@ -47,6 +47,7 @@ import java.nio.file.Path; import java.time.Duration; import java.util.Map; +import jakarta.validation.constraints.Positive; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; import org.springframework.http.CacheControl; @@ -121,7 +122,7 @@ public ResponseEntity download( final String versionName, @Parameter(description = "A build of the version.") @PathVariable("build") - @Pattern(regexp = "\\d+") // + @Positive // final int buildNumber, @Parameter(description = "A download of the build.") @PathVariable("download") diff --git a/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java b/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java index b4b4d47..b9fbfb8 100644 --- a/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java +++ b/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java @@ -43,6 +43,7 @@ import java.time.Instant; import java.util.List; import java.util.Map; +import jakarta.validation.constraints.Positive; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; import org.springframework.http.MediaType; @@ -91,7 +92,7 @@ public ResponseEntity build( final String versionName, @Parameter(description = "A build of the version.") @PathVariable("build") - @Pattern(regexp = "\\d+") // + @Positive // final int buildNumber ) { final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); From 4ea51c4822db95e5a22a0fcd89c89c655c280ed2 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sun, 18 Feb 2024 16:51:34 +0000 Subject: [PATCH 2/2] Fix import order --- .../io/papermc/bibliothek/controller/v2/DownloadController.java | 2 +- .../bibliothek/controller/v2/VersionBuildController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java b/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java index e752370..ec85baa 100644 --- a/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java +++ b/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java @@ -42,12 +42,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; import java.util.Map; -import jakarta.validation.constraints.Positive; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; import org.springframework.http.CacheControl; diff --git a/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java b/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java index b9fbfb8..1152e66 100644 --- a/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java +++ b/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java @@ -39,11 +39,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import java.time.Duration; import java.time.Instant; import java.util.List; import java.util.Map; -import jakarta.validation.constraints.Positive; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; import org.springframework.http.MediaType;