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) --- juick-api/src/main/java/com/juick/api/Notifications.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'juick-api/src/main/java/com/juick/api/Notifications.java') diff --git a/juick-api/src/main/java/com/juick/api/Notifications.java b/juick-api/src/main/java/com/juick/api/Notifications.java index bec365ba..60fe95f3 100644 --- a/juick-api/src/main/java/com/juick/api/Notifications.java +++ b/juick-api/src/main/java/com/juick/api/Notifications.java @@ -29,7 +29,7 @@ public class Notifications { public void doGet(HttpServletRequest request, HttpServletResponse response, int vuid) throws IOException { User visitor = UserQueries.getUserByUID(jdbc, vuid).orElse(new User()); - if ((visitor.getUID() == 0) || !(visitor.getUName().equals("juick"))) { + if ((visitor.getUid() == 0) || !(visitor.getName().equals("juick"))) { response.sendError(403); return; } @@ -57,13 +57,13 @@ public class Notifications { Message msg = MessagesQueries.getMessage(jdbc, mid); if (msg != null) { List users; - if (msg.getRID() > 0) { - users = SubscriptionsQueries.getUsersSubscribedToComments(jdbc, mid, msg.getUser().getUID()); + if (msg.getRid() > 0) { + users = SubscriptionsQueries.getUsersSubscribedToComments(jdbc, mid, msg.getUser().getUid()); } else { - users = SubscriptionsQueries.getSubscribedUsers(jdbc, msg.getUser().getUID(), mid); + users = SubscriptionsQueries.getSubscribedUsers(jdbc, msg.getUser().getUid(), mid); } - List uids = users.stream().map(User::getUID).collect(Collectors.toList()); + List uids = users.stream().map(User::getUid).collect(Collectors.toList()); switch (type) { case "gcm": -- cgit v1.2.3