aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/www/rss
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/juick/www/rss')
-rw-r--r--src/main/java/com/juick/www/rss/Feeds.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/juick/www/rss/Feeds.java b/src/main/java/com/juick/www/rss/Feeds.java
index 4423b263..8111f2df 100644
--- a/src/main/java/com/juick/www/rss/Feeds.java
+++ b/src/main/java/com/juick/www/rss/Feeds.java
@@ -22,7 +22,12 @@ import com.juick.util.HttpNotFoundException;
import com.juick.service.MessagesService;
import com.juick.service.UserService;
import com.juick.service.security.annotation.Visitor;
+
+import org.springframework.core.convert.ConversionFailedException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
@@ -79,4 +84,9 @@ public class Feeds {
modelAndView.addObject("messages", messagesService.getLastReplies(hours));
return modelAndView;
}
+ // wrong feed type
+ @ExceptionHandler(ConversionFailedException.class)
+ public ResponseEntity<String> notFoundAction() {
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
}