aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-04-16 11:24:54 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-04-16 11:24:54 +1200
commit30f10f12d32915d74e36b4bf336e4e2d7ac3aada (patch)
tree995c926096db04c6b3e90b58bcb6a6f7db1bb322 /src/org/traccar/model
parentfdd2fdf77cc5152986e26abf79f348b23b24ca64 (diff)
downloadtrackermap-server-30f10f12d32915d74e36b4bf336e4e2d7ac3aada.tar.gz
trackermap-server-30f10f12d32915d74e36b4bf336e4e2d7ac3aada.tar.bz2
trackermap-server-30f10f12d32915d74e36b4bf336e4e2d7ac3aada.zip
Remove old web API service
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/User.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index f22a2e632..287de121c 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -15,8 +15,8 @@
*/
package org.traccar.model;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.traccar.helper.Hashing;
-import org.traccar.web.JsonIgnore;
public class User {
@@ -157,7 +157,6 @@ public class User {
private String hashedPassword;
- @com.fasterxml.jackson.annotation.JsonIgnore
@JsonIgnore
public String getHashedPassword() {
return hashedPassword;
@@ -169,7 +168,6 @@ public class User {
private String salt;
- @com.fasterxml.jackson.annotation.JsonIgnore
@JsonIgnore
public String getSalt() {
return salt;