diff options
| author | AngeloBAN <angelo@ban.org> | 2017-03-26 03:52:28 +0000 |
|---|---|---|
| committer | AngeloBAN <angelo@ban.org> | 2017-03-26 03:52:28 +0000 |
| commit | 242db57805979426f3c9b3dd88ca8fbcfe66376e (patch) | |
| tree | 4e2ac5a1c5b27777443fbe96baf848b9266ea71a /src | |
| parent | f094a26a9f66a85ee3111a4c8ca8a46276cdf968 (diff) | |
| download | traccar-server-242db57805979426f3c9b3dd88ca8fbcfe66376e.tar.gz traccar-server-242db57805979426f3c9b3dd88ca8fbcfe66376e.tar.bz2 traccar-server-242db57805979426f3c9b3dd88ca8fbcfe66376e.zip | |
Replace deprecated JsonSerialize with JsonInclude
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/model/CellTower.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/model/Network.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/model/WifiAccessPoint.java | 4 |
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) { |