From 0b0a964a90b18929dcd3aceb7c3c14e42898384e Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 20 Jul 2025 01:08:27 +0200 Subject: [PATCH] enums are now supported by openapi, allowableValues is no longer required --- .../commafeed/frontend/model/Settings.java | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java index 1a0bbffe..644cdcd3 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java @@ -21,16 +21,10 @@ public class Settings implements Serializable { @Schema(description = "user's preferred language, english if none", requiredMode = RequiredMode.REQUIRED) private String language; - @Schema( - description = "user reads all entries or unread entries only", - allowableValues = "all,unread", - requiredMode = RequiredMode.REQUIRED) + @Schema(description = "user reads all entries or unread entries only", requiredMode = RequiredMode.REQUIRED) private ReadingMode readingMode; - @Schema( - description = "user reads entries in ascending or descending order", - allowableValues = "asc,desc", - requiredMode = RequiredMode.REQUIRED) + @Schema(description = "user reads entries in ascending or descending order", requiredMode = RequiredMode.REQUIRED) private ReadingOrder readingOrder; @Schema(description = "user wants category and feeds with no unread entries shown", requiredMode = RequiredMode.REQUIRED) @@ -48,25 +42,16 @@ public class Settings implements Serializable { @Schema(description = "user's preferred scroll speed when navigating between entries", requiredMode = RequiredMode.REQUIRED) private int scrollSpeed; - @Schema( - description = "whether to scroll to the selected entry", - allowableValues = "always,never,if_needed", - requiredMode = RequiredMode.REQUIRED) + @Schema(description = "whether to scroll to the selected entry", requiredMode = RequiredMode.REQUIRED) private ScrollMode scrollMode; @Schema(description = "number of entries to keep above the selected entry when scrolling", requiredMode = RequiredMode.REQUIRED) private int entriesToKeepOnTopWhenScrolling; - @Schema( - description = "whether to show the star icon in the header of entries", - allowableValues = "always,never,on_desktop,on_mobile", - requiredMode = RequiredMode.REQUIRED) + @Schema(description = "whether to show the star icon in the header of entries", requiredMode = RequiredMode.REQUIRED) private IconDisplayMode starIconDisplayMode; - @Schema( - description = "whether to show the external link icon in the header of entries", - allowableValues = "always,never,on_desktop,on_mobile", - requiredMode = RequiredMode.REQUIRED) + @Schema(description = "whether to show the external link icon in the header of entries", requiredMode = RequiredMode.REQUIRED) private IconDisplayMode externalLinkIconDisplayMode; @Schema(description = "ask for confirmation when marking all entries as read", requiredMode = RequiredMode.REQUIRED)