aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-31 17:31:42 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-31 17:31:42 +0500
commit01de09dcdf4a746bac66e1f700f8c6eb2c96c6ae (patch)
treeba5b3f3b1c476b47921a1bc7d8cb0595988766bf /src/org/traccar/model
parentae76cbf971bfc9e47ef21e87606dacc7c0e3ddc6 (diff)
downloadtrackermap-server-01de09dcdf4a746bac66e1f700f8c6eb2c96c6ae.tar.gz
trackermap-server-01de09dcdf4a746bac66e1f700f8c6eb2c96c6ae.tar.bz2
trackermap-server-01de09dcdf4a746bac66e1f700f8c6eb2c96c6ae.zip
- Rename QueryAdditional to QueryExtended
- Use Introspector.decapitalize - Replace new lines with spaces - Fixed indentation - Fixed extended query name
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/Device.java4
-rw-r--r--src/org/traccar/model/User.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index cd5dd12c4..c8a28404c 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -18,7 +18,7 @@ package org.traccar.model;
import java.util.Date;
import java.util.List;
-import org.traccar.database.QueryAdditional;
+import org.traccar.database.QueryExtended;
import org.traccar.database.QueryIgnore;
public class Device extends ExtendedModel {
@@ -60,7 +60,7 @@ public class Device extends ExtendedModel {
private Date lastUpdate;
- @QueryAdditional
+ @QueryExtended
public Date getLastUpdate() {
if (lastUpdate != null) {
return new Date(lastUpdate.getTime());
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 72b53ee5d..b71666f87 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -17,7 +17,7 @@ package org.traccar.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.traccar.database.QueryAdditional;
+import org.traccar.database.QueryExtended;
import org.traccar.database.QueryIgnore;
import org.traccar.helper.Hashing;
@@ -247,7 +247,7 @@ public class User extends ExtendedModel {
private String hashedPassword;
@JsonIgnore
- @QueryAdditional
+ @QueryExtended
public String getHashedPassword() {
return hashedPassword;
}
@@ -259,7 +259,7 @@ public class User extends ExtendedModel {
private String salt;
@JsonIgnore
- @QueryAdditional
+ @QueryExtended
public String getSalt() {
return salt;
}