Explore JSon approach

git-svn-id: https://svn.argeo.org/commons/trunk@2927 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
index e2487b9ba7051b36b6a54d6d78a4c67dc585e85d..f0bff97e8bf9547274f8fbe5254a24a69ddf26a5 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserNature.java
@@ -4,10 +4,6 @@ import java.util.UUID;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonMethod;
 
 //@JsonAutoDetect(value = { JsonMethod.GETTER, JsonMethod.SETTER })
 public class UserNature {
@@ -35,16 +31,10 @@ public class UserNature {
                this.type = type;
        }
 
-       @JsonAnySetter
-       public void anySetter(String key, Object obj) {
-               if (obj != null)
-                       log.info("anySetter: " + key + "=" + obj + " (" + obj.getClass()
-                                       + "), natureType=" + type);
-       }
-
-       @JsonCreator
-       public static Object valueOf(String str) {
-               log.info("create: " + str);
-               return new UserNature();
-       }
+//     @JsonAnySetter
+//     public void anySetter(String key, Object obj) {
+//             if (obj != null)
+//                     log.info("anySetter: " + key + "=" + obj + " (" + obj.getClass()
+//                                     + "), natureType=" + type);
+//     }
 }

diff --git a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java b/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java
index 02b2529bbe0303131738bea640038ac33e8ef63b..956bc578f24c8244ec66dc1f361da686eb9086e4 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java
+++ b/security/runtime/org.argeo.security.core/src/test/java/org/argeo/security/json/ArgeoUserJsonTest.java
@@ -61,8 +61,30 @@ public class ArgeoUserJsonTest extends TestCase {
                // BasicArgeoUser aud = objectMapper.readValue(audJo,
                // BasicArgeoUser.class);
 
-               ArgeoUserMapper argeoUserMapper = new ArgeoUserMapper();
-               ArgeoUser argeoUserDes = argeoUserMapper.parse(audJo);
+               ArgeoUserMapper aum = new ArgeoUserMapper();
+               ArgeoUser aud = aum.parse(audJo);
+
+               assertEquals(argeoUser.getUsername(), aud.getUsername());
+               assertEquals(argeoUser.getRoles().size(), aud.getRoles().size());
+               assertEquals(argeoUser.getUserNatures().size(), aud.getUserNatures()
+                               .size());
+
+               assertSimpleUserNature((SimpleUserNature) argeoUser.getUserNatures()
+                               .get(0), (SimpleUserNature) aud.getUserNatures().get(0));
+               assertCoworkerNature(
+                               (CoworkerNature) argeoUser.getUserNatures().get(1),
+                               (CoworkerNature) aud.getUserNatures().get(1));
+
+       }
+
+       public static void assertSimpleUserNature(SimpleUserNature expected,
+                       SimpleUserNature reached) {
+               assertEquals(expected.getEmail(), reached.getEmail());
+       }
+
+       public static void assertCoworkerNature(CoworkerNature expected,
+                       CoworkerNature reached) {
+               assertEquals(expected.getMobile(), reached.getMobile());
        }
 
        public void testSeriDeserialize() {