From 052f8508ab2c8995d135edb7f8207073332e1e96 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 12 Dec 2016 23:22:55 +0300
Subject: juick-ws: using json serialization

---
 juick-ws/build.gradle                                   | 1 -
 juick-ws/src/main/java/com/juick/ws/XMPPConnection.java | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'juick-ws')

diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
index 7551d409..ff26252b 100644
--- a/juick-ws/build.gradle
+++ b/juick-ws/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'com.github.ben-manes.versions'
 
 dependencies {
     compile project(':juick-server')
-    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${rootProject.jacksonVersion}"
     compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}"
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
diff --git a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
index cd79ab08..7b456c3e 100644
--- a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
@@ -2,7 +2,6 @@ package com.juick.ws;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.juick.User;
 import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
@@ -56,7 +55,7 @@ public class XMPPConnection implements AutoCloseable {
         xmppPort = NumberUtils.toInt(env.getProperty("xmpp_port"), 5347);
         wsJid = env.getProperty("ws_jid", "ws.juick.local");
 
-        ms = new XmlMapper();
+        ms = new ObjectMapper();
 
         XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
                 .extensions(Extension.of(com.juick.Message.class))
-- 
cgit v1.2.3