repository improvenments: using Collection in params, forse using exists in some query, force using Lists as query result

1 files changed, 435 insertions, 491 deletions

diff --git a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
index bb030ed4..6fc71ac3 100644
--- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -5,24 +5,24 @@ import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.helpers.PrivacyOpts;
 import com.juick.util.MessageUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.dao.EmptyResultDataAccessException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.ConnectionCallback;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 import javax.inject.Inject;
 import java.sql.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by aalexeev on 11/13/16.
@@ -77,85 +77,92 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
         }
     }
 
+    /**
+     * @param uid
+     * @param txt
+     * @param attachment
+     * @param tags
+     * @return
+     * @see <a href="https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-type-conversions.html">Java, JDBC and MySQL Types</a>
+     */
     @Transactional
     @Override
-    public int createMessage(final int uid, final String txt, final String attachment, final List<com.juick.Tag> tags) {
+    public int createMessage(final int uid, final String txt, final String attachment, final Collection<com.juick.Tag> tags) {
         KeyHolder holder = new GeneratedKeyHolder();
-        getJdbcTemplate().update(con -> {
-            PreparedStatement stmt = con.prepareStatement(
-                    "INSERT INTO messages(user_id,attach) VALUES (?,?)",
-                    Statement.RETURN_GENERATED_KEYS);
-            stmt.setInt(1, uid);
-            if (attachment != null) {
-                stmt.setString(2, attachment);
-            } else {
-                stmt.setNull(2, Types.VARCHAR);
-            }
-            return stmt;
-        }, holder);
+        getJdbcTemplate().update(
+                con -> {
+                    PreparedStatement stmt = con.prepareStatement(
+                            "INSERT INTO messages(user_id, attach) VALUES (?, ?)",
+                            Statement.RETURN_GENERATED_KEYS);
+                    stmt.setInt(1, uid);
+                    if (attachment != null)
+                        stmt.setString(2, attachment);
+                    else
+                        stmt.setNull(2, Types.CHAR);
+
+                    return stmt;
+                },
+                holder);
 
         int mid = holder.getKey().intValue();
 
         if (mid > 0) {
             String tagsNames = "";
-            String tagsIDs = "";
 
-            for (int i = 0; i < tags.size(); i++) {
-                if (i > 0) {
-                    tagsNames += " ";
-                    tagsIDs += ",";
+            if (CollectionUtils.isNotEmpty(tags)) {
+                StringBuilder tasNamesBuilder = new StringBuilder();
+                List<Object[]> params = new ArrayList<>(tags.size());
+
+                boolean next = false;
+
+                for (Tag tag : tags) {
+                    if (next) {
+                        tasNamesBuilder.append(" ");
+                    } else
+                        next = true;
+
+                    tasNamesBuilder.append(tag.getName());
+                    params.add(new Object[]{mid, tag.TID});
                 }
-                tagsNames += tags.get(i).getName();
-                tagsIDs += "(" + mid + "," + tags.get(i).TID + ")";
-            }
-            if (tags.size() > 0) {
-                getJdbcTemplate().execute(
-                        "INSERT INTO messages_tags(message_id,tag_id) VALUES " + tagsIDs);
+
+                tagsNames = tasNamesBuilder.toString();
+
+                getJdbcTemplate().batchUpdate(
+                        "INSERT INTO messages_tags(message_id, tag_id) VALUES (?, ?)",
+                        params, new int[]{Types.INTEGER, Types.INTEGER});
             }
-            final String finalTagsNames = tagsNames;
-            getJdbcTemplate().update(con -> {
-                PreparedStatement stmt = con.prepareStatement(
-                        "INSERT INTO messages_txt(message_id,tags,txt) " +
-                                "VALUES (?,?,?)", Statement.NO_GENERATED_KEYS);
-                stmt.setInt(1, mid);
-                if (finalTagsNames.isEmpty()) {
-                    stmt.setNull(2, Types.VARCHAR);
-                } else {
-                    stmt.setString(2, finalTagsNames);
-                }
-                stmt.setString(3, txt);
-                return stmt;
-            });
+
+            getJdbcTemplate().update(
+                    "INSERT INTO messages_txt(message_id, tags, txt) VALUES (?, ?, ?)",
+                    new Object[]{mid, tagsNames, txt},
+                    new int[]{Types.INTEGER, Types.VARCHAR, Types.VARCHAR});
         }
 
         return mid;
     }
 
+    /**
+     * @param mid
+     * @param rid
+     * @param uid
+     * @param txt
+     * @param attachment
+     * @return
+     * @see <a href="https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-type-conversions.html">Java, JDBC and MySQL Types</a>
+     */
     @Transactional
     @Override
     public int createReply(final int mid, final int rid, final int uid, final String txt, final String attachment) {
         int ridnew = getReplyIDIncrement(mid);
 
-        getJdbcTemplate().update(con -> {
-            PreparedStatement stmt = con.prepareStatement(
-                    "INSERT INTO replies(message_id,reply_id,user_id,replyto,attach,txt) VALUES (?,?,?,?,?,?)",
-                    Statement.NO_GENERATED_KEYS);
-            stmt.setInt(1, mid);
-            stmt.setInt(2, ridnew);
-            stmt.setInt(3, uid);
-            stmt.setInt(4, rid);
-            if (attachment != null) {
-                stmt.setString(5, attachment);
-            } else {
-                stmt.setNull(5, Types.VARCHAR);
-            }
-            stmt.setString(6, txt);
-            return stmt;
-        });
+        getJdbcTemplate().update(
+                "INSERT INTO replies(message_id, reply_id, user_id, replyto, attach, txt) VALUES (?, ?, ?, ?, ?, ?)",
+                new Object[]{mid, ridnew, uid, rid, attachment, txt},
+                new int[]{Types.INTEGER, Types.SMALLINT, Types.INTEGER, Types.SMALLINT, Types.CHAR, Types.VARCHAR});
 
         if (ridnew > 0)
             getJdbcTemplate().update(
-                    "UPDATE messages SET replies=replies+1 WHERE message_id=?",
+                    "UPDATE messages SET replies = replies + 1 WHERE message_id = ?",
                     mid);
 
         return ridnew;
@@ -196,10 +203,12 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Override
     public boolean recommendMessage(final int mid, final int vuid) {
         boolean res = getJdbcTemplate().update(
-                "INSERT IGNORE INTO favorites(user_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
+                "INSERT IGNORE INTO favorites(user_id, message_id) VALUES (?, ?)",
+                vuid, mid) == 1;
+
         if (res) {
             getJdbcTemplate().update(
-                    "UPDATE messages SET likes=likes+1 WHERE message_id=?",
+                    "UPDATE messages SET likes = likes + 1 WHERE message_id = ?",
                     mid);
         }
         return res;
@@ -208,140 +217,138 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Transactional(readOnly = true)
     @Override
     public boolean canViewThread(final int mid, final int uid) {
-        PrivacyOpts privacyOpts;
-        try {
-            privacyOpts = getJdbcTemplate().queryForObject(
-                    "SELECT user_id,privacy FROM messages WHERE messages.message_id=?",
-                    (rs, rowNum) -> {
-                        PrivacyOpts res = new PrivacyOpts();
-                        res.setUid(rs.getInt(1));
-                        res.setPrivacy(rs.getInt(2));
-                        return res;
-                    }, mid);
-        } catch (EmptyResultDataAccessException e) {
-            return true;
-        }
-        return privacyOpts.getPrivacy() >= 0
-                || uid == privacyOpts.getUid()
-                || ((privacyOpts.getPrivacy() == -1 || privacyOpts.getPrivacy() == -2) && uid > 0
-                && userService.isInWL(privacyOpts.getUid(), uid));
+        List<PrivacyOpts> list = getJdbcTemplate().query(
+                "SELECT user_id, privacy FROM messages WHERE message_id = ?",
+                (rs, rowNum) -> {
+                    PrivacyOpts res = new PrivacyOpts();
+
+                    res.setUid(rs.getInt(1));
+                    res.setPrivacy(rs.getInt(2));
+
+                    return res;
+                },
+                mid);
+
+        PrivacyOpts privacyOpts = list.isEmpty() ?
+                null : list.get(0);
+
+        return privacyOpts == null ||
+                privacyOpts.getPrivacy() >= 0 ||
+                uid == privacyOpts.getUid() ||
+                ((privacyOpts.getPrivacy() == -1 || privacyOpts.getPrivacy() == -2) &&
+                        uid > 0 && userService.isInWL(privacyOpts.getUid(), uid));
     }
 
     @Transactional(readOnly = true)
     @Override
     public boolean isReadOnly(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT readonly FROM messages WHERE message_id=?",
-                    new Object[]{mid},
-                    Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
+        List<Integer> list = getJdbcTemplate().queryForList(
+                "SELECT readonly FROM messages WHERE message_id = ?",
+                new Object[]{mid},
+                Integer.class);
+
+        return !list.isEmpty() || list.get(0) == 1;
     }
 
     @Transactional(readOnly = true)
     @Override
     public boolean isSubscribed(final int uid, final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT 1 FROM subscr_messages WHERE suser_id=? AND message_id=?",
-                    new Object[]{uid, mid},
-                    Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
+        List<Integer> list = getJdbcTemplate().queryForList(
+                "SELECT 1 FROM subscr_messages WHERE suser_id = ? AND message_id = ?",
+                new Object[]{uid, mid},
+                Integer.class);
+
+        return !list.isEmpty() || list.get(0) == 1;
     }
 
     @Transactional(readOnly = true)
     @Override
     public int getMessagePrivacy(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT privacy FROM messages WHERE message_id=?",
-                    new Object[]{mid},
-                    Integer.class);
-        } catch (EmptyResultDataAccessException e) {
-            return -4;
-        }
+        List<Integer> list = getJdbcTemplate().queryForList(
+                "SELECT privacy FROM messages WHERE message_id = ?",
+                new Object[]{mid},
+                Integer.class);
+
+        return list.isEmpty() ?
+                -4 : list.get(0);
     }
 
     @Transactional(readOnly = true)
     @Override
     public com.juick.Message getMessage(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                            + "messages.user_id,users.nick, 0 as banned, "
-                            + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
-                            + "messages.ts,"
-                            + "messages.readonly,messages.privacy,messages.replies,"
-                            + "messages.attach,messages.place_id,messages.lat,"
-                            + "messages.lon,messages.likes,messages.hidden,"
-                            + "txt.tags,txt.repliesby,txt.txt, '' as q FROM messages "
-                            + "INNER JOIN users ON messages.user_id=users.id "
-                            + "INNER JOIN messages_txt AS txt "
-                            + "ON messages.message_id=txt.message_id "
-                            + "WHERE messages.message_id=?",
-                    new MessageMapper(),
-                    mid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
+        List<com.juick.Message> list = getJdbcTemplate().query(
+                "SELECT messages.message_id, 0 as rid, 0 as replyto, "
+                        + "messages.user_id, users.nick, 0 as banned, "
+                        + "TIMESTAMPDIFF(MINUTE, messages.ts, NOW()),"
+                        + "messages.ts,"
+                        + "messages.readonly, messages.privacy, messages.replies,"
+                        + "messages.attach, messages.place_id, messages.lat,"
+                        + "messages.lon, messages.likes, messages.hidden,"
+                        + "txt.tags, txt.repliesby, txt.txt, '' as q FROM messages "
+                        + "INNER JOIN users ON messages.user_id = users.id "
+                        + "INNER JOIN messages_txt AS txt "
+                        + "ON messages.message_id = txt.message_id "
+                        + "WHERE messages.message_id = ?",
+                new MessageMapper(),
+                mid);
+
+        return list.isEmpty() ?
+                null : list.get(0);
     }
 
     @Transactional(readOnly = true)
     @Override
     public com.juick.Message getReply(final int mid, final int rid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT replies.user_id,users.nick,"
-                            + "replies.replyto,replies.ts,"
-                            + "replies.attach,replies.txt, IFNULL(q.txt,t.txt) as quote FROM replies INNER JOIN users "
-                            + "ON replies.user_id=users.id "
-                            + "LEFT JOIN replies q "
-                            + "ON replies.message_id=q.message_id and replies.replyto=q.reply_id "
-                            + "LEFT JOIN messages_txt t ON replies.message_id=t.message_id "
-                            + "WHERE replies.message_id=? AND replies.reply_id=?",
-                    (rs, num) -> {
-                        Message msg = new Message();
-                        msg.setMid(mid);
-                        msg.setRid(rid);
-                        msg.setUser(new User());
-                        msg.getUser().setUid(rs.getInt(1));
-                        msg.getUser().setName(rs.getString(2));
-                        msg.setReplyto(rs.getInt(3));
-                        msg.setDate(rs.getTimestamp(4));
-                        msg.AttachmentType = rs.getString(5);
-                        msg.setText(rs.getString(6));
-                        String quote = rs.getString(7);
-                        if (!StringUtils.isEmpty(quote)) {
-                            msg.setReplyQuote(MessageUtils.formatQuote(quote));
-                        }
-                        return msg;
-                    }, mid, rid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
+        List<com.juick.Message> list = getJdbcTemplate().query(
+                "SELECT replies.user_id, users.nick,"
+                        + "replies.replyto, replies.ts,"
+                        + "replies.attach, replies.txt, IFNULL(q.txt,t.txt) as quote "
+                        + "FROM replies INNER JOIN users ON replies.user_id = users.id "
+                        + "LEFT JOIN replies q ON replies.message_id = q.message_id and replies.replyto = q.reply_id "
+                        + "LEFT JOIN messages_txt t ON replies.message_id = t.message_id "
+                        + "WHERE replies.message_id = ? AND replies.reply_id = ?",
+                (rs, num) -> {
+                    Message msg = new Message();
+
+                    msg.setMid(mid);
+                    msg.setRid(rid);
+                    msg.setUser(new User());
+                    msg.getUser().setUid(rs.getInt(1));
+                    msg.getUser().setName(rs.getString(2));
+                    msg.setReplyto(rs.getInt(3));
+                    msg.setDate(rs.getTimestamp(4));
+                    msg.AttachmentType = rs.getString(5);
+                    msg.setText(rs.getString(6));
+                    String quote = rs.getString(7);
+
+                    if (!StringUtils.isEmpty(quote)) {
+                        msg.setReplyQuote(MessageUtils.formatQuote(quote));
+                    }
+
+                    return msg;
+                },
+                mid, rid);
+
+        return list.isEmpty() ?
+                null : list.get(0);
     }
 
     @Transactional(readOnly = true)
     @Override
     public User getMessageAuthor(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT messages.user_id,users.nick "
-                            + "FROM messages INNER JOIN users "
-                            + "ON messages.user_id=users.id WHERE messages.message_id=?",
-                    new Object[]{mid}, (rs, num) -> {
-                        User res = new com.juick.User();
-                        res.setUid(rs.getInt(1));
-                        res.setName(rs.getString(2));
-                        return res;
-                    });
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
+        List<User> list = getJdbcTemplate().query(
+                "SELECT messages.user_id, users.nick "
+                        + "FROM messages INNER JOIN users ON messages.user_id = users.id WHERE messages.message_id = ?",
+                new Object[]{mid},
+                (rs, num) -> {
+                    User res = new com.juick.User();
+                    res.setUid(rs.getInt(1));
+                    res.setName(rs.getString(2));
+                    return res;
+                });
+
+        return list.isEmpty() ?
+                null : list.get(0);
     }
 
     @Transactional(readOnly = true)
@@ -349,8 +356,9 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     public List<com.juick.Tag> getMessageTags(final int mid) {
         return getJdbcTemplate().query(
                 "SELECT tags.tag_id,synonym_id,name,stat_messages FROM tags " +
-                        "INNER JOIN messages_tags ON (messages_tags.message_id=? AND messages_tags.tag_id=tags.tag_id)",
-                new Object[]{mid}, (rs, num) -> {
+                        "INNER JOIN messages_tags ON (messages_tags.message_id = ? AND messages_tags.tag_id = tags.tag_id)",
+                new Object[]{mid},
+                (rs, num) -> {
                     com.juick.Tag t = new com.juick.Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
                     t.TID = rs.getInt(1);
                     t.SynonymID = rs.getInt(2);
@@ -363,7 +371,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Override
     public List<Integer> getMessageTagsIDs(final int mid) {
         return getJdbcTemplate().queryForList(
-                "SELECT tag_id FROM messages_tags WHERE message_id=?",
+                "SELECT tag_id FROM messages_tags WHERE message_id = ?",
                 new Object[]{mid},
                 Integer.class);
     }
@@ -373,155 +381,110 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     public List<String> getMessageRecommendations(final int mid) {
         return getJdbcTemplate().queryForList(
                 "SELECT users.nick FROM favorites INNER JOIN users " +
-                        "ON (favorites.message_id=? AND favorites.user_id=users.id)",
+                        "ON (favorites.message_id = ? AND favorites.user_id = users.id)",
                 new Object[]{mid},
                 String.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getAll(final int visitor_uid, final int before) {
-        if (visitor_uid > 1) {
-            if (before > 0) {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE message_id<? AND hidden=0" +
-                                " AND (privacy>0 OR user_id=?) AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before, visitor_uid, visitor_uid},
-                        Integer.class);
-            } else {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE hidden=0" +
-                                " AND (privacy>0 OR user_id=?)" +
-                                " AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{visitor_uid, visitor_uid},
-                        Integer.class);
-            }
-        } else {
-            if (before > 0) {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE message_id<?" +
-                                " AND hidden=0 AND privacy>0 AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                                " ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before},
-                        Integer.class);
-            } else {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE hidden=0 AND privacy>0" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        Integer.class);
-            }
-        }
+    public List<Integer> getAll(final int visitorUid, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("before", before)
+                .addValue("visitorUid", visitorUid);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT m.message_id FROM messages m WHERE " +
+                        (before > 0 ?
+                                " m.message_id < :before AND " : "") +
+                        " m.hidden = 0 AND (m.privacy > 0" +
+                        (visitorUid > 1 ?
+                                " OR m.user_id = :visitorUid) AND NOT EXISTS (" +
+                                        " SELECT 1 FROM bl_users b WHERE b.user_id = :visitorUid AND b.bl_user_id = m.user_id)" :
+                                ")") +
+                        " AND NOT EXISTS (SELECT 1 from users u WHERE u.banned = 1 and u.id = m.user_id) ORDER BY m.message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getTag(final int tid, final int visitor_uid, final int before, final int cnt) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.message_id<? " +
-                            "AND (messages.privacy>0 OR messages.user_id=?) ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, before, visitor_uid, cnt},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.privacy>0 OR messages.user_id=? " +
-                            "ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, visitor_uid, cnt},
-                    Integer.class);
-        }
+    public List<Integer> getTag(final int tid, final int visitorUid, final int before, final int cnt) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("tid", tid)
+                .addValue("cnt", cnt)
+                .addValue("before", before)
+                .addValue("visitorUid", visitorUid);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM (tags INNER JOIN messages_tags " +
+                        "ON ((tags.synonym_id = :tid OR tags.tag_id = :tid) AND tags.tag_id = messages_tags.tag_id)) " +
+                        "INNER JOIN messages USING(message_id) WHERE " +
+                        (before > 0 ?
+                                " messages.message_id < :before AND " : "") +
+                        " 1 = 1 AND (messages.privacy > 0 OR messages.user_id = :visitorUid) ORDER BY message_id DESC LIMIT :cnt",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getTags(final String tids, final int visitor_uid, final int before, final int cnt) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags " +
-                            "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                            "AND messages.message_id<? AND (messages.privacy>0 OR messages.user_id=?) " +
-                            "ORDER BY messages.message_id DESC LIMIT ?",
-                    new Object[]{before, visitor_uid, cnt},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags " +
-                            "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                            "AND (messages.privacy>0 OR messages.user_id=?) " +
-                            "ORDER BY messages.message_id DESC LIMIT ?",
-                    new Object[]{visitor_uid, cnt}, Integer.class);
-        }
+    public List<Integer> getTags(final String tids, final int visitorUid, final int before, final int cnt) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("cnt", cnt)
+                .addValue("before", before)
+                .addValue("visitorUid", visitorUid);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT messages.message_id FROM messages_tags " +
+                        "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
+                        (before > 0 ?
+                                " AND messages.message_id < :before " : "") +
+                        " AND (messages.privacy > 0 OR messages.user_id = :visitorUid) " +
+                        "ORDER BY messages.message_id DESC LIMIT :cnt",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getPlace(final int place_id, final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE place_id=? AND message_id<? " +
-                            "AND (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{place_id, before, visitor_uid},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE place_id=? AND (privacy>0 OR user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{place_id, visitor_uid},
-                    Integer.class);
-        }
+    public List<Integer> getPlace(final int placeId, final int visitorUid, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("placeId", placeId)
+                .addValue("before", before)
+                .addValue("visitorUid", visitorUid);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM messages WHERE place_id = :placeId " +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        " AND (privacy > 0 OR user_id = :visitorUid) ORDER BY message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
     public List<Integer> getMyFeed(final int uid, final int before) {
-        List<Integer> mids;
-        if (before > 0) {
-            mids = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE message_id<? AND (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before,
-                    uid);
-        } else {
-            mids = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? " +
-                            "AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    uid);
-        }
-
-        if (before > 0) {
-            mids.addAll(getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "WHERE user_id=? AND message_id<? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before));
-        } else {
-            mids.addAll(getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid));
-        }
-
-        Collections.sort(mids, Collections.reverseOrder());
-        int remove = mids.size() - 20;
-        for (int i = 0; i < remove; i++) {
-            mids.remove(20);
-        }
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
+
+        List<Integer> mids = getNamedParameterJdbcTemplate().queryForList(
+                "(SELECT message_id FROM messages " +
+                        " INNER JOIN subscr_users ON (subscr_users.suser_id = :uid AND subscr_users.user_id = messages.user_id) " +
+                        " WHERE " +
+                        (before > 0 ?
+                                " message_id < :before AND " : "") +
+                        " (privacy >= 0 OR (privacy >= -2 AND privacy <= -1" +
+                        " AND EXISTS (SELECT 1 FROM wl_users w WHERE w.wl_user_id = :uid and w.user_id = messages.user_id)))) " +
+                        " UNION " +
+                        " (SELECT message_id FROM messages WHERE user_id=:uid " +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        " ORDER BY message_id ASC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
 
         return mids;
     }
@@ -529,105 +492,86 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Transactional(readOnly = true)
     @Override
     public List<Integer> getPrivate(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList
-                    ("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 AND message_id<? " +
-                                    "ORDER BY message_id DESC LIMIT 20",
-                            new Object[]{uid, before},
-                            Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy<0 " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{uid},
-                    Integer.class);
-        }
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList
+                ("SELECT message_id FROM messages WHERE user_id = :uid AND privacy < 0" +
+                                (before > 0 ?
+                                        " AND message_id < :before " : "") +
+                                "ORDER BY message_id DESC LIMIT 20",
+                        sqlParameterSource,
+                        Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
     public List<Integer> getDiscussions(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM subscr_messages WHERE suser_id=? AND message_id<? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM subscr_messages WHERE suser_id=? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid);
-        }
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM subscr_messages WHERE suser_id = :uid" +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        "ORDER BY message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
     public List<Integer> getRecommended(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites WHERE user_id " +
-                            "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) AND message_id<? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites WHERE user_id " +
-                            "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid);
-        }
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT f.message_id FROM favorites f WHERE " +
+                        "EXISTS (SELECT 1 FROM subscr_users s WHERE s.suser_id = :uid and f.user_id = s.user_id)" +
+                        (before > 0 ?
+                                " AND f.message_id < :before " : "") +
+                        "ORDER BY f.message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getPopular(final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id<? AND privacy>0 " +
-                            "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    before,
-                    visitor_uid);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE privacy>0 " +
-                            "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    visitor_uid);
-        }
+    public List<Integer> getPopular(final int visitorUid, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("vid", visitorUid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT m.message_id FROM m.messages WHERE m.privacy > 0 " +
+                        (before > 0 ?
+                                " AND m.message_id < :before " : "") +
+                        " AND m.popular > 0 AND NOT EXISTS (SELECT 1 FROM bl_users b WHERE b.user_id = :vid and b.bl_user_id = m.user_id) " +
+                        " ORDER BY m.message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getPhotos(final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) " +
-                            "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                            "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    before,
-                    visitor_uid,
-                    visitor_uid);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) " +
-                            "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                            "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    visitor_uid,
-                    visitor_uid);
-        }
+    public List<Integer> getPhotos(final int visitorUid, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("vid", visitorUid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT m.message_id FROM messages m WHERE (m.privacy > 0 OR m.user_id = :vid) " +
+                        (before > 0 ?
+                                " AND m.message_id < :before " : "") +
+                        " AND m.attach IS NOT NULL " +
+                        " AND NOT EXISTS (SELECT 1 from users u WHERE u.banned = 1 and u.id = m.user_id) " +
+                        " AND NOT EXISTS (SELECT 1 FROM bl_users b WHERE b.user_id = :vid and b.bl_user_id = m.user_id) " +
+                        " ORDER BY m.message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
@@ -637,22 +581,19 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
 
         if (before > 0) {
             mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE MATCH(?) AND id<? " +
-                            "ORDER BY id DESC LIMIT 25",
+                    "SELECT id AS message_id FROM messages WHERE MATCH(?) AND id < ? ORDER BY id DESC LIMIT 25",
                     Integer.class,
-                    search,
-                    before);
+                    search, before);
         } else {
             mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE MATCH(?) " +
-                            "ORDER BY id DESC LIMIT 25",
+                    "SELECT id AS message_id FROM messages WHERE MATCH(?) ORDER BY id DESC LIMIT 25",
                     Integer.class,
                     search);
         }
         if (mids.size() > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id " +
-                            "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>0 ORDER BY message_id DESC LIMIT 20",
+            return getNamedParameterJdbcTemplate().queryForList(
+                    "SELECT message_id FROM messages WHERE message_id IN (:ids) AND privacy > 0 ORDER BY message_id DESC LIMIT 20",
+                    new MapSqlParameterSource("ids", mids),
                     Integer.class);
         }
         return mids;
@@ -660,83 +601,72 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getUserBlog(final int UID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                            privacy + " ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                            " ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID);
-        }
+    public List<Integer> getUserBlog(final int uid, final int privacy, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("privacy", privacy)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM messages WHERE user_id = :uid" +
+                        (before > 0 ?
+                                " AND message_id < :before" : "") +
+                        " AND privacy >= :privacy ORDER BY message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getUserTag(final int UID, final int TID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                            "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                            "AND messages.message_id<? AND messages.privacy>=" + privacy +
-                            " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    TID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                            "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                            "AND messages.privacy>=" + privacy + " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    TID);
-        }
+    public List<Integer> getUserTag(final int uid, final int tid, final int privacy, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("tid", tid)
+                .addValue("privacy", privacy)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
+                        " USING (message_id) WHERE messages.user_id = :uid AND messages_tags.tag_id = :tid " +
+                        (before > 0 ?
+                                " AND messages.message_id < :before " : "") +
+                        " AND messages.privacy >= :privacy ORDER BY messages.message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getUserRecommendations(final int UID, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites "
-                            + "WHERE user_id=? AND message_id<? "
-                            + "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites "
-                            + "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID);
-        }
+    public List<Integer> getUserRecommendations(final int uid, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM favorites " +
+                        " WHERE user_id = :uid " +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        " ORDER BY message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<Integer> getUserPhotos(final int UID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                            privacy + " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{UID, before},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                            " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{UID},
-                    Integer.class);
-        }
+    public List<Integer> getUserPhotos(final int uid, final int privacy, final int before) {
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("privacy", privacy)
+                .addValue("before", before);
+
+        return getNamedParameterJdbcTemplate().queryForList(
+                "SELECT message_id FROM messages WHERE user_id = :uid " +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        " AND privacy >= :privacy AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
     }
 
     @Transactional(readOnly = true)
@@ -759,9 +689,10 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
         }
 
         if (mids.size() > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id IN (" +
-                            StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>=" + privacy + " ORDER BY message_id DESC",
+            return getNamedParameterJdbcTemplate().queryForList(
+                    "SELECT message_id FROM messages WHERE message_id IN (:ids) AND privacy >= :privacy ORDER BY message_id DESC",
+                    new MapSqlParameterSource("ids", mids)
+                            .addValue("privacy", privacy),
                     Integer.class);
         }
         return mids;
@@ -769,9 +700,9 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
 
     @Transactional(readOnly = true)
     @Override
-    public List<com.juick.Message> getMessages(final List<Integer> mids) {
-        if (!mids.isEmpty()) {
-            return getJdbcTemplate().query(
+    public List<com.juick.Message> getMessages(final Collection<Integer> mids) {
+        if (CollectionUtils.isNotEmpty(mids)) {
+            return getNamedParameterJdbcTemplate().query(
                     "SELECT messages.message_id, 0 as rid, 0 as replyto, "
                             + "messages.user_id,users.nick, 0 as banned, "
                             + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
@@ -783,9 +714,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                             + "FROM (messages INNER JOIN messages_txt "
                             + "ON messages.message_id=messages_txt.message_id) "
                             + "INNER JOIN users ON messages.user_id=users.id "
-                            + "WHERE messages.message_id "
-                            + "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") "
-                            + "ORDER BY messages.message_id DESC",
+                            + "WHERE messages.message_id IN (:ids) ORDER BY messages.message_id DESC",
+                    new MapSqlParameterSource("ids", mids),
                     new MessageMapper());
         }
         return Collections.emptyList();
@@ -794,62 +724,76 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Transactional(readOnly = true)
     @Override
     public List<com.juick.Message> getReplies(final int mid) {
-        return getJdbcTemplate().query(
-                "SELECT ? as mid, replies.reply_id,replies.replyto, " +
-                        "replies.user_id,users.nick,users.banned, " +
-                        "TIMESTAMPDIFF(MINUTE,replies.ts,NOW()),replies.ts," +
-                        "0 as readonly, 0 as privacy, 0 as replies," +
-                        "replies.attach, 0 as place_id, 0 as lat," +
-                        "0 as lon, 0 as likes, 0 as hidden," +
-                        "NULL as tags,NULL as repliesby, replies.txt, " +
+        return getNamedParameterJdbcTemplate().query(
+                "SELECT replies.message_id as mid, replies.reply_id, replies.replyto, " +
+                        "replies.user_id, users.nick, users.banned, " +
+                        "TIMESTAMPDIFF(MINUTE, replies.ts, NOW()), replies.ts, " +
+                        "0 as readonly, 0 as privacy, 0 as replies, " +
+                        "replies.attach, 0 as place_id, 0 as lat, " +
+                        "0 as lon, 0 as likes, 0 as hidden, " +
+                        "NULL as tags, NULL as repliesby, replies.txt, " +
                         "IFNULL(qw.txt, t.txt) as q " +
                         "FROM replies INNER JOIN users " +
-                        "ON replies.user_id=users.id " +
-                        "LEFT JOIN replies qw ON replies.message_id=qw.message_id and replies.replyto=qw.reply_id " +
-                        "LEFT JOIN messages_txt t on replies.message_id=t.message_id " +
-                        "WHERE replies.message_id=? " +
-                        "ORDER BY replies.reply_id ASC",
-                new MessageMapper(),
-                mid,
-                mid);
+                        "ON replies.user_id = users.id " +
+                        "LEFT JOIN replies qw ON replies.message_id = qw.message_id and replies.replyto = qw.reply_id " +
+                        "LEFT JOIN messages_txt t on replies.message_id = t.message_id " +
+                        "WHERE replies.message_id = :mid ORDER BY replies.reply_id ASC",
+                new MapSqlParameterSource("mid", mid),
+                new MessageMapper());
     }
 
     @Transactional
     @Override
     public boolean setMessagePopular(final int mid, final int popular) {
-        boolean ret;
+        int ret;
+        MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("mid", mid)
+                .addValue("popular", popular);
+
         switch (popular) {
             case -2:
-                ret = getJdbcTemplate().update("UPDATE messages SET hidden=1 WHERE message_id=?", mid) > 0;
+                ret = getNamedParameterJdbcTemplate().update(
+                        "UPDATE messages SET hidden = 1 WHERE message_id = :mid",
+                        sqlParameterSource);
                 break;
             case -1:
-                ret = getJdbcTemplate().update("UPDATE messages SET popular=0 WHERE message_id=?", mid) > 0;
-                break;
+                sqlParameterSource.addValue("popular", 0);
             default:
-                ret = getJdbcTemplate().update("UPDATE messages SET popular=? WHERE message_id=?", popular, mid) > 0;
+                ret = getNamedParameterJdbcTemplate().update(
+                        "UPDATE messages SET popular = :popular WHERE message_id = :mid",
+                        sqlParameterSource);
                 break;
         }
-        if (popular == -1) {
-            ret = getJdbcTemplate().update("INSERT INTO top_ignore_messages VALUES (?)", mid) > 0;
-        }
-        return ret;
+
+        if (popular == -1)
+            ret = getNamedParameterJdbcTemplate().update(
+                    "INSERT INTO top_ignore_messages VALUES (:mid)",
+                    sqlParameterSource);
+
+        return ret > 0;
     }
 
     @Transactional
     @Override
     public boolean setMessagePrivacy(final int mid) {
-        return getJdbcTemplate().update("UPDATE messages SET privacy=1 WHERE message_id=?",
-                mid) > 0;
+        return getJdbcTemplate().update("UPDATE messages SET privacy=1 WHERE message_id=?", mid) > 0;
     }
 
     @Transactional
     @Override
     public boolean deleteMessage(final int uid, final int mid) {
-        if (getJdbcTemplate().update("DELETE FROM messages WHERE message_id=? AND user_id=?", mid, uid) > 0) {
-            getJdbcTemplate().update("DELETE FROM messages_txt WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM replies WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM subscr_messages WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM messages_tags WHERE message_id=?", mid);
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("mid", mid)
+                .addValue("uid", uid);
+
+        if (getNamedParameterJdbcTemplate().update(
+                "DELETE FROM messages WHERE message_id = :mid AND user_id = :uid", sqlParameterSource) > 0) {
+
+            getNamedParameterJdbcTemplate().update("DELETE FROM messages_txt WHERE message_id = :mid", sqlParameterSource);
+            getNamedParameterJdbcTemplate().update("DELETE FROM replies WHERE message_id = :mid", sqlParameterSource);
+            getNamedParameterJdbcTemplate().update("DELETE FROM subscr_messages WHERE message_id = :mid", sqlParameterSource);
+            getNamedParameterJdbcTemplate().update("DELETE FROM messages_tags WHERE message_id = :mid", sqlParameterSource);
+
             return true;
         }
         return false;