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)

---
 .../com/juick/service/MessagesServiceImpl.java     | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java b/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java
index dfbc4ade..bb030ed4 100644
--- a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -43,19 +43,19 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
         @Override
         public Message mapRow(ResultSet rs, int rowNum) throws SQLException {
             Message msg = new Message();
-            msg.setMID(rs.getInt(1));
-            msg.setRID(rs.getInt(2));
-            msg.ReplyTo = rs.getInt(3);
+            msg.setMid(rs.getInt(1));
+            msg.setRid(rs.getInt(2));
+            msg.setReplyto(rs.getInt(3));
             User user = new User();
-            user.setUID(rs.getInt(4));
-            user.setUName(rs.getString(5));
-            user.Banned = rs.getBoolean(6);
+            user.setUid(rs.getInt(4));
+            user.setName(rs.getString(5));
+            user.setBanned(rs.getBoolean(6));
             msg.setUser(user);
             msg.TimeAgo = rs.getInt(7);
             msg.setDate(rs.getTimestamp(8));
             msg.ReadOnly = rs.getBoolean(9);
-            msg.Privacy = rs.getInt(10);
-            msg.FriendsOnly = msg.Privacy < 0;
+            msg.setPrivacy(rs.getInt(10));
+            msg.FriendsOnly = msg.getPrivacy() < 0;
             msg.Replies = rs.getInt(11);
             msg.AttachmentType = rs.getString(12);
             if (rs.getDouble(13) != 0) {
@@ -68,7 +68,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
             // parse tags string
             String tagsStr = rs.getString(18);
             if (tagsStr != null) {
-                Arrays.stream(tagsStr.split(" ")).forEach(t -> msg.Tags.add(new Tag(t)));
+                Arrays.stream(tagsStr.split(" ")).forEach(t -> msg.getTags().add(new Tag(t)));
             }
             msg.RepliesBy = rs.getString(19);
             msg.setText(rs.getString(20));
@@ -305,12 +305,12 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                             + "WHERE replies.message_id=? AND replies.reply_id=?",
                     (rs, num) -> {
                         Message msg = new Message();
-                        msg.setMID(mid);
-                        msg.setRID(rid);
+                        msg.setMid(mid);
+                        msg.setRid(rid);
                         msg.setUser(new User());
-                        msg.getUser().setUID(rs.getInt(1));
-                        msg.getUser().setUName(rs.getString(2));
-                        msg.ReplyTo = rs.getInt(3);
+                        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));
@@ -335,8 +335,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
                             + "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.setUName(rs.getString(2));
+                        res.setUid(rs.getInt(1));
+                        res.setName(rs.getString(2));
                         return res;
                     });
         } catch (EmptyResultDataAccessException e) {
-- 
cgit v1.2.3