Merge pull request #1252 from demianalonso/password-salt

Implemented password hashing with salt

1 files changed, 5 insertions, 0 deletions

diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/http/JsonConverter.java
index 6cdba5492..f18470d9d 100644
--- a/src/org/traccar/http/JsonConverter.java
+++ b/src/org/traccar/http/JsonConverter.java
@@ -30,6 +30,8 @@ import javax.json.JsonArrayBuilder;
 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 {
@@ -88,6 +90,9 @@ public class JsonConverter {
         Method[] methods = object.getClass().getMethods();
         
         for (Method method : methods) {
+            if(method.isAnnotationPresent(IgnoreOnSerialization.class)) {
+                continue;
+            }
             if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) {
                 String name = Introspector.decapitalize(method.getName().substring(3));
                 try {