Make PermissionRegistry mutable, so other startup modules may add permissions.

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.permissions;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,15 +19,19 @@ import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
- * An immutable collection of Permission objects, keyed by URI. Resides in the
+ * A collection of Permission objects, keyed by URI. Resides in the
  * ServletContext.
  * 
- * This is not thread-safe, so all Permissions should be added during context
+ * This is not thread-safe, so Permissions should be added only during context
  * initialization.
  */
 public class PermissionRegistry {
 	private static final Log log = LogFactory.getLog(PermissionRegistry.class);
 
+	// ----------------------------------------------------------------------
+	// The factory
+	// ----------------------------------------------------------------------
+
 	private static final String ATTRIBUTE_NAME = PermissionRegistry.class
 			.getName();
 
@@ -55,7 +58,8 @@ public class PermissionRegistry {
 					"PermissionRegistry has already been set.");
 		}
 
-		PermissionRegistry registry = new PermissionRegistry(permissions);
+		PermissionRegistry registry = new PermissionRegistry();
+		registry.addPermissions(permissions);
 		ctx.setAttribute(ATTRIBUTE_NAME, registry);
 	}
 
@@ -80,11 +84,27 @@ public class PermissionRegistry {
 		return (PermissionRegistry) o;
 	}
 
-	private final Map<String, Permission> permissionsMap;
+	// ----------------------------------------------------------------------
+	// The instance
+	// ----------------------------------------------------------------------
 
-	public PermissionRegistry(Collection<? extends Permission> permissions) {
+	private final Map<String, Permission> map = new HashMap<>();
-		Map<String, Permission> map = new HashMap<String, Permission>();
+
+	/**
+	 * This class is not thread-safe, so permissions should be added only during
+	 * context initialization.
+	 */
+	public void addPermissions(Collection<? extends Permission> permissions) {
 		for (Permission p : permissions) {
+			addPermission(p);
+		}
+	}
+
+	/**
+	 * This class is not thread-safe, so permissions should be added only during
+	 * context initialization.
+	 */
+	public void addPermission(Permission p) {
 		String uri = p.getUri();
 		if (map.containsKey(uri)) {
 			throw new IllegalStateException("A Permission is already "
@@ -92,14 +112,12 @@ public class PermissionRegistry {
 		}
 		map.put(uri, p);
 	}
-		this.permissionsMap = Collections.unmodifiableMap(map);
-	}
 
 	/**
 	 * Is there a Permission registered with this URI?
 	 */
 	public boolean isPermission(String uri) {
-		return permissionsMap.containsKey(uri);
+		return map.containsKey(uri);
 	}
 
 	/**
@@ -110,7 +128,7 @@ public class PermissionRegistry {
 	 * this URI, call isPermission() instead.
 	 */
 	public Permission getPermission(String uri) {
-		Permission p = permissionsMap.get(uri);
+		Permission p = map.get(uri);
 		if (p == null) {
 			log.warn("No Permission is registered for '" + uri + "'");
 			return new BrokenPermission(uri);