From 7eb3b141e5e4e719e1ef77ea06b6bac7610ae913 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 11 Jul 2016 10:16:36 +0300
Subject: cleanup sql

---
 .../main/java/com/juick/server/SubscriptionsQueries.java   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java')

diff --git a/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java
index 7c30285b..21a07e05 100644
--- a/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ b/juick-core/src/main/java/com/juick/server/SubscriptionsQueries.java
@@ -9,11 +9,7 @@ import com.juick.User;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Logger;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -22,8 +18,6 @@ import java.util.stream.Collectors;
  */
 public class SubscriptionsQueries {
 
-    private static final Logger logger = Logger.getLogger(SubscriptionsQueries.class.getName());
-
     public static List<String> getJIDSubscribedToUser(JdbcTemplate sql, int uid, boolean friendsonly) {
         if (friendsonly == false) {
             return sql.queryForList("SELECT jids.jid FROM subscr_users INNER JOIN jids " +
@@ -51,11 +45,11 @@ public class SubscriptionsQueries {
 
     public static List<User> getUsersSubscribedToComments(JdbcTemplate sql, int mid, int ignore_uid) {
         List<Integer> userids = sql.queryForList("SELECT suser_id FROM subscr_messages WHERE message_id=? AND suser_id!=?",
-                new Object[] {mid, ignore_uid}, Integer.class);
+                Integer.class, mid, ignore_uid);
         if (userids.size() > 0) {
             return UserQueries.getUsersByID(sql, userids);
         } else {
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
     }
 
@@ -69,7 +63,7 @@ public class SubscriptionsQueries {
             query += " AND user_id NOT IN (SELECT user_id FROM favorites WHERE message_id=" + mid + ")";
             query += " AND user_id NOT IN (SELECT subscr_users.suser_id FROM subscr_users INNER JOIN favorites ON (favorites.message_id=" + mid + " AND subscr_users.user_id=favorites.user_id AND favorites.user_id!=" + uid + "))";
             if (!tags.isEmpty()) {
-                String tagsStr = Utils.convertArrayInt2String(tags);
+                String tagsStr = StringUtils.arrayToCommaDelimitedString(tags.toArray());
                 query += " AND user_id NOT IN (SELECT suser_id FROM subscr_tags WHERE tag_id IN (" + tagsStr + "))";
                 query += " AND user_id NOT IN (SELECT user_id FROM bl_tags WHERE tag_id IN (" + tagsStr + "))";
             }
-- 
cgit v1.2.3