directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-109 - use CollectionUtils.isNotEmpty instead
Date Thu, 04 Jun 2015 15:07:55 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/1.0-RC41 4903573c5 -> c2a634a01


FC-109 - use CollectionUtils.isNotEmpty instead


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/c2a634a0
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/c2a634a0
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/c2a634a0

Branch: refs/heads/1.0-RC41
Commit: c2a634a01e854977cf7ebad4c6fe5f54b255fbf3
Parents: 4903573
Author: Shawn McKinney <smckinney@apache.org>
Authored: Thu Jun 4 10:08:08 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Thu Jun 4 10:08:08 2015 -0500

----------------------------------------------------------------------
 .../apache/directory/fortress/web/control/SecUtils.java   |  7 +++----
 .../directory/fortress/web/model/GroupListModel.java      |  8 ++++----
 .../apache/directory/fortress/web/model/OUListModel.java  |  4 ++--
 .../directory/fortress/web/model/ObjectListModel.java     |  4 ++--
 .../directory/fortress/web/model/PermListModel.java       |  4 ++--
 .../directory/fortress/web/model/PwPolicyListModel.java   |  4 ++--
 .../directory/fortress/web/model/RoleListModel.java       |  6 +++---
 .../apache/directory/fortress/web/model/SDListModel.java  |  6 +++---
 .../directory/fortress/web/model/UserListModel.java       | 10 +++++-----
 .../directory/fortress/web/panel/AuditModDetailPanel.java |  8 ++++----
 .../apache/directory/fortress/web/panel/AuditUtils.java   |  4 ++--
 .../directory/fortress/web/panel/GroupDetailPanel.java    |  6 +++---
 .../directory/fortress/web/panel/GroupListPanel.java      |  4 ++--
 .../directory/fortress/web/panel/OUDetailPanel.java       |  4 ++--
 .../apache/directory/fortress/web/panel/OUListPanel.java  |  4 ++--
 .../directory/fortress/web/panel/OUSearchModalPanel.java  |  4 ++--
 .../directory/fortress/web/panel/ObjectListPanel.java     |  4 ++--
 .../fortress/web/panel/ObjectSearchModalPanel.java        |  4 ++--
 .../directory/fortress/web/panel/PermDetailPanel.java     |  4 ++--
 .../directory/fortress/web/panel/PermListPanel.java       |  4 ++--
 .../fortress/web/panel/PermSearchModalPanel.java          |  4 ++--
 .../directory/fortress/web/panel/PwPolicyListPanel.java   |  4 ++--
 .../fortress/web/panel/PwPolicySearchModalPanel.java      |  4 ++--
 .../directory/fortress/web/panel/RoleDetailPanel.java     |  4 ++--
 .../directory/fortress/web/panel/RoleListPanel.java       |  4 ++--
 .../fortress/web/panel/RoleSearchModalPanel.java          |  4 ++--
 .../directory/fortress/web/panel/SDDetailPanel.java       |  4 ++--
 .../apache/directory/fortress/web/panel/SDListPanel.java  |  4 ++--
 .../directory/fortress/web/panel/UserDetailPanel.java     |  8 ++++----
 .../directory/fortress/web/panel/UserListPanel.java       |  4 ++--
 .../fortress/web/panel/UserSearchModalPanel.java          |  5 ++---
 31 files changed, 75 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
index 136402b..af56783 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.web.control;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.*;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.model.Warning;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.realm.*;
 import org.apache.directory.fortress.realm.GlobalIds;
 import org.apache.log4j.Logger;
@@ -33,7 +33,6 @@ import org.apache.wicket.Component;
 import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.util.VUtil;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 
 import javax.servlet.http.HttpServletRequest;
@@ -179,7 +178,7 @@ public class SecUtils
     public static boolean isFound( Permission permission, Component component )
     {
         List<Permission> permissions = SecUtils.getPermissions( component );
-        return ObjUtil.isNotNullOrEmpty( permissions ) && permissions.contains( permission );
+        return CollectionUtils.isNotEmpty( permissions ) && permissions.contains( permission );
     }
 
     /**
@@ -262,7 +261,7 @@ public class SecUtils
             session.getSession().setWarnings( null );
             accessMgr.addActiveRole( session.getSession(), new UserRole( roleName ) );
             List<Warning> warnings = session.getSession().getWarnings();
-            if ( ObjUtil.isNotNullOrEmpty( warnings ) )
+            if ( CollectionUtils.isNotEmpty( warnings ) )
             {
                 for ( Warning warning : warnings )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java b/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
index 54ef4f0..3dffbf5 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -96,7 +96,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
         {
             LOG.debug( ".getObject group name: " + group.getName() );
             List<Group> foundGroups = getList( group );
-            if( ObjUtil.isNotNullOrEmpty( foundGroups ))
+            if( CollectionUtils.isNotEmpty( foundGroups ))
             {
                 groups = new SerializableList<>( foundGroups );
             }
@@ -132,7 +132,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
         
         try
         {
-            if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+            if ( CollectionUtils.isNotEmpty( group.getMembers() ) )
             {
                 String userId = group.getMembers().get( 0 );
                 LOG.debug( ".getList userId name: " + userId );
@@ -144,7 +144,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
                 groupList = groupMgr.find( group );
             }
             // sort list by name:
-            if( ObjUtil.isNotNullOrEmpty( groupList ))
+            if( CollectionUtils.isNotEmpty( groupList ))
             {
                 Collections.sort( groupList, new Comparator<Group>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java b/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
index 58537d2..9201b9a 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -131,7 +131,7 @@ public class OUListModel extends Model<SerializableList<OrgUnit>>
             LOG.debug( ".getList orgUnitNm: " + szOrgUnitNm );
             orgUnitList = delReviewMgr.search( orgUnit.getType(), orgUnit.getName() );
             // sort list by name:
-            if( ObjUtil.isNotNullOrEmpty( orgUnitList ))
+            if( CollectionUtils.isNotEmpty( orgUnitList ))
             {
                 Collections.sort( ( orgUnitList ), new Comparator<OrgUnit>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java b/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
index f3e13a4..78da2ce 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -149,7 +149,7 @@ public class ObjectListModel extends Model<SerializableList<PermObj>>
                 permObjList = reviewMgr.findPermObjs( new OrgUnit( ou ) );
             }
             // sort list by objName:
-            if( ObjUtil.isNotNullOrEmpty( permObjList ))
+            if( CollectionUtils.isNotEmpty( permObjList ))
             {
                 Collections.sort( permObjList, new Comparator<PermObj>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java b/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
index 3de9e95..19df784 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -136,7 +136,7 @@ public class PermListModel extends Model<SerializableList<Permission>>
             perm.setAdmin( isAdmin );
             permsList = reviewMgr.findPermissions( perm );
             // sort list by abstract name:
-            if( ObjUtil.isNotNullOrEmpty( permsList ))
+            if( CollectionUtils.isNotEmpty( permsList ))
             {
                 Collections.sort( permsList, new Comparator<Permission>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java b/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
index e6547cc..02729e6 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -129,7 +129,7 @@ public class PwPolicyListModel extends Model<SerializableList<PwPolicy>>
             LOG.debug( ".getList policyNm: " + szPolicyNm );
             policiesList = pwPolicyMgr.search( szPolicyNm );
             // sort list by policy name:
-            if( ObjUtil.isNotNullOrEmpty( policiesList ))
+            if( CollectionUtils.isNotEmpty( policiesList ))
             {
                 Collections.sort( policiesList, new Comparator<PwPolicy>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java b/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
index 0177518..ea90bf2 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -140,7 +140,7 @@ public class RoleListModel extends Model<SerializableList<? extends Role>>
             LOG.debug( ".getList roleNm: " + szRoleNm );
             rolesList = reviewMgr.findRoles( szRoleNm );
             // sort list by role name:
-            if( ObjUtil.isNotNullOrEmpty( rolesList ))
+            if( CollectionUtils.isNotEmpty( rolesList ))
             {
                 Collections.sort( rolesList, new Comparator<Role>()
                 {
@@ -170,7 +170,7 @@ public class RoleListModel extends Model<SerializableList<? extends Role>>
         {
             LOG.debug( ".getList roleNm: " + szRoleNm );
             rolesList = delReviewMgr.findRoles( szRoleNm );
-            if( ObjUtil.isNotNullOrEmpty( rolesList ))
+            if( CollectionUtils.isNotEmpty( rolesList ))
             {
                 Collections.sort( rolesList, new Comparator<AdminRole>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java b/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
index 4e9880f..cfccba4 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -133,7 +133,7 @@ public class SDListModel extends Model<SerializableList<SDSet>>
             String szSdSetNm = sdSet.getName();
             LOG.debug( ".getList sdSetNm: " + szSdSetNm );
 
-            if ( ObjUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
+            if ( CollectionUtils.isNotEmpty( sdSet.getMembers() ) )
             {
                 Object[] roleNms = sdSet.getMembers().toArray();
                 String szRoleNm = (String)roleNms[0];
@@ -160,7 +160,7 @@ public class SDListModel extends Model<SerializableList<SDSet>>
                 }
             }
             // sort list by set name:
-            if( ObjUtil.isNotNullOrEmpty( sdSetList ))
+            if( CollectionUtils.isNotEmpty( sdSetList ))
             {
                 Collections.sort( sdSetList, new Comparator<SDSet>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java b/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
index 7089753..1eb388b 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
@@ -19,8 +19,8 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -153,7 +153,7 @@ public class UserListModel extends Model<SerializableList<User>>
             {
                 Set<String> users = reviewMgr.authorizedPermissionUsers( perm );
                 
-                if ( ObjUtil.isNotNullOrEmpty( users ) )
+                if ( CollectionUtils.isNotEmpty( users ) )
                 {
                     usersList = new ArrayList<>();
                     
@@ -168,11 +168,11 @@ public class UserListModel extends Model<SerializableList<User>>
             {
                 usersList = reviewMgr.findUsers( new OrgUnit( user.getOu(), OrgUnit.Type.USER ) );
             }
-            else if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+            else if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
             {
                 usersList = reviewMgr.assignedUsers( new Role( user.getRoles().get( 0 ).getName() ) );
             }
-            else if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+            else if ( CollectionUtils.isNotEmpty( user.getAdminRoles() ) )
             {
                 usersList = delReviewMgr.assignedUsers( new AdminRole( user.getAdminRoles().get( 0 ).getName() ) );
             }
@@ -181,7 +181,7 @@ public class UserListModel extends Model<SerializableList<User>>
                 usersList = reviewMgr.findUsers( user );
             }
             // sort list by userId:
-            if( ObjUtil.isNotNullOrEmpty( usersList ))
+            if( CollectionUtils.isNotEmpty( usersList ))
             {
                 Collections.sort( usersList, new Comparator<User>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
index ffb3895..7c19697 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
@@ -25,8 +25,8 @@ import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.kendo.ui.datatable.DataTable;
 import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.PropertyColumn;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -195,10 +195,10 @@ public class AuditModDetailPanel extends FormComponentPanel
         private List<RequestMod> parseRequestMods( List<String> mods )
         {
             List<RequestMod> results = new ArrayList<>();
-            if ( ObjUtil.isNotNullOrEmpty( mods ) )
+            if ( CollectionUtils.isNotEmpty( mods ) )
             {
                 Mod mod = ( Mod ) detailForm.getModelObject();
-                if ( mod != null && ObjUtil.isNotNullOrEmpty( mod.getReqMod() ) )
+                if ( mod != null && CollectionUtils.isNotEmpty( mod.getReqMod() ) )
                 {
                     int ctr = 1;
                     for ( String szMod : mod.getReqMod() )
@@ -244,7 +244,7 @@ public class AuditModDetailPanel extends FormComponentPanel
     private IDataProvider<RequestMod> createDataProvider( List<RequestMod> mods )
     {
         ListDataProvider<RequestMod> results;
-        if ( ObjUtil.isNotNullOrEmpty( mods ) )
+        if ( CollectionUtils.isNotEmpty( mods ) )
         {
             results = new ListDataProvider<>( mods );
         }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
index 5fc26db..763da0a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
@@ -20,11 +20,11 @@
 
 package org.apache.directory.fortress.web.panel;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.model.AuthZ;
 import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.log4j.Logger;
 
@@ -194,7 +194,7 @@ final class AuditUtils
             User inUser = new User();
             inUser.setInternalId( internalId );
             List<User> users = reviewMgr.findUsers( inUser );
-            if ( ObjUtil.isNotNullOrEmpty( users ) )
+            if ( CollectionUtils.isNotEmpty( users ) )
             {
                 if ( users.size() > 1 )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
index e047ff0..fdedea0 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
@@ -28,6 +28,7 @@ import com.googlecode.wicket.kendo.ui.datatable.column.CommandsColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.PropertyColumn;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.api.ldap.model.name.Dn;
@@ -59,7 +60,6 @@ import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.GroupMgr;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.util.VUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -172,7 +172,7 @@ public class GroupDetailPanel extends FormComponentPanel
                     log.debug( ".onSubmit Add" );
                     Group group = ( Group ) form.getModel().getObject();
                     String msg = null;
-                    if ( !StringUtils.isNotBlank( memberAssign ) && !ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+                    if ( !StringUtils.isNotBlank( memberAssign ) && !CollectionUtils.isNotEmpty( group.getMembers() ) )
                     {
                         msg = "Group name: " + group.getName() + " cannot be added without a member";
                     }
@@ -692,7 +692,7 @@ public class GroupDetailPanel extends FormComponentPanel
         private IDataProvider<Member> createDataProvider( List<String> members )
         {
             ListDataProvider<Member> results;
-            if ( ObjUtil.isNotNullOrEmpty( members ) )
+            if ( CollectionUtils.isNotEmpty( members ) )
             {
                 Collections.sort( members, new Comparator<String>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index c06df71..74ab8d8 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -149,7 +149,7 @@ public class GroupListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<Group> groups = ( List<Group> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( groups ) )
+                if ( CollectionUtils.isNotEmpty( groups ) )
                 {
                     for ( Group group : groups )
                         rootNode.add( new DefaultMutableTreeNode( group ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
index 08adee7..7f98728 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
@@ -23,8 +23,8 @@ package org.apache.directory.fortress.web.panel;
 
 import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -498,7 +498,7 @@ public class OUDetailPanel extends FormComponentPanel
                 SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
                 OrgUnit orgUnit = ( OrgUnit ) modelEvent.getEntity();
                 this.setModelObject( orgUnit );
-                if ( ObjUtil.isNotNullOrEmpty( orgUnit.getParents() ) )
+                if ( CollectionUtils.isNotEmpty( orgUnit.getParents() ) )
                 {
                     parents = new ArrayList<>( orgUnit.getParents() );
                     parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
index 18183bf..2e306f4 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -177,7 +177,7 @@ public class OUListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<OrgUnit> orgUnits1 = ( List<OrgUnit> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( orgUnits1 ) )
+                if ( CollectionUtils.isNotEmpty( orgUnits1 ) )
                 {
                     for ( OrgUnit ou : orgUnits1 )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
index 50a7a65..14e027f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -136,7 +136,7 @@ public class OUSearchModalPanel extends Panel
                     else
                         ous = delReviewMgr.search( OrgUnit.Type.PERM, ouSearchVal );
                     // sort list by name:
-                    if( ObjUtil.isNotNullOrEmpty( ous ))
+                    if( CollectionUtils.isNotEmpty( ous ))
                     {
                         Collections.sort( ( List<OrgUnit> ) ous, new Comparator<OrgUnit>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
index 28f3967..7ba85bc 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -151,7 +151,7 @@ public class ObjectListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<PermObj> permObjs = ( List<PermObj> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( permObjs ) )
+                if ( CollectionUtils.isNotEmpty( permObjs ) )
                 {
                     for ( PermObj permObj : permObjs )
                         rootNode.add( new DefaultMutableTreeNode( permObj ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
index 37bedd8..52582e6 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -137,7 +137,7 @@ public class ObjectSearchModalPanel extends Panel
                     permObj.setAdmin( isAdmin );
                     objects = reviewMgr.findPermObjs( permObj );
                     // sort list by objName:
-                    if( ObjUtil.isNotNullOrEmpty( objects ))
+                    if( CollectionUtils.isNotEmpty( objects ))
                     {
                         Collections.sort( ( List<PermObj> ) objects, new Comparator<PermObj>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
index 9c17368..b61dae9 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
@@ -23,8 +23,8 @@ package org.apache.directory.fortress.web.panel;
 
 import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -618,7 +618,7 @@ public class PermDetailPanel extends FormComponentPanel
                 Permission perm = ( Permission ) modelEvent.getEntity();
                 this.setModelObject( perm );
                 rolesSelection = "";
-                if ( ObjUtil.isNotNullOrEmpty( perm.getRoles() ) )
+                if ( CollectionUtils.isNotEmpty( perm.getRoles() ) )
                 {
                     roles = new ArrayList<>( perm.getRoles() );
                     rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
index 38556c9..d2e1470 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -209,7 +209,7 @@ public class PermListPanel extends FormComponentPanel
                 rootNode.removeAllChildren();
                 List<Permission> perms = ( List<Permission> ) getDefaultModelObject();
 
-                if ( ObjUtil.isNotNullOrEmpty( perms ) )
+                if ( CollectionUtils.isNotEmpty( perms ) )
                 {
                     for ( Permission perm : perms )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
index 4866af7..a80a016 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -140,7 +140,7 @@ public class PermSearchModalPanel extends Panel
                     permission.setAdmin( isAdmin );
                     objects = reviewMgr.findPermissions( permission );
                     // sort list by abstract name:
-                    if( ObjUtil.isNotNullOrEmpty( objects ))
+                    if( CollectionUtils.isNotEmpty( objects ))
                     {
                         Collections.sort( ( List<Permission> ) objects, new Comparator<Permission>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
index 9e0878a..ed235ec 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -217,7 +217,7 @@ public class PwPolicyListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<PwPolicy> policies = ( List<PwPolicy> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( policies ) )
+                if ( CollectionUtils.isNotEmpty( policies ) )
                 {
                     for ( PwPolicy policy : policies )
                         rootNode.add( new DefaultMutableTreeNode( policy ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
index 15b8d70..9b4bcab 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -146,7 +146,7 @@ public class PwPolicySearchModalPanel extends Panel
                         policySearchVal = "";
                     policies = pwPolicyMgr.search( policySearchVal );
                     // sort list by name:
-                    if( ObjUtil.isNotNullOrEmpty( policies ))
+                    if( CollectionUtils.isNotEmpty( policies ))
                     {
                         Collections.sort( ( List<PwPolicy> ) policies, new Comparator<PwPolicy>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
index 8b16cf3..66bf256 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -568,7 +568,7 @@ public class RoleDetailPanel extends Panel
                 T role = ( T ) modelEvent.getEntity();
                 this.setModelObject( role );
                 parentsSelection = "";
-                if ( ObjUtil.isNotNullOrEmpty( ( ( Role ) role ).getParents() ) )
+                if ( CollectionUtils.isNotEmpty( ( ( Role ) role ).getParents() ) )
                 {
                     parents = new ArrayList<>( ( ( Role ) role ).getParents() );
                     parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this,

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
index bffea0d..d890cef 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -193,7 +193,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<Role> roles = ( List<Role> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( roles ) )
+                if ( CollectionUtils.isNotEmpty( roles ) )
                 {
                     for ( T role : ( List<T> ) roles )
                         rootNode.add( new DefaultMutableTreeNode( role ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
index c8a8157..892cd66 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -178,7 +178,7 @@ public class RoleSearchModalPanel extends Panel
                 }
 
                 // sort list by name:
-                if( ObjUtil.isNotNullOrEmpty( roles ))
+                if( CollectionUtils.isNotEmpty( roles ))
                 {
                     Collections.sort( (List<Role>)roles, new Comparator<Role>()
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
index a6ddc19..2c119e4 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.googlecode.wicket.jquery.ui.form.spinner.Spinner;
 import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -522,7 +522,7 @@ public class SDDetailPanel extends FormComponentPanel
                 SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
                 SDSet sdSet = ( SDSet ) modelEvent.getEntity();
                 this.setModelObject( sdSet );
-                if ( ObjUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
+                if ( CollectionUtils.isNotEmpty( sdSet.getMembers() ) )
                 {
                     members = new ArrayList<>( sdSet.getMembers() );
                     membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
index 6900896..2cd906b 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -232,7 +232,7 @@ public class SDListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<SDSet> sdSets = ( List<SDSet> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( sdSets ) )
+                if ( CollectionUtils.isNotEmpty( sdSets ) )
                 {
                     for ( SDSet sdSet : sdSets )
                         rootNode.add( new DefaultMutableTreeNode( sdSet ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
index 2eb8125..9268d5f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
@@ -25,8 +25,8 @@ import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
 import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -1881,12 +1881,12 @@ public class UserDetailPanel extends FormComponentPanel
             }
             userDetailLabel = "User Detail: " + user.getUserId();
             roleAssignmentsLabel = "RBAC Role Assignments";
-            if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+            if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
             {
                 roleAssignmentsLabel += ": " + user.getRoles().get( 0 ) + " + " + ( user.getRoles().size() - 1 );
             }
             adminRoleAssignmentsLabel = "Admin Role Assignments";
-            if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+            if ( CollectionUtils.isNotEmpty( user.getAdminRoles() ) )
             {
                 adminRoleAssignmentsLabel += ": " + user.getAdminRoles().get( 0 ) + " + " + ( user.getAdminRoles()
                     .size() - 1 );
@@ -1894,7 +1894,7 @@ public class UserDetailPanel extends FormComponentPanel
             if ( user.getAddress() != null )
             {
                 addressAssignmentsLabel = "Address Assignments: ";
-                if ( ObjUtil.isNotNullOrEmpty( user.getAddress().getAddresses() ) )
+                if ( CollectionUtils.isNotEmpty( user.getAddress().getAddresses() ) )
                 {
                     int ctr = 0;
                     for ( String street : user.getAddress().getAddresses() )

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
index 9ee9be1..88afb71 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
@@ -24,8 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.inmethod.grid.IGridColumn;
 import com.inmethod.grid.column.PropertyColumn;
 import com.inmethod.grid.treegrid.TreeGrid;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
@@ -270,7 +270,7 @@ public class UserListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<User> users = ( List<User> ) getDefaultModelObject();
-                if ( ObjUtil.isNotNullOrEmpty( users ) )
+                if ( CollectionUtils.isNotEmpty( users ) )
                 {
                     for ( User user : users )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c2a634a0/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
index 6a27205..01a8c25 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
@@ -25,8 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.ObjUtil;
-import org.apache.directory.fortress.core.util.VUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -151,7 +150,7 @@ public class UserSearchModalPanel extends Panel
                         userSearchVal = "";
                     users = reviewMgr.findUsers( new User( userSearchVal ) );
                     // sort list by userId:
-                    if( ObjUtil.isNotNullOrEmpty( users ))
+                    if( CollectionUtils.isNotEmpty( users ))
                     {
                         Collections.sort( ( List<User> ) users, new Comparator<User>()
                         {


Mime
View raw message