X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FSimpleArgeoUser.java;h=29166472146f8bd3e6e39aa30597da0c2b6f835d;hb=8b78007039ccb1f19d498742a64cf62435e8b093;hp=a11081cbd2fe58888a76233812edd7730147f1f2;hpb=f516f257ad75279a2d14ab3d39e041637f10219d;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 a11081cbd..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
@@ -1,15 +1,41 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import org.argeo.ArgeoException;
 
-public class SimpleArgeoUser implements ArgeoUser, Serializable {
+/**
+ * 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;
 	private String password;
-	private List<UserNature> userNatures = new ArrayList<UserNature>();
+	private Map<String, UserNature> userNatures = new HashMap<String, UserNature>();
 	private List<String> roles = new ArrayList<String>();
 
 	public SimpleArgeoUser() {
@@ -19,16 +45,59 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 	public SimpleArgeoUser(ArgeoUser argeoUser) {
 		username = argeoUser.getUsername();
 		password = argeoUser.getPassword();
-		userNatures = new ArrayList<UserNature>(argeoUser.getUserNatures());
+		userNatures = new HashMap<String, UserNature>(
+				argeoUser.getUserNatures());
 		roles = new ArrayList<String>(argeoUser.getRoles());
 	}
 
-	public List<UserNature> getUserNatures() {
+	public Map<String, UserNature> getUserNatures() {
 		return userNatures;
 	}
 
-	public void updateUserNatures(List<UserNature> userNaturesData) {
-		UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+	@Deprecated
+	public void updateUserNatures(Map<String, UserNature> 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() {
@@ -43,7 +112,8 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
 		this.username = username;
 	}
 
-	public void setUserNatures(List<UserNature> userNatures) {
+	@Deprecated
+	public void setUserNatures(Map<String, UserNature> userNatures) {
 		this.userNatures = userNatures;
 	}