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/model/MiscFormatter.java | 75 +-------------------------------
 1 file changed, 1 insertion(+), 74 deletions(-)

(limited to 'src/org/traccar/model/MiscFormatter.java')

diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java
index 6194a998f..c6511f063 100644
--- a/src/org/traccar/model/MiscFormatter.java
+++ b/src/org/traccar/model/MiscFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,10 @@
  */
 package org.traccar.model;
 
-import org.traccar.helper.Log;
-import org.traccar.web.JsonConverter;
 
-import javax.json.Json;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonString;
-import javax.json.JsonValue;
 import java.text.DecimalFormat;
-import java.util.LinkedHashMap;
 import java.util.Map;
 
-/**
- * Format extended tracker status
- */
 public final class MiscFormatter {
 
     private MiscFormatter() {
@@ -65,65 +53,4 @@ public final class MiscFormatter {
         return result.toString();
     }
 
-    public static JsonObject toJson(Map<String, Object> attributes) {
-        JsonObjectBuilder json = Json.createObjectBuilder();
-
-        for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-            if (entry.getValue() instanceof String) {
-                json.add(entry.getKey(), (String) entry.getValue());
-            } else if (entry.getValue() instanceof Integer) {
-                json.add(entry.getKey(), (Integer) entry.getValue());
-            } else if (entry.getValue() instanceof Long) {
-                json.add(entry.getKey(), (Long) entry.getValue());
-            } else if (entry.getValue() instanceof Double) {
-                json.add(entry.getKey(), (Double) entry.getValue());
-            } else if (entry.getValue() instanceof Boolean) {
-                json.add(entry.getKey(), (Boolean) entry.getValue());
-            } else if (entry.getValue() == null) {
-                json.add(entry.getKey(), JsonValue.NULL);
-            } else {
-                json.add(entry.getKey(), JsonConverter.objectToJson(entry.getValue()));
-            }
-        }
-
-        return json.build();
-    }
-
-    public static Map<String, Object> fromJson(JsonObject json) {
-
-        Map<String, Object> attributes = new LinkedHashMap<>();
-
-        for (Map.Entry<String, JsonValue> entry : json.entrySet()) {
-            JsonValue.ValueType type = entry.getValue().getValueType();
-            switch (type) {
-                case STRING:
-                    attributes.put(entry.getKey(), ((JsonString) entry.getValue()).getString());
-                    break;
-                case NUMBER:
-                    JsonNumber number = (JsonNumber) entry.getValue();
-                    if (number.isIntegral()) {
-                        attributes.put(entry.getKey(), number.longValue());
-                    } else {
-                        attributes.put(entry.getKey(), number.doubleValue());
-                    }
-                    break;
-                case TRUE:
-                    attributes.put(entry.getKey(), true);
-                    break;
-                case FALSE:
-                    attributes.put(entry.getKey(), false);
-                    break;
-                default:
-                    Log.warning(new IllegalArgumentException(type.name()));
-                    break;
-            }
-        }
-
-        return attributes;
-    }
-
-    public static String toJsonString(Map<String, Object> attributes) {
-        return toJson(attributes).toString();
-    }
-
 }
-- 
cgit v1.2.3