aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/model
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-07-12 16:50:26 -0700
committerAnton Tananaev <anton@traccar.org>2022-07-12 16:50:26 -0700
commit98e2db95f73cb85a2623e2902741bcb4e73683e5 (patch)
tree36ead5bf6716e638f0e998f2fbd3074250b82898 /src/main/java/org/traccar/model
parent3f46f759c24746ddd2b8cd05cfc6cb99d5f7fd48 (diff)
downloadtrackermap-server-98e2db95f73cb85a2623e2902741bcb4e73683e5.tar.gz
trackermap-server-98e2db95f73cb85a2623e2902741bcb4e73683e5.tar.bz2
trackermap-server-98e2db95f73cb85a2623e2902741bcb4e73683e5.zip
Remove extended query annotation
Diffstat (limited to 'src/main/java/org/traccar/model')
-rw-r--r--src/main/java/org/traccar/model/Device.java3
-rw-r--r--src/main/java/org/traccar/model/User.java9
2 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/model/Device.java b/src/main/java/org/traccar/model/Device.java
index 219f078ed..35eb757f2 100644
--- a/src/main/java/org/traccar/model/Device.java
+++ b/src/main/java/org/traccar/model/Device.java
@@ -18,7 +18,6 @@ package org.traccar.model;
import java.util.Date;
import java.util.List;
-import org.traccar.storage.QueryExtended;
import org.traccar.storage.QueryIgnore;
import org.traccar.storage.StorageName;
@@ -67,7 +66,7 @@ public class Device extends GroupedModel {
return this.lastUpdate;
}
- @QueryExtended
+ @QueryIgnore
public void setLastUpdate(Date lastUpdate) {
this.lastUpdate = lastUpdate;
}
diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java
index 12fd03d45..9dd84ad14 100644
--- a/src/main/java/org/traccar/model/User.java
+++ b/src/main/java/org/traccar/model/User.java
@@ -17,7 +17,6 @@ package org.traccar.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.traccar.storage.QueryExtended;
import org.traccar.storage.QueryIgnore;
import org.traccar.helper.Hashing;
import org.traccar.storage.StorageName;
@@ -271,12 +270,12 @@ public class User extends ExtendedModel implements UserRestrictions {
private String hashedPassword;
@JsonIgnore
- @QueryExtended
+ @QueryIgnore
public String getHashedPassword() {
return hashedPassword;
}
- @QueryExtended
+ @QueryIgnore
public void setHashedPassword(String hashedPassword) {
this.hashedPassword = hashedPassword;
}
@@ -284,12 +283,12 @@ public class User extends ExtendedModel implements UserRestrictions {
private String salt;
@JsonIgnore
- @QueryExtended
+ @QueryIgnore
public String getSalt() {
return salt;
}
- @QueryExtended
+ @QueryIgnore
public void setSalt(String salt) {
this.salt = salt;
}