From 655b821e274ca4be078389475a8bb33139c55a4f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 4 Nov 2015 15:24:53 +0300
Subject: refactoring
---
src/main/java/com/juick/json/UserSerializer.java | 66 ++++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 src/main/java/com/juick/json/UserSerializer.java
(limited to 'src/main/java/com/juick/json/UserSerializer.java')
diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
new file mode 100644
index 00000000..07f87616
--- /dev/null
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -0,0 +1,66 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+package com.juick.json;
+
+import com.juick.User;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class UserSerializer extends JSONSerializer {
+
+ @Override
+ public User deserialize(JSONObject json) throws JSONException {
+ User juser = new User();
+ juser.UID = json.getInt("uid");
+ juser.UName = json.getString("uname");
+ if (json.has("fullname")) {
+ juser.FullName = json.getString("fullname");
+ }
+ return juser;
+ }
+
+ @Override
+ public JSONObject serialize(User user) {
+ JSONObject json = new JSONObject();
+
+ try {
+ if (user.UID > 0) {
+ json.put("uid", user.UID);
+ }
+ if (user.UName != null) {
+ json.put("uname", user.UName);
+ }
+ if (user.FullName != null) {
+ json.put("fullname", user.FullName);
+ }
+ if (user.JID != null) {
+ json.put("jid", user.JID);
+ }
+ if (user.MessagesCount > 0) {
+ json.put("MessagesCount", user.MessagesCount);
+ }
+ } catch (JSONException e) {
+ }
+
+ return json;
+ }
+}
--
cgit v1.2.3
From 331363c89936be9df126d10e16107b99a18877d1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 10 Jan 2016 19:58:19 +0300
Subject: refactoring
---
.../java/com/juick/json/MessageSerializer.java | 20 ++++++++++----------
src/main/java/com/juick/json/UserSerializer.java | 22 +++++++++++-----------
2 files changed, 21 insertions(+), 21 deletions(-)
(limited to 'src/main/java/com/juick/json/UserSerializer.java')
diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
index 0879f13a..85986415 100644
--- a/src/main/java/com/juick/json/MessageSerializer.java
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -38,9 +38,9 @@ public class MessageSerializer extends JSONSerializer {
@Override
public Message deserialize(JSONObject json) throws JSONException {
com.juick.Message jmsg = new com.juick.Message();
- jmsg.MID = json.getInt("mid");
+ jmsg.setMID(json.getInt("mid"));
if (json.has("rid")) {
- jmsg.RID = json.getInt("rid");
+ jmsg.setRID(json.getInt("rid"));
}
if (json.has("replyto")) {
jmsg.ReplyTo = json.getInt("replyto");
@@ -50,7 +50,7 @@ public class MessageSerializer extends JSONSerializer {
jmsg.ReadOnly = json.has("readonly");
jmsg.Text = json.getString("body").replace(""", "\"");
- jmsg.User = userSerializer.deserialize(json.getJSONObject("user"));
+ jmsg.setUser(userSerializer.deserialize(json.getJSONObject("user")));
try {
DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -82,11 +82,11 @@ public class MessageSerializer extends JSONSerializer {
JSONObject json = new JSONObject();
try {
- if (msg.MID > 0) {
- json.put("mid", msg.MID);
+ if (msg.getMID() > 0) {
+ json.put("mid", msg.getMID());
}
- if (msg.RID > 0) {
- json.put("rid", msg.RID);
+ if (msg.getRID() > 0) {
+ json.put("rid", msg.getRID());
}
if (msg.ReplyTo > 0) {
json.put("replyto", msg.ReplyTo);
@@ -105,8 +105,8 @@ public class MessageSerializer extends JSONSerializer {
} else if (msg.TimestampString != null) {
json.put("timestamp", msg.TimestampString);
}
- if (msg.User != null) {
- json.put("user", userSerializer.serialize(msg.User));
+ if (msg.getUser() != null) {
+ json.put("user", userSerializer.serialize(msg.getUser()));
}
if (msg.Tags != null && msg.Tags.size() > 0) {
json.put("tags", new JSONArray(msg.Tags));
@@ -118,7 +118,7 @@ public class MessageSerializer extends JSONSerializer {
json.put("place", placeSerializer.serialize(msg.Place));
}
if (msg.AttachmentType != null) {
- String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
+ String fname = msg.getMID() + (msg.getRID() > 0 ? "-" + msg.getRID() : "") + "." + msg.AttachmentType;
JSONObject photo = new JSONObject();
photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
photo.put("small", "http://i.juick.com/photos-512/" + fname);
diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
index 07f87616..4485812a 100644
--- a/src/main/java/com/juick/json/UserSerializer.java
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -30,10 +30,10 @@ public class UserSerializer extends JSONSerializer {
@Override
public User deserialize(JSONObject json) throws JSONException {
User juser = new User();
- juser.UID = json.getInt("uid");
- juser.UName = json.getString("uname");
+ juser.setUID(json.getInt("uid"));
+ juser.setUName(json.getString("uname"));
if (json.has("fullname")) {
- juser.FullName = json.getString("fullname");
+ juser.setFullName(json.getString("fullname"));
}
return juser;
}
@@ -43,17 +43,17 @@ public class UserSerializer extends JSONSerializer {
JSONObject json = new JSONObject();
try {
- if (user.UID > 0) {
- json.put("uid", user.UID);
+ if (user.getUID() > 0) {
+ json.put("uid", user.getUID());
}
- if (user.UName != null) {
- json.put("uname", user.UName);
+ if (user.getUName() != null) {
+ json.put("uname", user.getUName());
}
- if (user.FullName != null) {
- json.put("fullname", user.FullName);
+ if (user.getFullName() != null) {
+ json.put("fullname", user.getFullName());
}
- if (user.JID != null) {
- json.put("jid", user.JID);
+ if (user.getJID() != null) {
+ json.put("jid", user.getJID());
}
if (user.MessagesCount > 0) {
json.put("MessagesCount", user.MessagesCount);
--
cgit v1.2.3
From fc46d9c1f8c9967f9c648f09a3714e8c3a4ed75a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 8 Apr 2016 16:23:55 +0300
Subject: update api
---
src/main/java/com/juick/json/UserSerializer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/main/java/com/juick/json/UserSerializer.java')
diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
index 4485812a..390f4bf6 100644
--- a/src/main/java/com/juick/json/UserSerializer.java
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -55,8 +55,8 @@ public class UserSerializer extends JSONSerializer {
if (user.getJID() != null) {
json.put("jid", user.getJID());
}
- if (user.MessagesCount > 0) {
- json.put("MessagesCount", user.MessagesCount);
+ if (user.getUnreadCount() > 0) {
+ json.put("unreadCount", user.getUnreadCount());
}
} catch (JSONException e) {
}
--
cgit v1.2.3