Group code cleanup.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3529 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/group/DefaultGroupProvider.java

@@ -87,7 +87,7 @@ public class DefaultGroupProvider implements GroupProvider {
         }
         Collection<JID> members = getMembers(name, false);
         Collection<JID> administrators = getMembers(name, true);
-        return new Group(this, name, "", members, administrators);
+        return new Group(name, "", members, administrators);
     }
 
     public Group getGroup(String name) throws GroupNotFoundException {
@@ -117,7 +117,7 @@ public class DefaultGroupProvider implements GroupProvider {
         }
         Collection<JID> members = getMembers(name, false);
         Collection<JID> administrators = getMembers(name, true);
-        return new Group(this, name, description, members, administrators);
+        return new Group(name, description, members, administrators);
     }
 
     public void setDescription(String name, String description)
@@ -257,17 +257,7 @@ public class DefaultGroupProvider implements GroupProvider {
             try { if (con != null) con.close(); }
             catch (Exception e) { Log.error(e); }
         }
-        List<Group> groups = new ArrayList<Group>(groupNames.size());
-        GroupManager manager = GroupManager.getInstance();
-        for (String groupName : groupNames) {
-            try {
-                groups.add(manager.getGroup(groupName));
-            }
-            catch (GroupNotFoundException e) {
-                Log.error(e);
-            }
-        }
-        return groups;
+        return new GroupCollection(groupNames.toArray(new String[groupNames.size()]));
     }
 
     public Collection<Group> getGroups(int startIndex, int numResults) {
@@ -295,17 +285,7 @@ public class DefaultGroupProvider implements GroupProvider {
             try { if (con != null) con.close(); }
             catch (Exception e) { Log.error(e); }
         }
-        List<Group> groups = new ArrayList<Group>(groupNames.size());
-        GroupManager manager = GroupManager.getInstance();
-        for (String groupName : groupNames) {
-            try {
-                groups.add(manager.getGroup(groupName));
-            }
-            catch (GroupNotFoundException e) {
-                Log.error(e);
-            }
-        }
-        return groups;
+        return new GroupCollection(groupNames.toArray(new String[groupNames.size()]));
     }
 
     public Collection<Group> getGroups(JID user) {
@@ -331,17 +311,7 @@ public class DefaultGroupProvider implements GroupProvider {
             try { if (con != null) con.close(); }
             catch (Exception e) { Log.error(e); }
         }
-        List<Group> groups = new ArrayList<Group>(groupNames.size());
-        GroupManager manager = GroupManager.getInstance();
-        for (String groupName : groupNames) {
-            try {
-                groups.add(manager.getGroup(groupName));
-            }
-            catch (GroupNotFoundException e) {
-                Log.error(e);
-            }
-        }
-        return groups;
+        return new GroupCollection(groupNames.toArray(new String[groupNames.size()]));
     }
 
     public void addMember(String groupName, JID user, boolean administrator) {

src/java/org/jivesoftware/wildfire/group/GroupCollection.java

+/**
+ * $Revision: 691 $
+ * $Date: 2004-12-13 15:06:54 -0300 (Mon, 13 Dec 2004) $
+ *
+ * Copyright (C) 2004-2006 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Public License (GPL),
+ * a copy of which is included in this distribution.
+ */
+
+package org.jivesoftware.wildfire.group;
+
+import java.util.AbstractCollection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Provides a view of an array of group names as a Collection of Group objects. If
+ * any of the group names cannot be loaded, they are transparently skipped when
+ * iterating over the collection.
+ *
+ * @author Matt Tucker
+ */
+public class GroupCollection extends AbstractCollection {
+
+    private String[] elements;
+
+    /**
+     * Constructs a new GroupCollection.
+     */
+    public GroupCollection(String [] elements) {
+        this.elements = elements;
+    }
+
+    public Iterator iterator() {
+        return new UserIterator();
+    }
+
+    public int size() {
+        return elements.length;
+    }
+
+    private class UserIterator implements Iterator {
+
+        private int currentIndex = -1;
+        private Object nextElement = null;
+
+        public boolean hasNext() {
+            // If we are at the end of the list, there can't be any more elements
+            // to iterate through.
+            if (currentIndex + 1 >= elements.length && nextElement == null) {
+                return false;
+            }
+            // Otherwise, see if nextElement is null. If so, try to load the next
+            // element to make sure it exists.
+            if (nextElement == null) {
+                nextElement = getNextElement();
+                if (nextElement == null) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public Object next() throws java.util.NoSuchElementException {
+            Object element;
+            if (nextElement != null) {
+                element = nextElement;
+                nextElement = null;
+            }
+            else {
+                element = getNextElement();
+                if (element == null) {
+                    throw new NoSuchElementException();
+                }
+            }
+            return element;
+        }
+
+        public void remove() throws UnsupportedOperationException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Returns the next available element, or null if there are no more elements to return.
+         *
+         * @return the next available element.
+         */
+        private Object getNextElement() {
+            while (currentIndex + 1 < elements.length) {
+                currentIndex++;
+                Object element = null;
+                try {
+                    element = GroupManager.getInstance().getGroup(elements[currentIndex]);
+                }
+                catch (GroupNotFoundException unfe) {
+                    // Ignore.
+                }
+                if (element != null) {
+                    return element;
+                }
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file

src/java/org/jivesoftware/wildfire/ldap/LdapGroupProvider.java

@@ -84,14 +84,16 @@ public class LdapGroupProvider implements GroupProvider {
                 manager.getGroupNameField() + "=" + group + "))";
         Collection<Group> groups = populateGroups(searchForGroups(searchFilter, standardAttributes));
         if (groups.size() > 1) {
-            //if multiple groups found throw exception
+            // If multiple groups found, throw exception.
             throw new GroupNotFoundException("Too many groups with name " + group + " were found.");
         }
-        for (Group g : groups) {
-            return g; //returns the first group found
-        }
+        else if (groups.isEmpty()) {
             throw new GroupNotFoundException("Group with name " + group + " not found.");
         }
+        else {
+            return groups.iterator().next();
+        }
+    }
 
     /**
      * Always throws an UnsupportedOperationException because
@@ -136,6 +138,7 @@ public class LdapGroupProvider implements GroupProvider {
                 answer.next();
             }
             catch (Exception e) {
+                // Ignore.
             }
         }
 
@@ -189,8 +192,8 @@ public class LdapGroupProvider implements GroupProvider {
     }
 
     /**
-     * Always throws an UnsupportedOperationException because
-     * LDAP groups are read-only.
+     * Always throws an UnsupportedOperationException because LDAP groups
+     * are read-only.
      *
      * @param groupName name of a group.
      * @param user the JID of the user to add
@@ -204,8 +207,8 @@ public class LdapGroupProvider implements GroupProvider {
     }
 
     /**
-     * Always throws an UnsupportedOperationException because
-     * LDAP groups are read-only.
+     * Always throws an UnsupportedOperationException because LDAP groups
+     * are read-only.
      *
      * @param groupName the naame of a group.
      * @param user the JID of the user with new privileges
@@ -219,21 +222,19 @@ public class LdapGroupProvider implements GroupProvider {
     }
 
     /**
-     * Always throws an UnsupportedOperationException because
-     * LDAP groups are read-only.
+     * Always throws an UnsupportedOperationException because LDAP groups
+     * are read-only.
      *
      * @param groupName the name of a group.
      * @param user the JID of the user to delete.
      * @throws UnsupportedOperationException when called.
      */
-    public void deleteMember(String groupName, JID user)
-            throws UnsupportedOperationException {
+    public void deleteMember(String groupName, JID user) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
     /**
-     * Always throws an UnsupportedOperationException because
-     * LDAP groups are read-only.
+     * Returns true because LDAP groups are read-only.
      *
      * @return true because all LDAP functions are read-only.
      */
@@ -253,7 +254,7 @@ public class LdapGroupProvider implements GroupProvider {
         if (manager.isDebugEnabled()) {
             Log.debug("Trying to find all groups in the system.");
         }
-        DirContext ctx = null;
+        DirContext ctx;
         NamingEnumeration<SearchResult> answer = null;
         try {
             ctx = manager.getContext();
@@ -294,7 +295,7 @@ public class LdapGroupProvider implements GroupProvider {
 
         TreeMap<String, Group> groups = new TreeMap<String, Group>();
 
-        DirContext ctx = null;
+        DirContext ctx;
         try {
             ctx = manager.getContext();
         }
@@ -313,7 +314,7 @@ public class LdapGroupProvider implements GroupProvider {
         while (answer.hasMoreElements()) {
             String name = "";
             try {
-                Attributes a = (((SearchResult) answer.nextElement()).getAttributes());
+                Attributes a = answer.nextElement().getAttributes();
                 String description;
                 try {
                     name = ((String) ((a.get(manager.getGroupNameField())).get()));
@@ -355,7 +356,7 @@ public class LdapGroupProvider implements GroupProvider {
                     // Therefore, we have to try to load each user we found to see if
                     // it passes the filter.
                     try {
-                        JID userJID = null;
+                        JID userJID;
                         // Create JID of local user if JID does not match a component's JID
                         if (!username.contains(serverName)) {
                             // In order to lookup a username from the manager, the username
@@ -381,7 +382,7 @@ public class LdapGroupProvider implements GroupProvider {
                 if (manager.isDebugEnabled()) {
                     Log.debug("Adding group \"" + name + "\" with " + members.size() + " members.");
                 }
-                Group g = new Group(this, name, description, members, new ArrayList<JID>());
+                Group g = new Group(name, description, members, new ArrayList<JID>());
                 groups.put(name, g);
             }
             catch (Exception e) {
@@ -397,6 +398,7 @@ public class LdapGroupProvider implements GroupProvider {
             ctx.close();
         }
         catch (Exception e) {
+            // Ignore.
         }
 
         return groups.values();

src/web/user-properties.jsp

@@ -16,6 +16,8 @@
                  java.net.URLEncoder"
     errorPage="error.jsp"
 %>
+<%@ page import="org.jivesoftware.wildfire.group.Group"%>
+<%@ page import="java.util.Collection"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -195,6 +197,31 @@
             <%= JiveGlobals.formatDate(user.getCreationDate()) %>
         </td>
     </tr>
+    <tr>
+        <td class="c1">
+            Groups:
+        </td>
+        <td>
+            <%
+                Collection<Group> groups = webManager.getGroupManager().getGroups(user);
+                if (groups.isEmpty()) {
+            %>
+                <i>None</i>
+            <%
+                }
+                else {
+                    int count = 0;
+                    for (Group group: groups) {
+                        if (count != 0) {
+                            out.print(", ");
+                        }
+                        out.print(group.getName());
+                        count ++;
+                    }
+                }
+            %>
+        </td>
+    </tr>
 </tbody>
 </table>
 </div>