From 51d9de02265d6cc9d6045d79497d2a987ae2f7f7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 15 Nov 2016 14:21:27 +0300
Subject: core classes are now serializeable with JAXB (to use as babbler
 extension)

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

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

diff --git a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
index 9a09a5cd..08d704d9 100644
--- a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
@@ -36,12 +36,12 @@ public class SubscriptionsQueries {
         User author = MessagesQueries.getMessageAuthor(sql, mid);
         List<User> userids = UserQueries.getUserReaders(sql, uid);
         Set<Integer> set = new HashSet<>();
-        set.addAll(userids.stream().map(User::getUID).collect(Collectors.toList()));
+        set.addAll(userids.stream().map(User::getUid).collect(Collectors.toList()));
         List<Integer> tags = MessagesQueries.getMessageTagsIDs(sql, mid);
         if (tags.size() > 0) {
             List<Integer> tagUsers = sql.queryForList("SELECT suser_id FROM subscr_tags " +
                     "WHERE tag_id IN (" + StringUtils.arrayToCommaDelimitedString(tags.toArray()) + ") AND suser_id!=? " +
-                    " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)", Integer.class, uid, author.getUID());
+                    " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)", Integer.class, uid, author.getUid());
             set.addAll(tagUsers);
         }
         return UserQueries.getUsersByID(sql, new ArrayList<>(set));
@@ -84,19 +84,19 @@ public class SubscriptionsQueries {
     }
     public static boolean subscribeUser(JdbcTemplate sql, User user, User toUser) {
         return sql.update("INSERT IGNORE INTO subscr_users(user_id,suser_id) VALUES (?,?)",
-                toUser.getUID(), user.getUID()) == 1;
+                toUser.getUid(), user.getUid()) == 1;
     }
     public static boolean unSubscribeUser(JdbcTemplate sql, User user, User fromUser) {
         return sql.update("DELETE FROM subscr_users WHERE suser_id=? AND user_id=?",
-                user.getUID(), fromUser.getUID()) > 0;
+                user.getUid(), fromUser.getUid()) > 0;
     }
     public static boolean subscribeTag(JdbcTemplate sql, User user, Tag toTag) {
         return sql.update("INSERT IGNORE INTO subscr_tags(tag_id,suser_id) VALUES (?,?)",
-                toTag.TID, user.getUID()) == 1;
+                toTag.TID, user.getUid()) == 1;
     }
     public static boolean unSubscribeTag(JdbcTemplate sql, User user, Tag toTag) {
         return sql.update("DELETE FROM subscr_tags WHERE tag_id=? AND suser_id=?",
-                toTag.TID, user.getUID()) > 0;
+                toTag.TID, user.getUid()) > 0;
     }
 
     public static NotifyOpts getNotifyOptions(JdbcTemplate sql, User user) {
@@ -108,7 +108,7 @@ public class SubscriptionsQueries {
                         options.setSubscriptionsEnabled(rs.getInt(2) > 0);
                         options.setRecommendationsEnabled(rs.getInt(3) > 0);
                         return options;
-                    }, user.getUID());
+                    }, user.getUid());
         } catch (EmptyResultDataAccessException e) {
             return new NotifyOpts();
         }
@@ -116,10 +116,10 @@ public class SubscriptionsQueries {
 
     public static boolean setNotifyOptions(JdbcTemplate sql, User user, NotifyOpts options) {
         return sql.update("UPDATE useroptions SET jnotify=? WHERE user_id=?", options.isRepliesEnabled() ? 1 : 0,
-                user.getUID()) > 0 &&
+                user.getUid()) > 0 &&
                 sql.update("UPDATE useroptions SET subscr_notify=? WHERE user_id=?", options.isSubscriptionsEnabled() ? 1 : 0,
-                        user.getUID()) > 0 &&
+                        user.getUid()) > 0 &&
                 sql.update("UPDATE useroptions SET recommendations=? WHERE user_id=?", options.isRecommendationsEnabled() ? 1 : 0,
-                        user.getUID()) > 0;
+                        user.getUid()) > 0;
     }
 }
-- 
cgit v1.2.3