Implement JSON conversion

3 files changed, 35 insertions, 25 deletions

diff --git a/src/org/traccar/database/JsonConvertable.java b/src/org/traccar/database/JsonConvertable.java
new file mode 100644
index 000000000..37af9a617
--- /dev/null
+++ b/src/org/traccar/database/JsonConvertable.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import javax.json.JsonObject;
+
+public interface JsonConvertable {
+    
+    public static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ");
+    
+    public JsonObject toJson();
+    
+    public void fromJson(JsonObject json) throws Exception;
+    
+}
diff --git a/src/org/traccar/database/ObjectConverter.java b/src/org/traccar/database/ObjectConverter.java
index bd5b03064..4ab83faec 100644
--- a/src/org/traccar/database/ObjectConverter.java
+++ b/src/org/traccar/database/ObjectConverter.java
@@ -15,37 +15,19 @@
  */
 package org.traccar.database;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import org.traccar.model.Position;
 
 public class ObjectConverter {
     
-    private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ");
-    
-    public static JsonArray convert(Collection<Position> positions) {
+    public static JsonArray convert(Collection<? extends JsonConvertable> collection) {
         
         JsonArrayBuilder array = Json.createArrayBuilder();
         
-        for (Position position : positions) {
-            JsonObjectBuilder object = Json.createObjectBuilder();
-            
-            //object.add("id", position.getId());
-            object.add("time", dateFormat.format(position.getFixTime()));
-            object.add("valid", position.getValid());
-            object.add("latitude", position.getLatitude());
-            object.add("longitude", position.getLongitude());
-            object.add("altitude", position.getAltitude());
-            object.add("speed", position.getSpeed());
-            object.add("course", position.getCourse());
-            //object.add("other", position.getExtendedInfo());
-            
-            array.add(object.build());
+        for (JsonConvertable object : collection) {
+            array.add(object.toJson());
         }
         
         return array.build();
diff --git a/src/org/traccar/database/ResultSetConverter.java b/src/org/traccar/database/ResultSetConverter.java
index e4aec956c..92cb8fa4e 100644
--- a/src/org/traccar/database/ResultSetConverter.java
+++ b/src/org/traccar/database/ResultSetConverter.java
@@ -26,8 +26,6 @@ import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
 
 public class ResultSetConverter {
-    
-    private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ");
 
     public static JsonArray convert(ResultSet rs) throws SQLException {
 
@@ -66,10 +64,10 @@ public class ResultSetConverter {
                         obj.add(columnName, rs.getString(columnName));
                         break;
                     case java.sql.Types.DATE:
-                        obj.add(columnName, dateFormat.format(rs.getDate(columnName)));
+                        obj.add(columnName, JsonConvertable.dateFormat.format(rs.getDate(columnName)));
                         break;
                     case java.sql.Types.TIMESTAMP:
-                        obj.add(columnName, dateFormat.format(rs.getTimestamp(columnName)));
+                        obj.add(columnName, JsonConvertable.dateFormat.format(rs.getTimestamp(columnName)));
                         break;
                     default:
                         break;