aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-03-26 18:57:18 +1300
committerGitHub <noreply@github.com>2017-03-26 18:57:18 +1300
commit661ff639ad42c9aafbee918cc374d39b9aee871b (patch)
treeab18c84c814284959a4661cb4a0a60cb05e66c21 /src
parentca071f5d23776b6680366217b226dc019308f10b (diff)
parent242db57805979426f3c9b3dd88ca8fbcfe66376e (diff)
downloadtrackermap-server-661ff639ad42c9aafbee918cc374d39b9aee871b.tar.gz
trackermap-server-661ff639ad42c9aafbee918cc374d39b9aee871b.tar.bz2
trackermap-server-661ff639ad42c9aafbee918cc374d39b9aee871b.zip
Merge pull request #3055 from AngeloBAN/JsonFixes
Replace deprecated JsonSerialize with JsonInclude
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/model/CellTower.java4
-rw-r--r--src/org/traccar/model/Network.java4
-rw-r--r--src/org/traccar/model/WifiAccessPoint.java4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/model/CellTower.java b/src/org/traccar/model/CellTower.java
index 53866b59a..2eb56dd33 100644
--- a/src/org/traccar/model/CellTower.java
+++ b/src/org/traccar/model/CellTower.java
@@ -15,10 +15,10 @@
*/
package org.traccar.model;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
import org.traccar.Context;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class CellTower {
public static CellTower from(int mcc, int mnc, int lac, long cid) {
diff --git a/src/org/traccar/model/Network.java b/src/org/traccar/model/Network.java
index c5be95887..2d56950f1 100644
--- a/src/org/traccar/model/Network.java
+++ b/src/org/traccar/model/Network.java
@@ -15,12 +15,12 @@
*/
package org.traccar.model;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.ArrayList;
import java.util.Collection;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class Network {
public Network() {
diff --git a/src/org/traccar/model/WifiAccessPoint.java b/src/org/traccar/model/WifiAccessPoint.java
index b18705420..87a77f3c0 100644
--- a/src/org/traccar/model/WifiAccessPoint.java
+++ b/src/org/traccar/model/WifiAccessPoint.java
@@ -15,9 +15,9 @@
*/
package org.traccar.model;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class WifiAccessPoint {
public static WifiAccessPoint from(String macAddress, int signalStrength) {