From 63b14e7818a20d598e4634a0ee686376d7f687b2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 4 Nov 2015 15:18:41 +0300
Subject: drop gson, refactoring

---
 src/main/java/com/juick/api/Messages.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/juick/api/Messages.java')

diff --git a/src/main/java/com/juick/api/Messages.java b/src/main/java/com/juick/api/Messages.java
index b7a55361..548e816f 100644
--- a/src/main/java/com/juick/api/Messages.java
+++ b/src/main/java/com/juick/api/Messages.java
@@ -1,5 +1,6 @@
 package com.juick.api;
 
+import com.juick.json.MessageSerializer;
 import com.juick.server.MessagesQueries;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
@@ -19,6 +20,8 @@ import javax.servlet.http.HttpServletResponse;
 public class Messages {
 
     Connection sql;
+    
+    MessageSerializer messageSerializer = new MessageSerializer();
 
     public Messages(Connection sql) {
         this.sql = sql;
@@ -31,7 +34,7 @@ public class Messages {
         if (mids != null && !mids.isEmpty()) {
             ArrayList<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids);
             if (msgs != null && !msgs.isEmpty()) {
-                String json = com.juick.json.Messages.arrayToString(msgs);
+                String json = messageSerializer.serializeList(msgs);
                 Main.replyJSON(request, response, json);
             } else {
                 response.sendError(404);
@@ -48,7 +51,7 @@ public class Messages {
         if (mids != null && !mids.isEmpty()) {
             ArrayList<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids);
             if (msgs != null && !msgs.isEmpty()) {
-                String json = com.juick.json.Messages.arrayToString(msgs);
+                String json = messageSerializer.serializeList(msgs);
                 Main.replyJSON(request, response, json);
             } else {
                 response.sendError(404);
-- 
cgit v1.2.3