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)

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

(limited to 'juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
index ac53b2ad..0ef5374c 100644
--- a/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
@@ -56,7 +56,7 @@ public class WebsocketComponent extends TextWebSocketHandler {
                     visitor = UserQueries.getUserByHash(jdbc, hash);
                 } else {
                     try {
-                        logger.info(String.format("wrong hash for %d from %s", visitor.getUID(), hXRealIP));
+                        logger.info(String.format("wrong hash for %d from %s", visitor.getUid(), hXRealIP));
                         session.close(new CloseStatus(403, "Forbidden"));
                     } catch (IOException e) {
                         logger.warn("ws error", e);
@@ -65,19 +65,19 @@ public class WebsocketComponent extends TextWebSocketHandler {
                 break;
             }
         }
-        logger.info(String.format("user %d connected to %s from %s", visitor.getUID(), hLocation.getPath(), hXRealIP));
+        logger.info(String.format("user %d connected to %s from %s", visitor.getUid(), hLocation.getPath(), hXRealIP));
 
         int MID = 0;
         SocketSubscribed sockSubscr = null;
         if (hLocation.getPath().equals("/")) {
-            logger.info(String.format("user %d connected", visitor.getUID()));
+            logger.info(String.format("user %d connected", visitor.getUid()));
             sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, false);
         } else if (hLocation.getPath().equals("/_all")) {
-            logger.info(String.format("user %d connected to legacy _all (%s)", visitor.getUID(), hLocation.getPath()));
+            logger.info(String.format("user %d connected to legacy _all (%s)", visitor.getUid(), hLocation.getPath()));
             sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
             sockSubscr.allMessages = true;
         } else if (hLocation.getPath().equals("/_replies")) {
-            logger.info(String.format("user %d connected to legacy _replies (%s)", visitor.getUID(), hLocation.getPath()));
+            logger.info(String.format("user %d connected to legacy _replies (%s)", visitor.getUid(), hLocation.getPath()));
             sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
             sockSubscr.allReplies = true;
         } else if (hLocation.getPath().matches("/\\d+$")) {
@@ -86,8 +86,8 @@ public class WebsocketComponent extends TextWebSocketHandler {
             } catch (Exception e) {
             }
             if (MID > 0) {
-                if (MessagesQueries.canViewThread(jdbc, MID, visitor.getUID())) {
-                    logger.info(String.format("user %d connected to legacy thread (%d) from %s", visitor.getUID(), MID, hXRealIP));
+                if (MessagesQueries.canViewThread(jdbc, MID, visitor.getUid())) {
+                    logger.info(String.format("user %d connected to legacy thread (%d) from %s", visitor.getUid(), MID, hXRealIP));
                     sockSubscr = new SocketSubscribed(session, hXRealIP, visitor, true);
                     sockSubscr.MID = MID;
                 } else {
-- 
cgit v1.2.3