Spring Boot 3

2 files changed, 14 insertions, 12 deletions

diff --git a/src/main/java/com/juick/www/rss/MessagesView.java b/src/main/java/com/juick/www/rss/MessagesView.java
index 2c7d4a7d..dde67d7b 100644
--- a/src/main/java/com/juick/www/rss/MessagesView.java
+++ b/src/main/java/com/juick/www/rss/MessagesView.java
@@ -26,11 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import com.juick.model.Attachment;
 import com.juick.model.Message;
@@ -57,6 +53,10 @@ import com.rometools.rome.feed.rss.Guid;
 import com.rometools.rome.feed.rss.Image;
 import com.rometools.rome.feed.rss.Item;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,8 +81,8 @@ public class MessagesView extends AbstractRssFeedView {
 
     @SuppressWarnings("unchecked")
     @Override
-    protected List<Item> buildFeedItems(@Nonnull Map<String, Object> model, @Nonnull HttpServletRequest request,
-            @Nonnull HttpServletResponse response) {
+    protected List<Item> buildFeedItems(Map<String, Object> model, HttpServletRequest request,
+            HttpServletResponse response) {
         List<Message> msgs = (List<Message>) model.get("messages");
         return msgs.stream().map(this::createRssItem).collect(Collectors.toList());
     }
diff --git a/src/main/java/com/juick/www/rss/RepliesView.java b/src/main/java/com/juick/www/rss/RepliesView.java
index 9cb98c94..83c8e104 100644
--- a/src/main/java/com/juick/www/rss/RepliesView.java
+++ b/src/main/java/com/juick/www/rss/RepliesView.java
@@ -30,15 +30,17 @@ import com.rometools.rome.feed.rss.Channel;
 import com.rometools.rome.feed.rss.Description;
 import com.rometools.rome.feed.rss.Guid;
 import com.rometools.rome.feed.rss.Item;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.view.feed.AbstractRssFeedView;
 
 import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
@@ -59,9 +61,9 @@ public class RepliesView extends AbstractRssFeedView {
 
     @SuppressWarnings("unchecked")
     @Override
-    protected @Nonnull List<Item> buildFeedItems(@Nonnull Map<String, Object> model,
-                                        @Nonnull HttpServletRequest request,
-                                        @Nonnull HttpServletResponse response) {
+    protected @Nonnull List<Item> buildFeedItems(Map<String, Object> model,
+                                        HttpServletRequest request,
+                                        HttpServletResponse response) {
         List<ResponseReply> msgs = (List<ResponseReply>)model.get("messages");
         return msgs.stream().map(this::createRssItem).collect(Collectors.toList());
     }