aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/traccar/model/Device.java3
-rw-r--r--src/main/java/org/traccar/model/User.java9
-rw-r--r--src/main/java/org/traccar/storage/QueryExtended.java27
-rw-r--r--src/main/java/org/traccar/storage/query/Columns.java2
4 files changed, 5 insertions, 36 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;
}
diff --git a/src/main/java/org/traccar/storage/QueryExtended.java b/src/main/java/org/traccar/storage/QueryExtended.java
deleted file mode 100644
index 3796f1f40..000000000
--- a/src/main/java/org/traccar/storage/QueryExtended.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.storage;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface QueryExtended {
-}
diff --git a/src/main/java/org/traccar/storage/query/Columns.java b/src/main/java/org/traccar/storage/query/Columns.java
index 97ca13be9..545995b3c 100644
--- a/src/main/java/org/traccar/storage/query/Columns.java
+++ b/src/main/java/org/traccar/storage/query/Columns.java
@@ -15,7 +15,6 @@
*/
package org.traccar.storage.query;
-import org.traccar.storage.QueryExtended;
import org.traccar.storage.QueryIgnore;
import java.lang.reflect.Method;
@@ -36,7 +35,6 @@ public abstract class Columns {
int parameterCount = type.equals("set") ? 1 : 0;
if (method.getName().startsWith(type) && method.getParameterTypes().length == parameterCount
&& !method.isAnnotationPresent(QueryIgnore.class)
- && !method.isAnnotationPresent(QueryExtended.class)
&& !method.getName().equals("getClass")) {
columns.add(method.getName().substring(3).toLowerCase());
}