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)

---
 server-core/src/main/java/com/juick/server/PMQueries.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/server-core/src/main/java/com/juick/server/PMQueries.java b/server-core/src/main/java/com/juick/server/PMQueries.java
index d7855002..c79c04b6 100644
--- a/server-core/src/main/java/com/juick/server/PMQueries.java
+++ b/server-core/src/main/java/com/juick/server/PMQueries.java
@@ -73,8 +73,8 @@ public class PMQueries {
                 + "WHERE pm_streams.user_id_to=? "
                 + "ORDER BY pm_streams.unread DESC, pm_streams.lastmessage DESC LIMIT " + cnt, (rs, rowNum) -> {
             com.juick.User u = new com.juick.User();
-            u.setUID(rs.getInt(1));
-            u.setUName(rs.getString(2));
+            u.setUid(rs.getInt(1));
+            u.setName(rs.getString(2));
             u.setUnreadCount(rs.getInt(3));
             return u;
         }, uid);
@@ -88,7 +88,7 @@ public class PMQueries {
                     com.juick.Message msg = new com.juick.Message();
                     int uuid = rs.getInt(1);
                     msg.setUser(new User());
-                    msg.getUser().setUID(uuid);
+                    msg.getUser().setUid(uuid);
                     msg.setText(rs.getString(2));
                     msg.setDate(rs.getTimestamp(3));
                     return msg;
@@ -106,8 +106,8 @@ public class PMQueries {
                 (rs, num) -> {
                     com.juick.Message msg = new com.juick.Message();
                     msg.setUser(new User());
-                    msg.getUser().setUID(rs.getInt(1));
-                    msg.getUser().setUName(rs.getString(2));
+                    msg.getUser().setUid(rs.getInt(1));
+                    msg.getUser().setName(rs.getString(2));
                     msg.setText(rs.getString(3));
                     msg.TimeAgo = rs.getInt(4);
                     msg.setDate(rs.getTimestamp(5));
@@ -122,8 +122,8 @@ public class PMQueries {
                 (rs, num) -> {
                     com.juick.Message msg = new com.juick.Message();
                     msg.setUser(new User());
-                    msg.getUser().setUID(rs.getInt(1));
-                    msg.getUser().setUName(rs.getString(2));
+                    msg.getUser().setUid(rs.getInt(1));
+                    msg.getUser().setName(rs.getString(2));
                     msg.setText(rs.getString(3));
                     msg.TimeAgo = rs.getInt(4);
                     msg.setDate(rs.getTimestamp(5));
-- 
cgit v1.2.3