From 01de09dcdf4a746bac66e1f700f8c6eb2c96c6ae Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 31 Jul 2017 17:31:42 +0500
Subject: - Rename QueryAdditional to QueryExtended - Use
 Introspector.decapitalize - Replace new lines with spaces - Fixed indentation
 - Fixed extended query name

---
 src/org/traccar/model/Device.java | 4 ++--
 src/org/traccar/model/User.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/org/traccar/model')

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;
     }
-- 
cgit v1.2.3