From 5b2bd7f928bbf9d3233ff029ed5c09ac46daf0de Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 28 Nov 2016 14:37:02 +0300
Subject: all components using jackson now, org.json serializer moved to
 compatibility tests package

---
 .../java/com/juick/json/MessageSerializer.java     | 145 ---------------------
 1 file changed, 145 deletions(-)
 delete mode 100644 juick-core/src/main/java/com/juick/json/MessageSerializer.java

(limited to 'juick-core/src/main/java/com/juick/json/MessageSerializer.java')

diff --git a/juick-core/src/main/java/com/juick/json/MessageSerializer.java b/juick-core/src/main/java/com/juick/json/MessageSerializer.java
deleted file mode 100644
index ebc3b0b0..00000000
--- a/juick-core/src/main/java/com/juick/json/MessageSerializer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import com.juick.Message;
-import com.juick.Tag;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class MessageSerializer extends JSONSerializer<Message> {
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(MessageSerializer.class);
-    
-    UserSerializer userSerializer = new UserSerializer();
-    PlaceSerializer placeSerializer = new PlaceSerializer();
-
-    private final SimpleDateFormat df;
-
-    public MessageSerializer() {
-        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        df.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    @Override
-    public Message deserialize(JSONObject json) throws JSONException, ParseException {
-        com.juick.Message jmsg = new com.juick.Message();
-        jmsg.setMid(json.getInt("mid"));
-        if (json.has("rid")) {
-            jmsg.setRid(json.getInt("rid"));
-        }
-        if (json.has("replyto")) {
-            jmsg.setReplyto(json.getInt("replyto"));
-        }
-
-        jmsg.FriendsOnly = json.has("friendsonly");
-        jmsg.ReadOnly = json.has("readonly");
-
-        jmsg.setText(json.getString("body").replace("&quot;", "\""));
-        jmsg.setUser(userSerializer.deserialize(json.getJSONObject("user")));
-
-        jmsg.setDate(df.parse(json.getString("timestamp")));
-
-        if (json.has("tags")) {
-            JSONArray tags = json.getJSONArray("tags");
-            for (int n = 0; n < tags.length(); n++) {
-                jmsg.getTags().add(new Tag(tags.getString(n).replace("&quot;", "\"")));
-            }
-        }
-
-        if (json.has("replies")) {
-            jmsg.Replies = json.getInt("replies");
-        }
-
-        if (json.has("photo")) {
-            jmsg.Photo = json.getJSONObject("photo").getString("small");
-        }
-
-        return jmsg;
-    }
-
-    @Override
-    public JSONObject serialize(Message msg) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (msg.getMid() > 0) {
-                json.put("mid", msg.getMid());
-            }
-            if (msg.getRid() > 0) {
-                json.put("rid", msg.getRid());
-            }
-            if (msg.getReplyto() > 0) {
-                json.put("replyto", msg.getReplyto());
-            }
-            if (msg.FriendsOnly) {
-                json.put("friendsonly", 1);
-            }
-            if (msg.ReadOnly) {
-                json.put("readonly", 1);
-            }
-            if (msg.getText() != null) {
-                json.put("body", msg.getText());
-            }
-            if (msg.getDate() != null) {
-                json.put("timestamp", df.format(msg.getDate()));
-            }
-            if (msg.getUser() != null) {
-                json.put("user", userSerializer.serialize(msg.getUser()));
-            }
-            if (msg.getTags() != null && msg.getTags().size() > 0) {
-                json.put("tags", new JSONArray(msg.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
-            }
-            if (msg.Replies > 0) {
-                json.put("replies", msg.Replies);
-            }
-            if (msg.Place != null) {
-                json.put("place", placeSerializer.serialize(msg.Place));
-            }
-            if (msg.AttachmentType != null) {
-                String fname = msg.getMid() + (msg.getRid() > 0 ? "-" + msg.getRid() : "") + "." + msg.AttachmentType;
-                JSONObject photo = new JSONObject();
-                String protocol = getUriScheme() == URIScheme.Plain ? "http:" : "https:";
-                photo.put("thumbnail", protocol + "//i.juick.com/ps/" + fname);
-                photo.put("small", protocol + "//i.juick.com/photos-512/" + fname);
-                photo.put("medium", protocol + "//i.juick.com/photos-1024/" + fname);
-                json.put("photo", photo);
-            }
-        } catch (JSONException e) {
-            LOGGER.error("JSON Exception", e);
-        }
-
-        return json;
-    }
-
-    public SimpleDateFormat getDf() {
-        return df;
-    }
-}
-- 
cgit v1.2.3