Merge pull request #3402 from Abyss777/construct_requests

Implement SQL requests construction

1 files changed, 6 insertions, 0 deletions

diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 6e6a079c2..b71666f87 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -16,6 +16,9 @@
 package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import org.traccar.database.QueryExtended;
+import org.traccar.database.QueryIgnore;
 import org.traccar.helper.Hashing;
 
 import java.util.Date;
@@ -228,6 +231,7 @@ public class User extends ExtendedModel {
         }
     }
 
+    @QueryIgnore
     public String getPassword() {
         return null;
     }
@@ -243,6 +247,7 @@ public class User extends ExtendedModel {
     private String hashedPassword;
 
     @JsonIgnore
+    @QueryExtended
     public String getHashedPassword() {
         return hashedPassword;
     }
@@ -254,6 +259,7 @@ public class User extends ExtendedModel {
     private String salt;
 
     @JsonIgnore
+    @QueryExtended
     public String getSalt() {
         return salt;
     }