From 54e738d3281a463a0ea3fcf2026c2464529a9b58 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 19 Dec 2016 08:01:20 +1300
Subject: Remove own JSON converter

---
 src/org/traccar/WebDataHandler.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/WebDataHandler.java')

diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index f99d7c97a..eaf0978ef 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -15,10 +15,10 @@
  */
 package org.traccar;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.traccar.helper.Checksum;
 import org.traccar.helper.Log;
 import org.traccar.model.Device;
-import org.traccar.model.MiscFormatter;
 import org.traccar.model.Position;
 
 import java.io.UnsupportedEncodingException;
@@ -77,8 +77,6 @@ public class WebDataHandler extends BaseDataHandler {
 
         Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
 
-        String attributes = MiscFormatter.toJsonString(position.getAttributes());
-
         String request = url
                 .replace("{name}", device.getName())
                 .replace("{uniqueId}", device.getUniqueId())
@@ -105,9 +103,10 @@ public class WebDataHandler extends BaseDataHandler {
 
         if (request.contains("{attributes}")) {
             try {
+                String attributes = Context.getObjectMapper().writeValueAsString(position.getAttributes());
                 request = request.replace(
                         "{attributes}", URLEncoder.encode(attributes, StandardCharsets.UTF_8.name()));
-            } catch (UnsupportedEncodingException error) {
+            } catch (UnsupportedEncodingException | JsonProcessingException error) {
                 Log.warning(error);
             }
         }
-- 
cgit v1.2.3