Working RSS spring-webmvc servlet, ugnich-rss generator moved to tests

6 files changed, 73 insertions, 250 deletions

diff --git a/juick-rss/src/main/java/com/juick/rss/Main.java b/juick-rss/src/main/java/com/juick/rss/Main.java
deleted file mode 100644
index 8d247465..00000000
--- a/juick-rss/src/main/java/com/juick/rss/Main.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2013, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.rss;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.server.MessagesQueries;
-import com.juick.server.UserQueries;
-import com.juick.util.DateFormattersHolder;
-import com.juick.util.MessageUtils;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author ugnich
- */
-@WebServlet(name = "Main", urlPatterns = {"/"})
-public class Main extends HttpServlet {
-
-    JdbcTemplate sql;
-
-    @Override
-    public void init() throws ServletException {
-        super.init();
-        try {
-            Properties conf = new Properties();
-            conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
-            BasicDataSource dataSource = new BasicDataSource();
-            dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
-            dataSource.setUrl(conf.getProperty("datasource_url"));
-            sql = new JdbcTemplate(dataSource);
-
-        } catch (Exception e) {
-            log(null, e);
-        }
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        if (request.getCharacterEncoding() == null) {
-            request.setCharacterEncoding("UTF-8");
-        }
-
-        String uri = request.getRequestURI();
-        if (uri.equals("/")) {
-            int hours = NumberUtils.toInt(request.getParameter("hours"), 0);
-            if (hours > 0 && hours < 13) {
-                List<Integer> mids = getLastMessages(hours);
-                List<Message> msgs = MessagesQueries.getMessages(sql, mids);
-                responseMessages(response, 0, null, msgs);
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else if (uri.equals("/comments")) {
-            int hours = NumberUtils.toInt(request.getParameter("hours"), 0);
-            if (hours > 0 && hours < 13) {
-                responseReplies(response, hours);
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else if (uri.matches("^/[a-zA-Z0-9\\-]{2,16}/blog$")) {
-            String uname = uri.substring(1, uri.length() - 5);
-            int uid = UserQueries.getUIDbyName(sql, uname);
-            if (uid > 0) {
-                List<Integer> mids = MessagesQueries.getUserBlog(sql, uid, 0, 0);
-                if (!mids.isEmpty()) {
-                    List<Message> msgs = MessagesQueries.getMessages(sql, mids);
-                    responseMessages(response, uid, uname, msgs);
-                } else {
-                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
-                }
-            } else {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND);
-            }
-        } else {
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
-        }
-    }
-
-    private void responseMessages(HttpServletResponse response, int uid, String uname, List<Message> msgs) throws IOException {
-        response.setContentType("application/rss+xml; charset=UTF-8");
-
-        try (PrintWriter out = response.getWriter()) {
-            out.println("<?xml version='1.0' encoding='utf-8'?>");
-            out.println("<rss version='2.0' xmlns:atom='http://www.w3.org/2005/Atom' xmlns:slash='http://purl.org/rss/1.0/modules/slash/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:media='http://search.yahoo.com/mrss/'  xmlns:juick='http://juick.com/'>");
-            out.println("<channel>");
-            if (uid > 0) {
-                out.println("<atom:link href='http://rss.juick.com/" + uname + "/blog' rel='self' type='application/rss+xml'/>");
-                out.println("<title>" + uname + " - Juick</title>");
-                out.println("<link>http://juick.com/" + uname + "/</link>");
-                out.println("<description>The latest messages by @" + uname + " at Juick</description>");
-                out.println("<image><url>http://i.juick.com/a/" + uid + ".png</url><title>" + uname + " - Juick</title><link>http://juick.com/" + uname + "/</link></image>");
-            } else {
-                out.println("<title>Juick</title>");
-                out.println("<link>http://juick.com/</link>");
-                out.println("<description>The latest messages at Juick</description>");
-            }
-
-            for (Message msg : msgs) {
-                out.println("<item>");
-                out.println("<link>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</link>");
-                out.println("<guid>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</guid>");
-
-                out.print("<title><![CDATA[@" + msg.getUser().getName() + ":");
-                if (!msg.getTags().isEmpty()) {
-                    for (Tag tag : msg.getTags()) {
-                        out.print(" *" + tag);
-                    }
-                }
-                out.println("]]></title>");
-                out.println("<description><![CDATA[" + MessageUtils.formatMessage(msg.getText()) + "]]></description>");
-
-                out.println("<pubDate>" + DateFormattersHolder.getRssFormatterInstance().format(msg.getDate()) + "</pubDate>");
-
-                out.println("<comments>http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "</comments>");
-                if (!msg.getTags().isEmpty()) {
-                    for (Tag tag : msg.getTags()) {
-                        out.println("<category>" + StringEscapeUtils.escapeHtml4(tag.getName()) + "</category>");
-                    }
-                }
-                if (msg.getAttachmentType() != null) {
-                    if (msg.getAttachmentType().equals("jpg")) {
-                        out.println("<media:content url='http://i.juick.com/photos-1024/" + msg.getMid() + ".jpg' type='image/jpeg'/>");
-                        out.println("<media:thumbnail url='http://i.juick.com/ps/" + msg.getMid() + ".jpg'/>");
-                    } else if (msg.getAttachmentType().equals("png")) {
-                        out.println("<media:content url='http://i.juick.com/photos-1024/" + msg.getMid() + ".png' type='image/png'/>");
-                        out.println("<media:thumbnail url='http://i.juick.com/ps/" + msg.getMid() + ".png'/>");
-                    }
-                }
-                out.println("<juick:user uid='" + msg.getUser().getUid() + "'/>");
-                out.println("</item>");
-            }
-
-            out.println("</channel></rss>");
-        }
-    }
-
-    private class ResponseReply {
-        String muname;
-        int mid;
-        int rid;
-        String uname;
-        String description;
-        Date pubDate;
-        String attachmentType;
-    }
-
-    private void responseReplies(HttpServletResponse response, int hours) throws IOException {
-        response.setContentType("application/rss+xml; charset=UTF-8");
-
-        try (PrintWriter out = response.getWriter()) {
-
-            out.println("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-            out.println("<rss version=\"2.0\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:ya=\"http://blogs.yandex.ru/yarss/\" xmlns:media=\"http://search.yahoo.com/mrss/\">");
-            out.println("<channel>");
-            out.println("<title>Juick</title>");
-            out.println("<link>http://juick.com/</link>");
-            out.println("<description>The latest comments at Juick</description>");
-
-            sql.query("SELECT users2.nick,replies.message_id,replies.reply_id," +
-                    "users.nick,replies.txt," +
-                    "replies.ts,replies.attach,replies.ts+0 " +
-                    "FROM ((replies INNER JOIN users ON replies.user_id=users.id) " +
-                    "INNER JOIN messages ON replies.message_id=messages.message_id) " +
-                    "INNER JOIN users AS users2 ON messages.user_id=users2.id " +
-                    "WHERE replies.ts>TIMESTAMPADD(HOUR,?,NOW()) AND messages.privacy>0", (rs, rowNum) -> {
-                ResponseReply reply = new ResponseReply();
-                reply.muname = rs.getString(1);
-                reply.mid = rs.getInt(2);
-                reply.rid = rs.getInt(3);
-                reply.uname = rs.getString(4);
-                reply.description = rs.getString(5);
-                reply.pubDate = rs.getTimestamp(6);
-                reply.attachmentType = rs.getString(7);
-                return reply;
-            }, -hours).forEach(r -> {
-                out.println("<item>");
-                out.println("<ya:post>http://juick.com/" + r.muname + "/" + r.mid + "</ya:post>");
-                out.println("<link>http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "</link>");
-                out.println("<guid>http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "</guid>");
-                out.println("<author>http://juick.com/" + r.uname + "/</author>");
-                out.println("<title>@" + r.uname + ":</title>");
-                out.println("<description><![CDATA[" + MessageUtils.formatMessage(r.description) + "]]></description>");
-                out.println("<pubDate>" + DateFormattersHolder.getRssFormatterInstance().format(r.pubDate) + "</pubDate>");
-                String attachment = r.attachmentType;
-                if (attachment != null && !attachment.isEmpty()) {
-                    if (attachment.equals("jpg")) {
-                        out.println("<media:content url='http://i.juick.com/photos-1024/" + r.mid + "-" + r.rid + ".jpg' type='image/jpeg'/>");
-                        out.println("<media:thumbnail url='http://i.juick.com/ps/" + r.mid + "-" + r.rid + ".jpg'/>");
-                    } else if (attachment.equals("png")) {
-                        out.println("<media:content url='http://i.juick.com/photos-1024/" + r.mid + "-" + r.rid + ".png' type='image/png'/>");
-                        out.println("<media:thumbnail url='http://i.juick.com/ps/" + r.mid + "-" + r.rid + ".png'/>");
-                    }
-                }
-                out.println("</item>");
-            });
-            out.println("</channel></rss>");
-        }
-    }
-
-    private List<Integer> getLastMessages(int hours) {
-        return sql.queryForList("SELECT message_id FROM messages WHERE messages.ts>TIMESTAMPADD(HOUR,?,NOW())",
-                Integer.class, -hours);
-    }
-}
diff --git a/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java b/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
index f975d87b..ef65e9ef 100644
--- a/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
+++ b/juick-rss/src/main/java/com/juick/rss/configuration/RssMvcConfiguration.java
@@ -2,10 +2,12 @@ package com.juick.rss.configuration;
 
 import com.juick.rss.MessagesView;
 import com.juick.rss.RepliesView;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.view.BeanNameViewResolver;
+import org.springframework.web.servlet.view.feed.AbstractRssFeedView;
 
 /**
  * Created by vitalyster on 28.06.2016.
@@ -13,8 +15,16 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp
 @Configuration
 @ComponentScan(basePackages = {"com.juick.rss.controllers"})
 public class RssMvcConfiguration extends WebMvcConfigurationSupport {
-    @Override
-    protected void configureViewResolvers(ViewResolverRegistry registry) {
-        registry.enableContentNegotiation(new MessagesView(), new RepliesView());
+    @Bean
+    public BeanNameViewResolver beanNameViewResolver() {
+        return new BeanNameViewResolver();
+    }
+    @Bean
+    AbstractRssFeedView messages() {
+        return new MessagesView();
+    }
+    @Bean
+    AbstractRssFeedView replies() {
+        return new RepliesView();
     }
 }
diff --git a/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java b/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java
index 9c3dc787..f2616f73 100644
--- a/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java
+++ b/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java
@@ -31,6 +31,7 @@ public class FeedsController {
         if (user.getUid() > 0) {
             List<Integer> mids = messagesService.getUserBlog(user.getUid(), 0, 0);
             ModelAndView modelAndView = new ModelAndView();
+            modelAndView.setViewName("messages");
             modelAndView.addObject("user", user);
             modelAndView.addObject("messages", messagesService.getMessages(mids));
             return modelAndView;
@@ -42,12 +43,14 @@ public class FeedsController {
     public ModelAndView getLast(@RequestParam(value = "hours", required = false, defaultValue = "0") Integer hours) {
         List<Integer> mids = messagesService.getLastMessages(hours);
         ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("messages");
         modelAndView.addObject("messages", messagesService.getMessages(mids));
         return modelAndView;
     }
     @RequestMapping(value = "/comments", method = RequestMethod.GET)
     public ModelAndView getLastReplies(@RequestParam(value = "hours", required = false, defaultValue = "0") Integer hours) {
         ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("replies");
         modelAndView.addObject("messages", messagesService.getLastReplies(hours));
         return modelAndView;
     }
diff --git a/juick-rss/src/main/java/com/juick/rss/extension/JuickModuleGenerator.java b/juick-rss/src/main/java/com/juick/rss/extension/JuickModuleGenerator.java
new file mode 100644
index 00000000..caecde7e
--- /dev/null
+++ b/juick-rss/src/main/java/com/juick/rss/extension/JuickModuleGenerator.java
@@ -0,0 +1,53 @@
+package com.juick.rss.extension;
+
+import com.rometools.rome.feed.module.Module;
+import com.rometools.rome.io.ModuleGenerator;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Created by vt on 13/12/2016.
+ */
+public class JuickModuleGenerator implements ModuleGenerator {
+
+    private static final Namespace JUICK_NS  = Namespace.getNamespace("juick", JuickModule.URI);
+
+    @Override
+    public String getNamespaceUri() {
+        return JuickModule.URI;
+    }
+
+    private static final Set NAMESPACES;
+
+    static {
+        Set nss = new HashSet();
+        nss.add(JUICK_NS);
+        NAMESPACES = Collections.unmodifiableSet(nss);
+    }
+
+    @Override
+    public Set getNamespaces() {
+        return NAMESPACES;
+    }
+
+    @Override
+    public void generate(Module module, Element element) {
+        // this is not necessary, it is done to avoid the namespace definition in every item.
+        Element root = element;
+        while (root.getParent()!=null && root.getParent() instanceof Element) {
+            root = (Element) element.getParent();
+        }
+        root.addNamespaceDeclaration(JUICK_NS);
+
+        JuickModule juickModule = (JuickModule) module;
+        if (juickModule.getUid() > 0) {
+            Element user = new Element("user", JUICK_NS);
+            user.setAttribute("uid", String.valueOf(juickModule.getUid()), JUICK_NS);
+            element.addContent(user);
+        }
+    }
+}
diff --git a/juick-rss/src/main/resources/rome.properties b/juick-rss/src/main/resources/rome.properties
new file mode 100644
index 00000000..e57f6391
--- /dev/null
+++ b/juick-rss/src/main/resources/rome.properties
@@ -0,0 +1,2 @@
+rss_2.0.item.ModuleParser.classes=com.juick.rss.extension.JuickModuleParser
+rss_2.0.item.ModuleGenerator.classes=com.juick.rss.extension.JuickModuleGenerator
\ No newline at end of file
diff --git a/juick-rss/src/main/webapp/WEB-INF/web.xml b/juick-rss/src/main/webapp/WEB-INF/web.xml
index a4264bb0..7e1c30d0 100644
--- a/juick-rss/src/main/webapp/WEB-INF/web.xml
+++ b/juick-rss/src/main/webapp/WEB-INF/web.xml
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-    <servlet>
-        <servlet-name>Main</servlet-name>
-        <servlet-class>com.juick.rss.Main</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Main</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
+
 </web-app>