From 36f0bb5b96e2b0200150b41214cd3e49d41a38c2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 13 Jan 2017 14:42:45 +0300
Subject: juick-www: fix rss controller

---
 juick-www/src/main/java/com/juick/www/controllers/RSS.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/controllers')

diff --git a/juick-www/src/main/java/com/juick/www/controllers/RSS.java b/juick-www/src/main/java/com/juick/www/controllers/RSS.java
index 79fd8e67..b48ae2d0 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/RSS.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/RSS.java
@@ -23,12 +23,14 @@ import com.juick.service.MessagesService;
 import com.juick.service.UserService;
 import com.juick.util.DateFormattersHolder;
 import com.juick.util.MessageUtils;
+import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletResponse;
@@ -45,7 +47,8 @@ public class RSS {
     @Inject
     MessagesService messagesService;
 
-    @RequestMapping(value = "/rss/{uname}", method = RequestMethod.GET)
+    @RequestMapping(value = "/rss/{uname}", method = RequestMethod.GET, produces = MediaType.APPLICATION_ATOM_XML_VALUE)
+    @ResponseBody
     protected String doGet(JdbcTemplate sql, HttpServletResponse response,
                          @PathVariable String uname, ModelMap model) {
         int uid = userService.getUIDbyName(uname);
@@ -61,6 +64,6 @@ public class RSS {
         model.addAttribute("user", msgs.stream().findFirst().get().getUser());
         model.addAttribute("msgs", msgs);
         model.addAttribute("sdfRSS", DateFormattersHolder.getRssFormatterInstance());
-        return "webapp/WEB-INF/layouts/rss";
+        return "layouts/rss";
     }
 }
-- 
cgit v1.2.3