core classes are now serializeable with JAXB (to use as babbler extension)

1 files changed, 40 insertions, 17 deletions

diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java
index b8936bab..83dcda5f 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-core/src/main/java/com/juick/User.java
@@ -20,27 +20,29 @@ package com.juick;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.xml.bind.annotation.*;
+
 /**
  * @author Ugnich Anton
  */
+@XmlRootElement(name = "user", namespace = "http://juick.com/user")
+@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
 public class User {
-    private int UID = 0;
-    private String UName = null;
-    @JsonIgnore
-    public Object Avatar = null;
+    private int uid = 0;
+    private String name = null;
+    private Object Avatar = null;
     private String FullName = null;
     private String JID = null;
     private int MessagesCount = 0;
     private String AuthHash = null;
-    @JsonIgnore
-    public boolean Banned = false;
+    private boolean Banned = false;
 
     public User() {
     }
 
     public User(User u) {
-        setUID(u.getUID());
-        setUName(u.getUName());
+        setUid(u.getUid());
+        setName(u.getName());
         Avatar = u.Avatar;
         setFullName(u.getFullName());
         setJID(u.getJID());
@@ -52,28 +54,31 @@ public class User {
     @Override
     public boolean equals(Object obj) {
         return obj == this ||
-                (obj instanceof User && ((User) obj).getUID() == this.getUID());
+                (obj instanceof User && ((User) obj).getUid() == this.getUid());
     }
 
     @JsonProperty("uid")
-    public int getUID() {
-        return UID;
+    @XmlAttribute(name = "uid")
+    public int getUid() {
+        return uid;
     }
 
-    public void setUID(int UID) {
-        this.UID = UID;
+    public void setUid(int uid) {
+        this.uid = uid;
     }
 
     @JsonProperty("uname")
-    public String getUName() {
-        return UName;
+    @XmlAttribute(name = "uname")
+    public String getName() {
+        return name;
     }
 
-    public void setUName(String UName) {
-        this.UName = UName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     @JsonProperty("fullname")
+    @XmlTransient
     public String getFullName() {
         return FullName;
     }
@@ -101,6 +106,7 @@ public class User {
     }
 
     @JsonProperty("unreadCount")
+    @XmlTransient
     public Integer getUnreadCount() {
         return MessagesCount;
     }
@@ -108,4 +114,21 @@ public class User {
     public void setUnreadCount(Integer count) {
         MessagesCount = count;
     }
+
+    @XmlTransient
+    public boolean isBanned() {
+        return Banned;
+    }
+
+    public void setBanned(boolean banned) {
+        Banned = banned;
+    }
+
+    public Object getAvatar() {
+        return Avatar;
+    }
+
+    public void setAvatar(Object avatar) {
+        Avatar = avatar;
+    }
 }