aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-01-13 14:42:45 +0300
committerGravatar Vitaly Takmazov2017-01-13 15:00:32 +0300
commit36f0bb5b96e2b0200150b41214cd3e49d41a38c2 (patch)
treedddc302d6f1e1c2055655ffab318ed2ea6e24637
parentf58ed0ce6194a1672234540dfdeeef43239d7bfc (diff)
juick-www: fix rss controller
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/RSS.java7
-rw-r--r--juick-www/src/main/webapp/WEB-INF/layouts/rss.html (renamed from juick-www/src/main/webapp/WEB-INF/layouts/rss.xml)0
2 files changed, 5 insertions, 2 deletions
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";
}
}
diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/rss.xml b/juick-www/src/main/webapp/WEB-INF/layouts/rss.html
index 23866c8a..23866c8a 100644
--- a/juick-www/src/main/webapp/WEB-INF/layouts/rss.xml
+++ b/juick-www/src/main/webapp/WEB-INF/layouts/rss.html