From be18339f67341c02a071eddde94d230384a40a41 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 30 Jun 2016 13:50:47 +0300 Subject: update deps and apply changes --- .gitignore | 5 +- build.gradle | 14 +-- deps/com.juick | 2 +- deps/com.juick.server | 2 +- src/main/java/com/juick/rss/Main.java | 211 +++++++++++++-------------------- src/main/java/com/juick/rss/Utils.java | 38 ------ 6 files changed, 94 insertions(+), 178 deletions(-) diff --git a/.gitignore b/.gitignore index 48cc0990..e1a83f99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/nbproject/private/ -/dist/ /build/ .gradle/* -deps/* \ No newline at end of file +deps/* +.idea/** \ No newline at end of file diff --git a/build.gradle b/build.gradle index ec4bede2..f936bc12 100644 --- a/build.gradle +++ b/build.gradle @@ -8,16 +8,15 @@ subprojects { buildscript { repositories { mavenCentral() - jcenter() } dependencies { - classpath 'com.bmuschko:gradle-tomcat-plugin:2.2.+' + classpath 'org.akhikhl.gretty:gretty:+' } } apply plugin: 'java' apply plugin: 'war' -apply plugin: 'com.bmuschko.tomcat' +apply plugin: 'org.akhikhl.gretty' repositories { mavenCentral() @@ -36,17 +35,14 @@ dependencies { compile core compile server providedCompile 'javax.servlet:javax.servlet-api:3.1.0' - def tomcatVersion = '7.0.+' - tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", - "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}", - "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" testCompile 'junit:junit:4.12' - runtime 'mysql:mysql-connector-java:5.1.37' + runtime 'mysql:mysql-connector-java:5.1.39' } compileJava.options.encoding = 'UTF-8' -tomcat { +gretty { httpPort = 8080 contextPath = '/' + servletContainer = 'tomcat8' } diff --git a/deps/com.juick b/deps/com.juick index 5f08b8b1..39ec74ab 160000 --- a/deps/com.juick +++ b/deps/com.juick @@ -1 +1 @@ -Subproject commit 5f08b8b1cfaacf1e78c56e7752277533eb84b02e +Subproject commit 39ec74abe77cdab5aa8f50c2524e6f71c2dbbd01 diff --git a/deps/com.juick.server b/deps/com.juick.server index 23666546..79794224 160000 --- a/deps/com.juick.server +++ b/deps/com.juick.server @@ -1 +1 @@ -Subproject commit 23666546ca2c0f1ee492b1bea8c0ea83c8c04a2b +Subproject commit 797942249b0d5e38285e806bc0e73e755e6ffede diff --git a/src/main/java/com/juick/rss/Main.java b/src/main/java/com/juick/rss/Main.java index 936c891d..32e7ebae 100644 --- a/src/main/java/com/juick/rss/Main.java +++ b/src/main/java/com/juick/rss/Main.java @@ -20,66 +20,48 @@ package com.juick.rss; import com.juick.Message; import com.juick.server.MessagesQueries; import com.juick.server.UserQueries; -import java.io.FileInputStream; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DriverManagerDataSource; + +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.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; +import java.util.List; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** - * * @author ugnich */ @WebServlet(name = "Main", urlPatterns = {"/"}) public class Main extends HttpServlet { - private static final SimpleDateFormat sdfSQL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private static final SimpleDateFormat sdfRSS = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); - Connection sql; + JdbcTemplate sql; @Override public void init() throws ServletException { super.init(); try { Properties conf = new Properties(); - conf.load(new FileInputStream("/etc/juick/rss.conf")); - - Class.forName("com.mysql.jdbc.Driver"); - sql = DriverManager.getConnection("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + conf.getProperty("mysql_username", "") + "&password=" + conf.getProperty("mysql_password", "")); + conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf")); + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + 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 - public void destroy() { - super.destroy(); - if (sql != null) { - try { - sql.close(); - sql = null; - } catch (SQLException e) { - log(null, e); - } - } - } - @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (request.getCharacterEncoding() == null) { @@ -90,8 +72,8 @@ public class Main extends HttpServlet { if (uri.equals("/")) { int hours = Utils.parseInt(request.getParameter("hours"), 0); if (hours > 0 && hours < 13) { - ArrayList mids = getLastMessages(hours); - ArrayList msgs = MessagesQueries.getMessages(sql, mids); + List mids = getLastMessages(hours); + List msgs = MessagesQueries.getMessages(sql, mids); responseMessages(response, 0, null, msgs); } else { response.sendError(404); @@ -107,9 +89,9 @@ public class Main extends HttpServlet { String uname = uri.substring(1, uri.length() - 5); int uid = UserQueries.getUIDbyName(sql, uname); if (uid > 0) { - ArrayList mids = MessagesQueries.getUserBlog(sql, uid, 0, 0); + List mids = MessagesQueries.getUserBlog(sql, uid, 0, 0); if (!mids.isEmpty()) { - ArrayList msgs = MessagesQueries.getMessages(sql, mids); + List msgs = MessagesQueries.getMessages(sql, mids); responseMessages(response, uid, uname, msgs); } else { response.sendError(404); @@ -122,11 +104,10 @@ public class Main extends HttpServlet { } } - private void responseMessages(HttpServletResponse response, int uid, String uname, ArrayList msgs) throws IOException { + private void responseMessages(HttpServletResponse response, int uid, String uname, List msgs) throws IOException { response.setContentType("application/rss+xml; charset=UTF-8"); - PrintWriter out = response.getWriter(); - try { + try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); @@ -142,33 +123,23 @@ public class Main extends HttpServlet { out.println("The latest messages at Juick"); } - Iterator i = msgs.iterator(); - while (i.hasNext()) { - Message msg = i.next(); - + for (Message msg : msgs) { out.println(""); - out.println("http://juick.com/" + msg.User.UName + "/" + msg.MID + ""); - out.println("http://juick.com/" + msg.User.UName + "/" + msg.MID + ""); + out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + ""); + out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + ""); - out.print("<![CDATA[@" + msg.User.UName + ":"); + out.print("<title><![CDATA[@" + msg.getUser().getUName() + ":"); if (!msg.Tags.isEmpty()) { for (int n = 0; n < msg.Tags.size(); n++) { out.print(" *" + msg.Tags.get(n)); } } out.println("]]>"); - out.println(""); - - synchronized (sdfSQL) { - try { - Date date = sdfSQL.parse(msg.TimestampString); - out.println("" + sdfRSS.format(date) + ""); - } catch (Exception e) { - System.err.println("PARSE EXCEPTION: " + msg.TimestampString); - } - } + out.println(""); + + out.println("" + sdfRSS.format(msg.getDate()) + ""); - out.println("http://juick.com/" + msg.User.UName + "/" + msg.MID + ""); + out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + ""); if (!msg.Tags.isEmpty()) { for (int n = 0; n < msg.Tags.size(); n++) { out.println("" + escapeHtml(msg.Tags.get(n)) + ""); @@ -176,28 +147,35 @@ public class Main extends HttpServlet { } if (msg.AttachmentType != null) { if (msg.AttachmentType.equals("jpg")) { - out.println(""); - out.println(""); + out.println(""); + out.println(""); } else if (msg.AttachmentType.equals("png")) { - out.println(""); - out.println(""); + out.println(""); + out.println(""); } } - out.println(""); + out.println(""); out.println(""); } out.println(""); - } finally { - out.close(); } } + 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"); - PrintWriter out = response.getWriter(); - try { + try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); @@ -206,75 +184,56 @@ public class Main extends HttpServlet { out.println("http://juick.com/"); out.println("The latest comments at Juick"); - PreparedStatement stmt = null; - ResultSet rs = null; - try { - stmt = sql.prepareStatement("SELECT users2.nick,replies.message_id,replies.reply_id,users.nick,replies.txt,DATE_FORMAT(replies.ts,'%a, %d %b %Y %T UT'),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"); - stmt.setInt(1, -hours); - rs = stmt.executeQuery(); - rs.beforeFirst(); - while (rs.next()) { - String muname = rs.getString(1); - int mid = rs.getInt(2); - int rid = rs.getInt(3); - String uname = rs.getString(4); - - out.println(""); - out.println("http://juick.com/" + muname + "/" + mid + ""); - out.println("http://juick.com/" + muname + "/" + mid + "#" + rid + ""); - out.println("http://juick.com/" + muname + "/" + mid + "#" + rid + ""); - out.println("http://juick.com/" + uname + "/"); - out.println("@" + uname + ":"); - out.println(""); - out.println("" + rs.getString(6) + ""); - String attachment = rs.getString(7); - if (attachment != null && !attachment.isEmpty()) { - if (attachment.equals("jpg")) { - out.println(""); - out.println(""); - } else if (attachment.equals("png")) { - out.println(""); - out.println(""); - } + 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).stream().forEach(r -> { + out.println(""); + out.println("http://juick.com/" + r.muname + "/" + r.mid + ""); + out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + ""); + out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + ""); + out.println("http://juick.com/" + r.uname + "/"); + out.println("@" + r.uname + ":"); + out.println(""); + out.println("" + sdfRSS.format(r.pubDate) + ""); + String attachment = r.attachmentType; + if (attachment != null && !attachment.isEmpty()) { + if (attachment.equals("jpg")) { + out.println(""); + out.println(""); + } else if (attachment.equals("png")) { + out.println(""); + out.println(""); } - out.println(""); } - } catch (SQLException e) { - System.err.println(e); - } finally { - Utils.finishSQL(rs, stmt); - } - + out.println(""); + }); out.println(""); - } finally { - out.close(); } } - private ArrayList getLastMessages(int hours) { - ArrayList mids = new ArrayList(20); - - PreparedStatement stmt = null; - ResultSet rs = null; - try { - stmt = sql.prepareStatement("SELECT message_id FROM messages WHERE messages.ts>TIMESTAMPADD(HOUR,?,NOW())"); - stmt.setInt(1, -hours); - rs = stmt.executeQuery(); - rs.beforeFirst(); - while (rs.next()) { - mids.add(rs.getInt(1)); - } - } catch (SQLException e) { - System.err.println(e); - } finally { - Utils.finishSQL(rs, stmt); - } - return mids; + private List getLastMessages(int hours) { + return sql.queryForList("SELECT message_id FROM messages WHERE messages.ts>TIMESTAMPADD(HOUR,?,NOW())", + Integer.class, -hours); } + private static Pattern regexLinks2 = Pattern.compile("((?<=\\s)|(?<=\\A))([\\[\\{]|<)((?:ht|f)tps?://(?:www\\.)?([^\\/\\s\\\"\\)\\!]+)/?(?:[^\\]\\}](?", ">"); + return input.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">"); } public static String formatMessage(String msg) { diff --git a/src/main/java/com/juick/rss/Utils.java b/src/main/java/com/juick/rss/Utils.java index a6842fe1..036a5a6b 100644 --- a/src/main/java/com/juick/rss/Utils.java +++ b/src/main/java/com/juick/rss/Utils.java @@ -17,50 +17,12 @@ */ package com.juick.rss; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; - /** * * @author ugnich */ public class Utils { - public static void finishSQL(ResultSet rs, Statement stmt) { - if (rs != null) { - try { - rs.close(); - } catch (SQLException e) { - } - } - if (stmt != null) { - try { - stmt.close(); - } catch (SQLException e) { - } - } - } - - public static String convertArray2String(ArrayList mids) { - String q = ""; - for (int i = 0; i < mids.size(); i++) { - if (i > 0) { - q += ","; - } - q += mids.get(i); - } - return q; - } - - public static String encodeHTML(String str) { - String ret = str; - ret = ret.replaceAll("<", "<"); - ret = ret.replaceAll(">", ">"); - return str; - } - public static int parseInt(String str, int def) { int ret = def; if (str != null) { -- cgit v1.2.3