diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-01 12:07:09 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-01 12:07:09 +1200 |
commit | e2df061ec7d8e4ff21c9a033985d9ca56118556e (patch) | |
tree | 68f7dfd7bf2e40545606e52fdc97dbbb56351f6e /src/org/traccar/http | |
parent | 200ef5bb3fd4f194c47518e0633d7e8bb6ab6d79 (diff) | |
download | trackermap-server-e2df061ec7d8e4ff21c9a033985d9ca56118556e.tar.gz trackermap-server-e2df061ec7d8e4ff21c9a033985d9ca56118556e.tar.bz2 trackermap-server-e2df061ec7d8e4ff21c9a033985d9ca56118556e.zip |
Minor changes to password management
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r-- | src/org/traccar/http/JsonConverter.java | 3 | ||||
-rw-r--r-- | src/org/traccar/http/JsonIgnore.java | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/http/JsonConverter.java index eb672da8d..d658ef7d6 100644 --- a/src/org/traccar/http/JsonConverter.java +++ b/src/org/traccar/http/JsonConverter.java @@ -31,7 +31,6 @@ import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; -import org.traccar.helper.IgnoreOnSerialization; import org.traccar.model.Factory; public class JsonConverter { @@ -106,7 +105,7 @@ public class JsonConverter { Method[] methods = object.getClass().getMethods(); for (Method method : methods) { - if(method.isAnnotationPresent(IgnoreOnSerialization.class)) { + if(method.isAnnotationPresent(JsonIgnore.class)) { continue; } if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) { diff --git a/src/org/traccar/http/JsonIgnore.java b/src/org/traccar/http/JsonIgnore.java new file mode 100644 index 000000000..ad7791e0d --- /dev/null +++ b/src/org/traccar/http/JsonIgnore.java @@ -0,0 +1,12 @@ +package org.traccar.http; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; + +@Retention(RetentionPolicy.RUNTIME) +@Target(value = {METHOD}) +public @interface JsonIgnore { +} |