[Yanel-commits] rev 53155 - public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi

[michi at wyona.com]

Author: michi
Date: 2010-09-12 22:21:21 +0200 (Sun, 12 Sep 2010)
New Revision: 53155

Modified:
   public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
Log:
generation of XML separated from getting users such that method can be reused

Modified: public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java	2010-09-12 17:42:03 UTC (rev 53154)
+++ public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java	2010-09-12 20:21:21 UTC (rev 53155)
@@ -49,7 +49,15 @@
             log.warn("DEBUG: Yanel usecase: " + usecase);
             sb.append("<yanel-usecase>" + usecase + "</yanel-usecase>");
             if (usecase.equals("getusers")) {
-                sb.append(getUsersAsXML());
+                boolean refresh = true;
+                if (getResourceConfigProperty("refresh-users") != null) {
+                    refresh = new Boolean(getResourceConfigProperty("refresh-users")).booleanValue();
+                } else {
+                    log.warn("No refresh user property set within resource configuration '" + getConfiguration().getNode() + "', hence will use true as default.");
+                }
+
+                UserManager um = getRealm().getIdentityManager().getUserManager();
+                sb.append(getUsersAsXML(um.getUsers(refresh)));
             } else if (usecase.equals("get-remote-users")) {
                 sb.append(getRemoteUsersAsXML());
             } else if (usecase.equals("getuser")) {
@@ -349,18 +357,9 @@
     }
 
     /**
-     * Get all users
+     * Get all users as XML
      */
-    protected StringBuilder getUsersAsXML() throws Exception {
-        boolean refresh = true;
-        if (getResourceConfigProperty("refresh-users") != null) {
-            refresh = new Boolean(getResourceConfigProperty("refresh-users")).booleanValue();
-        } else {
-            log.warn("No refresh user property set within resource configuration '" + getConfiguration().getNode() + "', hence will use true as default.");
-        }
-
-        UserManager um = getRealm().getIdentityManager().getUserManager();
-        User[] users = um.getUsers(refresh);
+    protected StringBuilder getUsersAsXML(User[] users) throws Exception {
         Arrays.sort(users, new ItemIDComparator());
 
         StringBuilder sb = new StringBuilder();