X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FUserNature.java;h=3713fdc79142b561bd960663f4dc0ec66d3b9322;hb=4a045d66694bcb80968158dc82344f3906fce530;hp=e2487b9ba7051b36b6a54d6d78a4c67dc585e85d;hpb=62a87e0195f69747aa5168ebecfebd8626442ba8;p=lgpl%2Fargeo-commons.git

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 e2487b9ba..3713fdc79 100644
--- 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
@@ -1,29 +1,15 @@
 package org.argeo.security;
 
-import java.util.UUID;
+import java.io.Serializable;
+import java.util.List;
 
-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;
+import org.argeo.ArgeoException;
 
-//@JsonAutoDetect(value = { JsonMethod.GETTER, JsonMethod.SETTER })
-public class UserNature {
-	private final static Log log = LogFactory.getLog(UserNature.class);
+public class UserNature implements Serializable {
+	private static final long serialVersionUID = 1L;
 
-	private String uuid = UUID.randomUUID().toString();
 	private String type;
 
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
 	public String getType() {
 		if (type != null)
 			return type;
@@ -35,16 +21,26 @@ 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();
+	public final static void updateUserNaturesWithCheck(
+			List<UserNature> userNatures, List<UserNature> userNaturesData) {
+		if (userNatures.size() != userNaturesData.size())
+			throw new ArgeoException(
+					"It is forbidden to add or remove user natures via this method");
+		for (int i = 0; i < userNatures.size(); i++) {
+			String type = userNatures.get(i).getType();
+			boolean found = false;
+			for (int j = 0; j < userNatures.size(); j++) {
+				String newType = userNaturesData.get(j).getType();
+				if (type.equals(newType))
+					found = true;
+			}
+			if (!found)
+				throw new ArgeoException(
+						"Could not find a user nature of type " + type);
+		}
+
+		for (int i = 0; i < userNatures.size(); i++) {
+			userNatures.set(i, userNaturesData.get(i));
+		}
 	}
 }