X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FSimpleArgeoUser.java;h=29166472146f8bd3e6e39aa30597da0c2b6f835d;hb=8b78007039ccb1f19d498742a64cf62435e8b093;hp=19c45dfbad0e0aeb7087272bb90cc28823894bc8;hpb=79d37fb873ba8ebaafe64c924f53bc9c76ea6d8c;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
index 19c45dfba..291664721 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
@@ -22,7 +22,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class SimpleArgeoUser implements ArgeoUser, Serializable {
+import org.argeo.ArgeoException;
+
+/**
+ * Read-write implementation of an Argeo user. Typically initialized with a
+ * generic instance (read-only9 in order to modify a user.
+ */
+@Deprecated
+public class SimpleArgeoUser implements ArgeoUser, Serializable,
+		Comparable<ArgeoUser> {
 	private static final long serialVersionUID = 1L;
 
 	private String username;
@@ -46,8 +54,50 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 		return userNatures;
 	}
 
+	@Deprecated
 	public void updateUserNatures(Map<String, UserNature> userNaturesData) {
-		UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+		updateUserNaturesWithCheck(userNatures, userNaturesData);
+	}
+
+	@Deprecated
+	public static void updateUserNaturesWithCheck(
+			Map<String, UserNature> userNatures,
+			Map<String, UserNature> userNaturesData) {
+		// checks consistency
+		if (userNatures.size() != userNaturesData.size())
+			throw new ArgeoException(
+					"It is forbidden to add or remove user natures via this method");
+
+		for (String type : userNatures.keySet()) {
+			if (!userNaturesData.containsKey(type))
+				throw new ArgeoException(
+						"Could not find a user nature of type " + type);
+		}
+
+		for (String key : userNatures.keySet()) {
+			userNatures.put(key, userNaturesData.get(key));
+		}
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof ArgeoUser))
+			return false;
+		return ((ArgeoUser) obj).getUsername().equals(username);
+	}
+
+	public int compareTo(ArgeoUser o) {
+		return username.compareTo(o.getUsername());
+	}
+
+	@Override
+	public int hashCode() {
+		return username.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return username;
 	}
 
 	public List<String> getRoles() {
@@ -62,6 +112,7 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 		this.username = username;
 	}
 
+	@Deprecated
 	public void setUserNatures(Map<String, UserNature> userNatures) {
 		this.userNatures = userNatures;
 	}