directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [66/75] [abbrv] directory-fortress-core git commit: FC-109 - use CommonsUtils.isNotEmpty instead
Date Tue, 09 Jun 2015 03:16:12 GMT
FC-109 - use CommonsUtils.isNotEmpty instead


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

Branch: refs/heads/master
Commit: 5942f6272b151837416bbab9e4b2ef36bb665a75
Parents: 031b278
Author: Shawn McKinney <smckinney@apache.org>
Authored: Thu Jun 4 09:30:34 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Thu Jun 4 09:30:34 2015 -0500

----------------------------------------------------------------------
 .../fortress/core/ant/FortressAntTask.java      |  9 +++--
 .../core/cli/CommandLineInterpreter.java        | 39 ++++++++++----------
 .../fortress/core/impl/AcceleratorDAO.java      |  6 +--
 .../fortress/core/impl/AccessMgrImpl.java       |  4 +-
 .../fortress/core/impl/AdminMgrImpl.java        |  4 +-
 .../fortress/core/impl/AdminRoleDAO.java        |  4 +-
 .../fortress/core/impl/AdminRoleP.java          |  8 ++--
 .../fortress/core/impl/AdminRoleUtil.java       |  6 +--
 .../fortress/core/impl/DelAccessMgrImpl.java    | 16 ++++----
 .../fortress/core/impl/DelAdminMgrImpl.java     | 12 +++---
 .../fortress/core/impl/GroupMgrImpl.java        |  4 +-
 .../directory/fortress/core/impl/HierUtil.java  |  6 +--
 .../directory/fortress/core/impl/PermDAO.java   | 11 +++---
 .../directory/fortress/core/impl/PermP.java     |  6 +--
 .../directory/fortress/core/impl/PsoUtil.java   |  6 +--
 .../fortress/core/impl/ReviewMgrImpl.java       |  8 ++--
 .../directory/fortress/core/impl/RoleP.java     |  3 +-
 .../directory/fortress/core/impl/RoleUtil.java  | 14 +++----
 .../directory/fortress/core/impl/SDUtil.java    | 12 +++---
 .../directory/fortress/core/impl/SdDAO.java     |  6 +--
 .../directory/fortress/core/impl/UserDAO.java   |  9 +++--
 .../directory/fortress/core/impl/UserP.java     |  7 ++--
 .../directory/fortress/core/impl/UsoUtil.java   |  6 +--
 .../directory/fortress/core/util/ObjUtil.java   | 12 ------
 .../directory/fortress/core/util/VUtil.java     | 11 +++---
 .../fortress/core/AdminMgrConsole.java          |  4 +-
 .../fortress/core/AuditMgrConsole.java          |  4 +-
 .../fortress/core/GroupMgrConsole.java          |  7 ++--
 .../fortress/core/ReviewMgrConsole.java         |  4 +-
 .../fortress/core/impl/UserTestData.java        |  5 ++-
 30 files changed, 125 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index 13647d6..81a0d4e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.tools.ant.BuildException;
@@ -940,14 +941,14 @@ public class FortressAntTask extends Task implements InputHandler
      */
     private void assignUser( User user ) throws SecurityException
     {
-        if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+        if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
         {
             for ( UserRole uRole : user.getRoles() )
             {
                 adminMgr.assignUser( uRole );
             }
         }
-        if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+        if ( CollectionUtils.isNotEmpty( user.getAdminRoles() ) )
         {
             for ( UserAdminRole uAdminRoleRole : user.getAdminRoles() )
             {
@@ -1065,7 +1066,7 @@ public class FortressAntTask extends Task implements InputHandler
             for ( Group group : groups )
             {
                 List<String> members = group.getMembers();
-                if ( ObjUtil.isNotNullOrEmpty( members ) )
+                if ( CollectionUtils.isNotEmpty( members ) )
                 {
                     for ( String member : members )
                     {
@@ -1106,7 +1107,7 @@ public class FortressAntTask extends Task implements InputHandler
             List<Group> groups = delgroupmember.getGroups();
             for ( Group group : groups )
             {
-                if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+                if ( CollectionUtils.isNotEmpty( group.getMembers() ) )
                 {
                     for ( String member : group.getMembers() )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index d7098a1..39cb196 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+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;
@@ -711,7 +712,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 User user = options.getUser();
                 List<User> outUsers = reviewMgr.findUsers( user );
-                if ( ObjUtil.isNotNullOrEmpty( outUsers ) )
+                if ( CollectionUtils.isNotEmpty( outUsers ) )
                 {
                     int ctr = 0;
                     for ( User outUser : outUsers )
@@ -727,7 +728,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 Role inRole = options.getRole();
                 List<User> outUsers = reviewMgr.assignedUsers( inRole );
-                if ( ObjUtil.isNotNullOrEmpty( outUsers ) )
+                if ( CollectionUtils.isNotEmpty( outUsers ) )
                 {
                     for ( User outUser : outUsers )
                     {
@@ -749,7 +750,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 String inRoleNm = options.getName();
                 List<Role> outRoles = reviewMgr.findRoles( inRoleNm );
-                if ( ObjUtil.isNotNullOrEmpty( outRoles ) )
+                if ( CollectionUtils.isNotEmpty( outRoles ) )
                 {
                     int ctr = 0;
                     for ( Role outRole : outRoles )
@@ -789,7 +790,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 PermObj inPermObj = options.getPermObj();
                 List<PermObj> outPermObjs = reviewMgr.findPermObjs( inPermObj );
-                if ( ObjUtil.isNotNullOrEmpty( outPermObjs ) )
+                if ( CollectionUtils.isNotEmpty( outPermObjs ) )
                 {
                     int ctr = 0;
                     for ( PermObj outPermObj : outPermObjs )
@@ -814,7 +815,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 Permission inPerm = options.getPermission();
                 List<Permission> outPerms = reviewMgr.findPermissions( inPerm );
-                if ( ObjUtil.isNotNullOrEmpty( outPerms ) )
+                if ( CollectionUtils.isNotEmpty( outPerms ) )
                 {
                     int ctr = 0;
                     for ( Permission outPerm : outPerms )
@@ -950,7 +951,7 @@ public class CommandLineInterpreter
                 LOG.info( command );
                 Group inGroup = options.getGroup();
                 List<Group> groups = groupMgr.find( inGroup );
-                if ( ObjUtil.isNotNullOrEmpty( groups ) )
+                if ( CollectionUtils.isNotEmpty( groups ) )
                 {
                     for ( Group outGroup : groups )
                     {
@@ -963,7 +964,7 @@ public class CommandLineInterpreter
                 command = ASSIGN_GROUP;
                 LOG.info( command );
                 Group group = options.getGroup();
-                if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+                if ( CollectionUtils.isNotEmpty( group.getMembers() ) )
                 {
                     for ( String member : group.getMembers() )
                     {
@@ -976,7 +977,7 @@ public class CommandLineInterpreter
                 command = DEASSIGN_GROUP;
                 LOG.info( command );
                 Group group = options.getGroup();
-                if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+                if ( CollectionUtils.isNotEmpty( group.getMembers() ) )
                 {
                     for ( String member : group.getMembers() )
                     {
@@ -1140,14 +1141,14 @@ public class CommandLineInterpreter
         {
             printRow( type, "NAME", role.getName() );
             printRow( type, "IID ", role.getId() );
-            if ( ObjUtil.isNotNullOrEmpty( role.getParents() ) )
+            if ( CollectionUtils.isNotEmpty( role.getParents() ) )
             {
                 for ( String parentRole : role.getParents() )
                 {
                     printRow( type, "PRLE", parentRole );
                 }
             }
-            if ( ObjUtil.isNotNullOrEmpty( role.getChildren() ) )
+            if ( CollectionUtils.isNotEmpty( role.getChildren() ) )
             {
                 for ( String childRole : role.getChildren() )
                 {
@@ -1171,7 +1172,7 @@ public class CommandLineInterpreter
             printRow( type, "TYPE", perm.getType() );
         }
 
-        if ( ObjUtil.isNotNullOrEmpty( perm != null ? perm.getRoles() : null ) )
+        if ( CollectionUtils.isNotEmpty( perm != null ? perm.getRoles() : null ) )
         {
             for ( String roleName : perm.getRoles() )
             {
@@ -1181,7 +1182,7 @@ public class CommandLineInterpreter
 
         if ( perm != null )
         {
-            if ( ObjUtil.isNotNullOrEmpty( perm.getUsers() ) )
+            if ( CollectionUtils.isNotEmpty( perm.getUsers() ) )
             {
                 for ( String userId : perm.getUsers() )
                 {
@@ -1281,13 +1282,13 @@ public class CommandLineInterpreter
             printPhone( type, user.getPhones(), "PHNE" );
             printPhone( type, user.getPhones(), "MOBL" );
 
-            if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+            if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
             {
                 for ( UserRole ur : user.getRoles() )
                 {
                     printSeparator();
                     printTemporal( "R", ur, "RBACROLE" );
-                    if ( ObjUtil.isNotNullOrEmpty( ur.getParents() ) )
+                    if ( CollectionUtils.isNotEmpty( ur.getParents() ) )
                     {
                         for ( String parentRole : ur.getParents() )
                         {
@@ -1296,7 +1297,7 @@ public class CommandLineInterpreter
                     }
                 }
             }
-            if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+            if ( CollectionUtils.isNotEmpty( user.getAdminRoles() ) )
             {
                 for ( UserAdminRole ur : user.getAdminRoles() )
                 {
@@ -1332,7 +1333,7 @@ public class CommandLineInterpreter
             printRow( type, "NAME ", group.getName() );
             printRow( type, "DESC", group.getDescription() );
             printRow( type, "PROT", group.getProtocol() );
-            if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
+            if ( CollectionUtils.isNotEmpty( group.getMembers() ) )
             {
                 int memctr = 0;
                 for ( String member : group.getMembers() )
@@ -1382,7 +1383,7 @@ public class CommandLineInterpreter
         {
             printRow( type, "TYPE", label );
             System.out.println( label );
-            if ( ObjUtil.isNotNullOrEmpty( address.getAddresses() ) )
+            if ( CollectionUtils.isNotEmpty( address.getAddresses() ) )
             {
                 for ( String addr : address.getAddresses() )
                 {
@@ -1419,11 +1420,11 @@ public class CommandLineInterpreter
         {
             printRow( type, "BEGR", ur.getBeginRange() );
             printRow( type, "ENDR", ur.getEndRange() );
-            if ( ObjUtil.isNotNullOrEmpty( ur.getOsP() ) )
+            if ( CollectionUtils.isNotEmpty( ur.getOsP() ) )
             {
                 printRow( type, "POUS", "" + ur.getOsP() );
             }
-            if ( ObjUtil.isNotNullOrEmpty( ur.getOsU() ) )
+            if ( CollectionUtils.isNotEmpty( ur.getOsU() ) )
             {
                 printRow( type, "UOUS", "" + ur.getOsU() );
             }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
index 1230877..7e2ea42 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.core.impl;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
@@ -28,7 +29,6 @@ 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.model.UserRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.openldap.accelerator.api.addRole.RbacAddRoleRequest;
 import org.openldap.accelerator.api.addRole.RbacAddRoleRequestImpl;
 import org.openldap.accelerator.api.addRole.RbacAddRoleResponse;
@@ -103,7 +103,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
             rbacCreateSessionRequest.setUserIdentity( user.getUserId() );
             rbacCreateSessionRequest.setPassword( new String( user.getPassword() ) );
 
-            if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+            if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
             {
                 for ( UserRole userRole : user.getRoles() )
                 {
@@ -371,7 +371,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
                 sessionRolesRequest );
             LOG.debug( "sessionRoles result: {}", sessionRolesResponse.getLdapResult().getResultCode().getResultCode() );
 
-            if ( ObjUtil.isNotNullOrEmpty( sessionRolesResponse.getRoles() ) )
+            if ( CollectionUtils.isNotEmpty( sessionRolesResponse.getRoles() ) )
             {
                 userRoleList = new ArrayList<UserRole>();
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
index 7e53547..1062715 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AccessMgrImpl.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.impl;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.AccessMgr;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.SecurityException;
@@ -31,7 +32,6 @@ import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.VUtil;
-import org.apache.directory.fortress.core.util.ObjUtil;
 
 
 /**
@@ -307,7 +307,7 @@ public class AccessMgrImpl extends Manageable implements AccessMgr
         uRoles = ue.getRoles();
         int indx;
         // Is the role activation target valid for this user?
-        if ( !ObjUtil.isNotNullOrEmpty( uRoles ) || ( ( indx = uRoles.indexOf( role ) ) == -1 ) )
+        if ( !CollectionUtils.isNotEmpty( uRoles ) || ( ( indx = uRoles.indexOf( role ) ) == -1 ) )
         {
             String info = getFullMethodName( CLS_NM, methodName ) + " Role [" + role.getName() + "] User ["
                 + session.getUserId() + "] role not authorized for user.";

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
index 44b431d..7895643 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.impl;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.ConstraintUtil;
 import org.apache.directory.fortress.core.model.Hier;
@@ -33,7 +34,6 @@ import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.model.SDSet;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1150,7 +1150,7 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr
         cRole2.setContextId( this.contextId );
         setAdminData( CLS_NM, methodName, cRole2 );
         // are there any parents left?
-        if ( !ObjUtil.isNotNullOrEmpty( cRole2.getParents() ) )
+        if ( !CollectionUtils.isNotEmpty( cRole2.getParents() ) )
         {
             // The updates only update non-empty multi-occurring attributes
             // so if last parent assigned, so must remove the attribute completely:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index eb4d02c..3bba089 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -48,7 +49,6 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Role;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.ldap.client.api.LdapConnection;
 
 
@@ -226,7 +226,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
                     SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
             }
 
-            if ( ObjUtil.isNotNullOrEmpty( entity.getOccupants() ) )
+            if ( CollectionUtils.isNotEmpty( entity.getOccupants() ) )
             {
                 for ( String name : entity.getOccupants() )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index 685d5df..5c38b77 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -23,13 +23,13 @@ package org.apache.directory.fortress.core.impl;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.ConstraintValidator;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.UserAdminRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -221,7 +221,7 @@ public final class AdminRoleP
     void addOccupant( List<UserAdminRole> uRoles, String userDn, String contextId )
         throws SecurityException
     {
-        if ( ObjUtil.isNotNullOrEmpty( uRoles ) )
+        if ( CollectionUtils.isNotEmpty( uRoles ) )
         {
             for ( UserAdminRole uRole : uRoles )
             {
@@ -395,12 +395,12 @@ public final class AdminRoleP
             constraintValidator.endDate( entity.getEndLockDate() );
         }
 
-        if ( ObjUtil.isNotNullOrEmpty( entity.getOsU() ) )
+        if ( CollectionUtils.isNotEmpty( entity.getOsU() ) )
         {
             validateOrgs( entity.getOsU(), OrgUnit.Type.USER, entity.getContextId() );
         }
 
-        if ( ObjUtil.isNotNullOrEmpty( entity.getOsP() ) )
+        if ( CollectionUtils.isNotEmpty( entity.getOsP() ) )
         {
             validateOrgs( entity.getOsP(), OrgUnit.Type.PERM, entity.getContextId() );
         }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
index cba48b2..9df9e95 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
@@ -25,13 +25,13 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Hier;
 import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.model.UserAdminRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -182,7 +182,7 @@ final class AdminRoleUtil
         // create Set with case insensitive comparator:
         Set<String> iRoles = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
 
-        if ( ObjUtil.isNotNullOrEmpty( uRoles ) )
+        if ( CollectionUtils.isNotEmpty( uRoles ) )
         {
             for ( UserAdminRole uRole : uRoles )
             {
@@ -190,7 +190,7 @@ final class AdminRoleUtil
                 iRoles.add( rleName );
                 Set<String> parents = HierUtil.getAscendants( rleName, getGraph( contextId ) );
 
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     iRoles.addAll( parents );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
index 7ea0854..6f53547 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.DelAccessMgr;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.util.Config;
@@ -30,7 +31,6 @@ import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserAdminRole;
 import org.apache.directory.fortress.core.util.VUtil;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.util.ObjUtil;
 
 import java.util.List;
 import java.util.Set;
@@ -215,7 +215,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
         List<UserAdminRole> uRoles = ue.getAdminRoles();
         int indx;
         // Is the admin role activation target valid for this user?
-        if (!ObjUtil.isNotNullOrEmpty(uRoles) || ((indx = uRoles.indexOf(role)) == -1))
+        if (!CollectionUtils.isNotEmpty( uRoles ) || ((indx = uRoles.indexOf(role)) == -1))
         {
             String info = getFullMethodName(CLS_NM, methodName) + " Admin Role [" + role.getName() + "] User [" + session.getUserId() + "] adminRole not authorized for user.";
             throw new SecurityException(GlobalErrIds.ARLE_ACTIVATE_FAILED, info);
@@ -323,7 +323,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
     {
         boolean result = false;
         List<UserAdminRole> uaRoles = session.getAdminRoles();
-        if(ObjUtil.isNotNullOrEmpty(uaRoles))
+        if(CollectionUtils.isNotEmpty( uaRoles ))
         {
             // validate user and retrieve user' ou:
             User ue = userP.read(user, false);
@@ -335,7 +335,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
                     break;
                 }
                 Set<String> osUs = uaRole.getOsU();
-                if(ObjUtil.isNotNullOrEmpty(osUs))
+                if(CollectionUtils.isNotEmpty( osUs ))
                 {
                     // create Set with case insensitive comparator:
                     Set<String> osUsFinal = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
@@ -359,7 +359,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
                             {
                                 range.add(uaRole.getBeginRange());
                             }
-                            if(ObjUtil.isNotNullOrEmpty(range))
+                            if(CollectionUtils.isNotEmpty( range ))
                             {
                                 // Does admin role have authority over a role contained with the allowable role range?
                                 if(range.contains(role.getName()))
@@ -395,7 +395,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
     {
         boolean result = false;
         List<UserAdminRole> uaRoles = session.getAdminRoles();
-        if(ObjUtil.isNotNullOrEmpty(uaRoles))
+        if(CollectionUtils.isNotEmpty( uaRoles ))
         {
             // validate perm and retrieve perm's ou:
             PermObj inObj = new PermObj(perm.getObjName());
@@ -409,7 +409,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
                     break;
                 }
                 Set<String> osPs = uaRole.getOsP();
-                if(ObjUtil.isNotNullOrEmpty(osPs))
+                if(CollectionUtils.isNotEmpty( osPs ))
                 {
                     // create Set with case insensitive comparator:
                     Set<String> osPsFinal = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
@@ -432,7 +432,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
                             {
                                 range.add(uaRole.getBeginRange());
                             }
-                            if( ObjUtil.isNotNullOrEmpty( range ))
+                            if( CollectionUtils.isNotEmpty( range ))
                             {
                                 // Does admin role have authority over a role contained with the allowable role range?
                                 if(range.contains(role.getName()))

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index e8aef36..e850ce0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.AdminMgr;
 import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.DelAdminMgr;
@@ -33,7 +34,6 @@ import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserAdminRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.util.VUtil;
 
 import java.util.List;
@@ -199,7 +199,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
         AdminRole re = admRP.update(role);
         // search for all users assigned this role and update:
         List<User> users = userP.getAssignedUsers(role);
-        if(ObjUtil.isNotNullOrEmpty(users))
+        if(CollectionUtils.isNotEmpty( users ))
         {
             final AdminMgr aMgr = AdminMgrFactory.createInstance(this.contextId);
             for (User ue : users)
@@ -417,7 +417,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
         {
             // Ensure the org unit is not assigned to any users, but set the sizeLimit to "true" to limit result set size.
             List<User> assignedUsers = userP.search(entity, true);
-            if (ObjUtil.isNotNullOrEmpty(assignedUsers))
+            if (CollectionUtils.isNotEmpty( assignedUsers ))
             {
                 String error =  methodName + " orgunit [" + entity.getName() + "] must unassign [" + assignedUsers.size() + "] users before deletion";
                 throw new SecurityException(GlobalErrIds.ORG_DEL_FAILED_USER, error, null);
@@ -428,7 +428,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
             // Ensure the org unit is not assigned to any permission objects but set the sizeLimit to "true" to limit result set size..
             // pass a "false" which places no restrictions on how many records server returns.
             List<PermObj> assignedPerms = permP.search(entity, false);
-            if (ObjUtil.isNotNullOrEmpty(assignedPerms))
+            if (CollectionUtils.isNotEmpty( assignedPerms ))
             {
                 String error =  methodName + " orgunit [" + entity.getName() + "] must unassign [" + assignedPerms.size() + "] perm objs before deletion";
                 throw new SecurityException(GlobalErrIds.ORG_DEL_FAILED_PERM, error, null);
@@ -701,7 +701,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
         cOrg.delParent(parent.getName());
         setAdminData(CLS_NM, methodName, cOrg);
         // are there any parents left?
-        if(!ObjUtil.isNotNullOrEmpty(cOrg.getParents()))
+        if(!CollectionUtils.isNotEmpty( cOrg.getParents() ))
         {
             // The updates only update non-empty multi-occurring attributes
             // so if last parent assigned, so must remove the attribute completely:
@@ -893,7 +893,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
         cRole2.setContextId(this.contextId);
         setAdminData(CLS_NM, methodName, cRole2);
         // are there any parents left?
-        if(!ObjUtil.isNotNullOrEmpty( cRole2.getParents() ))
+        if(!CollectionUtils.isNotEmpty( cRole2.getParents() ))
         {
             // The updates only update non-empty multi-occurring attributes
             // so if last parent assigned, so must remove the attribute completely:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
index 770c2b9..2956598 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupMgrImpl.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GroupMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
@@ -26,7 +27,6 @@ import org.apache.directory.fortress.core.ReviewMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.util.ObjUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -234,7 +234,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
 
     private void loadUserDns( Group group ) throws SecurityException
     {
-        if( ObjUtil.isNotNullOrEmpty( group.getMembers() ))
+        if( CollectionUtils.isNotEmpty( group.getMembers() ))
         {
             ReviewMgr reviewMgr = ReviewMgrFactory.createInstance();
             List<String> userDns = new ArrayList<String>();

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
index 516c90f..8816e95 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
@@ -29,10 +29,10 @@ import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Hier;
 import org.apache.directory.fortress.core.model.Relationship;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -693,13 +693,13 @@ final class HierUtil
     static Hier loadHier( String contextId, List<Graphable> descendants )
     {
         Hier hier = new Hier();
-        if ( ObjUtil.isNotNullOrEmpty( descendants ) )
+        if ( CollectionUtils.isNotEmpty( descendants ) )
         {
             hier.setContextId( contextId );
             for ( Graphable descendant : descendants )
             {
                 Set<String> parents = descendant.getParents();
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     for ( String parent : parents )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 496cda3..b16fe73 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -958,7 +959,7 @@ final class PermDAO extends ApacheDsDataProvider
         boolean result = false;
         Set<String> userIds = permission.getUsers();
 
-        if ( ObjUtil.isNotNullOrEmpty( userIds ) && userIds.contains( session.getUserId() ) )
+        if ( CollectionUtils.isNotEmpty( userIds ) && userIds.contains( session.getUserId() ) )
         {
             // user is assigned directly to this permission, no need to look further.
             return true;
@@ -966,7 +967,7 @@ final class PermDAO extends ApacheDsDataProvider
 
         Set<String> roles = permission.getRoles();
 
-        if ( ObjUtil.isNotNullOrEmpty( roles ) )
+        if ( CollectionUtils.isNotEmpty( roles ) )
         {
             if ( permission.isAdmin() )
             {
@@ -1275,7 +1276,7 @@ final class PermDAO extends ApacheDsDataProvider
                 roles = RoleUtil.getAscendants( role.getName(), role.getContextId() );
             }
 
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 filterbuf.append( "|(" );
                 filterbuf.append( ROLES );
@@ -1350,7 +1351,7 @@ final class PermDAO extends ApacheDsDataProvider
             filterbuf.append( ")(|" );
             Set<String> roles = RoleUtil.getInheritedRoles( user.getRoles(), user.getContextId() );
 
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 for ( String uRole : roles )
                 {
@@ -1483,7 +1484,7 @@ final class PermDAO extends ApacheDsDataProvider
             {
                 roles = RoleUtil.getInheritedRoles( session.getRoles(), session.getContextId() );
             }
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 for ( String uRole : roles )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
index 2c74965..b03107f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.impl;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.FinderException;
 import org.apache.directory.fortress.core.GlobalErrIds;
@@ -36,7 +37,6 @@ import org.apache.directory.fortress.core.model.Role;
 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.directory.fortress.core.util.ObjUtil;
 
 
 /**
@@ -580,7 +580,7 @@ final class PermP
             VUtil.description( pOp.getDescription() );
         }
         // Validate Role Grants:
-        if ( ObjUtil.isNotNullOrEmpty( pOp.getRoles() ) )
+        if ( CollectionUtils.isNotEmpty( pOp.getRoles() ) )
         {
             Set<String> roles = pOp.getRoles();
             if ( pOp.isAdmin() )
@@ -605,7 +605,7 @@ final class PermP
             }
         }
         // Validate User Grants:
-        if ( ObjUtil.isNotNullOrEmpty( pOp.getUsers() ) )
+        if ( CollectionUtils.isNotEmpty( pOp.getUsers() ) )
         {
             Set<String> users = pOp.getUsers();
             UserP up = new UserP();

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
index c3f08bf..538b99a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
@@ -25,12 +25,12 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Hier;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.Relationship;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -157,7 +157,7 @@ final class PsoUtil
     {
         // create Set with case insensitive comparator:
         Set<String> iOUs = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-        if ( ObjUtil.isNotNullOrEmpty( ous ) )
+        if ( CollectionUtils.isNotEmpty( ous ) )
         {
             for ( OrgUnit ou : ous )
             {
@@ -165,7 +165,7 @@ final class PsoUtil
                 iOUs.add( name );
                 Set<String> parents = HierUtil.getAscendants( name, getGraph( contextId ) );
 
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     iOUs.addAll( parents );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
index b1a5424..a0ccefb 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.SecurityException;
@@ -30,7 +31,6 @@ import org.apache.directory.fortress.core.model.SDSet;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.VUtil;
-import org.apache.directory.fortress.core.util.ObjUtil;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -500,7 +500,7 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr
         User ue = userP.read(user, true);
         List<UserRole> roles = ue.getRoles();
         Set<String> iRoles = null;
-        if (ObjUtil.isNotNullOrEmpty(roles))
+        if (CollectionUtils.isNotEmpty( roles ))
         {
             iRoles = RoleUtil.getInheritedRoles( roles, this.contextId );
         }
@@ -576,7 +576,7 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr
         checkAccess(CLS_NM, methodName);
         Permission pe = permP.read(perm);
         List<String> retVals;
-        if(pe != null && ObjUtil.isNotNullOrEmpty(pe.getRoles()))
+        if(pe != null && CollectionUtils.isNotEmpty( pe.getRoles() ))
         {
             retVals = new ArrayList<>(pe.getRoles());
         }
@@ -638,7 +638,7 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr
         checkAccess(CLS_NM, methodName);
         Permission pe = permP.read(perm);
         List<String> retVals;
-        if(pe != null && ObjUtil.isNotNullOrEmpty( pe.getUsers() ))
+        if(pe != null && CollectionUtils.isNotEmpty( pe.getUsers() ))
         {
             retVals = new ArrayList<>(pe.getUsers());
         }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
index 5ac73e3..4c57b91 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
@@ -22,6 +22,7 @@ package org.apache.directory.fortress.core.impl;
 
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.FinderException;
 import org.apache.directory.fortress.core.GlobalErrIds;
@@ -207,7 +208,7 @@ final class RoleP
      */
     void addOccupant( List<UserRole> uRoles, String userDn, String contextId ) throws SecurityException
     {
-        if ( ObjUtil.isNotNullOrEmpty( uRoles ) )
+        if ( CollectionUtils.isNotEmpty( uRoles ) )
         {
             for ( UserRole uRole : uRoles )
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
index ee01c38..d4e2ee4 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Hier;
@@ -32,7 +33,6 @@ import org.apache.directory.fortress.core.model.ParentUtil;
 import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -201,14 +201,14 @@ final class RoleUtil implements ParentUtil
     {
         // create Set with case insensitive comparator:
         Set<String> iRoles = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-        if ( ObjUtil.isNotNullOrEmpty( uRoles ) )
+        if ( CollectionUtils.isNotEmpty( uRoles ) )
         {
             for ( UserRole uRole : uRoles )
             {
                 String rleName = uRole.getName();
                 iRoles.add( rleName );
                 Set<String> parents = HierUtil.getAscendants( rleName, getGraph( contextId ) );
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     iRoles.addAll( parents );
                 }
@@ -228,13 +228,13 @@ final class RoleUtil implements ParentUtil
     {
         // create Set with case insensitive comparator:
         Set<String> iRoles = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-        if ( ObjUtil.isNotNullOrEmpty( roles ) )
+        if ( CollectionUtils.isNotEmpty( roles ) )
         {
             for ( String role : roles )
             {
                 iRoles.add( role );
                 Set<String> parents = HierUtil.getAscendants( role, getGraph( contextId ) );
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     iRoles.addAll( parents );
                 }
@@ -254,13 +254,13 @@ final class RoleUtil implements ParentUtil
     {
         // create Set with case insensitive comparator:
         Set<String> iRoles = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-        if ( ObjUtil.isNotNullOrEmpty( roles ) )
+        if ( CollectionUtils.isNotEmpty( roles ) )
         {
             for ( String role : roles )
             {
                 iRoles.add( role );
                 Set<String> children = HierUtil.getDescendants( role, getGraph( contextId ) );
-                if ( ObjUtil.isNotNullOrEmpty( children ) )
+                if ( CollectionUtils.isNotEmpty( children ) )
                 {
                     iRoles.addAll( children );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
index f848087..611246e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.fortress.core.GlobalErrIds;
@@ -32,7 +33,6 @@ import org.apache.directory.fortress.core.model.SDSet;
 import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.util.cache.Cache;
 import org.apache.directory.fortress.core.util.cache.CacheMgr;
 import org.apache.directory.fortress.core.util.cache.DsdCacheEntry;
@@ -117,7 +117,7 @@ final class SDUtil
         ReviewMgr rMgr = ReviewMgrFactory.createInstance(user.getContextId());
         Set<String> rls = rMgr.authorizedRoles(user);
         // Need to proceed?
-        if (!ObjUtil.isNotNullOrEmpty(rls))
+        if (!CollectionUtils.isNotEmpty( rls ))
         {
             return;
         }
@@ -161,7 +161,7 @@ final class SDUtil
     {
         // get all activated roles from user's session:
         List<UserRole> rls = session.getRoles();
-        if (!ObjUtil.isNotNullOrEmpty(rls))
+        if (!CollectionUtils.isNotEmpty( rls ))
         {
             // An empty list of roles was passed in the session variable.
             // No need to continue.
@@ -300,7 +300,7 @@ final class SDUtil
         contextId = getContextId(contextId);
         Set<SDSet> dsdRetSets = new HashSet<>();
         // Need to proceed?
-        if (!ObjUtil.isNotNullOrEmpty(authorizedRoleSet))
+        if (!CollectionUtils.isNotEmpty( authorizedRoleSet ))
         {
             return dsdRetSets;
         }
@@ -368,7 +368,7 @@ final class SDUtil
             Role role = new Role(roleName);
             role.setContextId(contextId);
             List<SDSet> dsdList = sp.search(role, SDSet.SDType.DYNAMIC);
-            if (ObjUtil.isNotNullOrEmpty(dsdList))
+            if (CollectionUtils.isNotEmpty( dsdList ))
             {
                 for (SDSet dsd : dsdList)
                 {
@@ -423,7 +423,7 @@ final class SDUtil
         role.setContextId(contextId);
         List<SDSet> dsdList = sp.search(role, SDSet.SDType.DYNAMIC);
         Set<SDSet> finalSet = new HashSet<>(dsdList);
-        if ( ObjUtil.isNotNullOrEmpty( dsdList ))
+        if ( CollectionUtils.isNotEmpty( dsdList ))
         {
             for (SDSet dsd : dsdList)
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
index 2d2d75a..a848ef2 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -39,7 +40,6 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueEx
 import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
 import org.apache.directory.api.ldap.model.message.SearchScope;
 import org.apache.directory.fortress.core.model.SDSet;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.fortress.core.CreateException;
 import org.apache.directory.fortress.core.FinderException;
@@ -451,7 +451,7 @@ final class SdDAO extends ApacheDsDataProvider
             // Include any parents target role may have:
             Set<String> roles = RoleUtil.getAscendants( role.getName(), role.getContextId() );
 
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 filterbuf.append( "|(" );
                 filterbuf.append( ROLES );
@@ -553,7 +553,7 @@ final class SdDAO extends ApacheDsDataProvider
 
         try
         {
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 StringBuilder filterbuf = new StringBuilder();
                 filterbuf.append( GlobalIds.FILTER_PREFIX );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 2709831..68afc4b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
@@ -1273,7 +1274,7 @@ final class UserDAO extends ApacheDsDataProvider
 
             Set<String> roles = RoleUtil.getDescendants( role.getName(), role.getContextId() );
 
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 filterbuf.append( "|(" );
                 filterbuf.append( GlobalIds.USER_ROLE_ASSIGN );
@@ -1404,7 +1405,7 @@ final class UserDAO extends ApacheDsDataProvider
             filterbuf.append( USERS_AUX_OBJECT_CLASS_NAME );
             filterbuf.append( ")(|" );
 
-            if ( ObjUtil.isNotNullOrEmpty( roles ) )
+            if ( CollectionUtils.isNotEmpty( roles ) )
             {
                 for ( String roleVal : roles )
                 {
@@ -2281,7 +2282,7 @@ final class UserDAO extends ApacheDsDataProvider
     {
         if ( address != null )
         {
-            if ( ObjUtil.isNotNullOrEmpty( address.getAddresses() ) )
+            if ( CollectionUtils.isNotEmpty( address.getAddresses() ) )
             {
                 for ( String val : address.getAddresses() )
                 {
@@ -2342,7 +2343,7 @@ final class UserDAO extends ApacheDsDataProvider
     {
         if ( address != null )
         {
-            if ( ObjUtil.isNotNullOrEmpty( address.getAddresses() ) )
+            if ( CollectionUtils.isNotEmpty( address.getAddresses() ) )
             {
                 mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants
                     .POSTAL_ADDRESS_AT ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index d755475..a5cfe04 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.Administrator;
@@ -462,7 +463,7 @@ final class UserP
             session = createSession( user );
         }
         // Did the caller pass in a set of roles for selective activation?
-        if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
+        if ( CollectionUtils.isNotEmpty( user.getRoles() ) )
         {
             // Process selective activation of user's RBAC roles into session:
             List<UserRole> rlsActual = session.getRoles();
@@ -837,7 +838,7 @@ final class UserP
         ConstraintUtil.validate( entity );
 
         // 3 Validate or copy constraints on RBAC roles:
-        if ( ObjUtil.isNotNullOrEmpty( entity.getRoles() ) )
+        if ( CollectionUtils.isNotEmpty( entity.getRoles() ) )
         {
             RoleP rp = new RoleP();
             List<UserRole> roles = entity.getRoles();
@@ -851,7 +852,7 @@ final class UserP
         }
 
         // 4 Validate and copy constraints on Administrative roles:
-        if ( ObjUtil.isNotNullOrEmpty( entity.getAdminRoles() ) )
+        if ( CollectionUtils.isNotEmpty( entity.getAdminRoles() ) )
         {
             List<UserAdminRole> uRoles = entity.getAdminRoles();
             for ( UserAdminRole uare : uRoles )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
index 38dc67b..4756188 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
@@ -25,12 +25,12 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Hier;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.Relationship;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -158,7 +158,7 @@ final class UsoUtil
         // create Set with case insensitive comparator:
         Set<String> iOUs = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
         
-        if ( ObjUtil.isNotNullOrEmpty( ous ) )
+        if ( CollectionUtils.isNotEmpty( ous ) )
         {
             for ( OrgUnit ou : ous )
             {
@@ -166,7 +166,7 @@ final class UsoUtil
                 iOUs.add( name );
                 Set<String> parents = HierUtil.getAscendants( name, getGraph( contextId ) );
                 
-                if ( ObjUtil.isNotNullOrEmpty( parents ) )
+                if ( CollectionUtils.isNotEmpty( parents ) )
                 {
                     iOUs.addAll( parents );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/util/ObjUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/ObjUtil.java b/src/main/java/org/apache/directory/fortress/core/util/ObjUtil.java
index 1e39e32..fe667df 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/ObjUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/ObjUtil.java
@@ -61,18 +61,6 @@ public final class ObjUtil
 
 
     /**
-     * Method will return true if list is not null or empty.
-     *
-     * @param list contains the reference to list.
-     * @return boolean if validation succeeds.
-     */
-    public static boolean isNotNullOrEmpty( Collection<?> list )
-    {
-        return ( list != null ) && ( list.size() > 0 );
-    }
-
-
-    /**
      * Method will return true if props is not null or empty.
      *
      * @param props contains the reference to props.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
index 35f2fc9..069d7c4 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Properties;
 
+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;
@@ -550,8 +551,8 @@ public final class VUtil implements ConstraintValidator
             return;
         }
         // no need to continue if the role list is empty and we're trying to check role constraints:
-        else if ( type == ConstraintType.ROLE && !ObjUtil.isNotNullOrEmpty( session.getRoles() )
-            && !ObjUtil.isNotNullOrEmpty( session.getAdminRoles() ) )
+        else if ( type == ConstraintType.ROLE && !CollectionUtils.isNotEmpty( session.getRoles() )
+            && !CollectionUtils.isNotEmpty( session.getAdminRoles() ) )
         {
             if ( LOG.isDebugEnabled() )
             {
@@ -576,7 +577,7 @@ public final class VUtil implements ConstraintValidator
             // Check the constraints for each activated role:
             else
             {
-                if ( ObjUtil.isNotNullOrEmpty( session.getRoles() ) )
+                if ( CollectionUtils.isNotEmpty( session.getRoles() ) )
                 {
                     // now check the constraint on every role activation candidate contained within session object:
                     ListIterator<UserRole> roleItems = session.getRoles().listIterator();
@@ -597,7 +598,7 @@ public final class VUtil implements ConstraintValidator
                         }
                     }
                 }
-                if ( ObjUtil.isNotNullOrEmpty( session.getAdminRoles() ) )
+                if ( CollectionUtils.isNotEmpty( session.getAdminRoles() ) )
                 {
                     // now check the constraint on every arbac role activation candidate contained within session object:
                     ListIterator roleItems = session.getAdminRoles().listIterator();
@@ -621,7 +622,7 @@ public final class VUtil implements ConstraintValidator
 
         // now perform DSD validation on session's impl roles:
         if ( checkDsd && DSDVALIDATOR != null && DSDVALIDATOR.length() > 0 && type == ConstraintType.ROLE
-            && ObjUtil.isNotNullOrEmpty( session.getRoles() ) )
+            && CollectionUtils.isNotEmpty( session.getRoles() ) )
         {
             Validator dsdVal = ( Validator ) ClassUtil.createInstance( DSDVALIDATOR );
             dsdVal.validate( session, session.getUser(), null );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index b22ef67..cdd1874 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.fortress.core.example.Example;
@@ -36,7 +37,6 @@ import org.apache.directory.fortress.core.impl.TestUtils;
 import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.model.Constraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -408,7 +408,7 @@ class AdminMgrConsole
             ue.setMobile("444-222-3333");
 */
             User ue2 = am.addUser(ue);
-            if( ObjUtil.isNotNullOrEmpty( ue.getRoles() ) )
+            if( CollectionUtils.isNotEmpty( ue.getRoles() ) )
             {
                 for(UserRole uRole : ue.getRoles())
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
index 5e8cb0b..0906e65 100755
--- a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core;
 
+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;
@@ -29,7 +30,6 @@ import org.apache.directory.fortress.core.model.Mod;
 import org.apache.directory.fortress.core.impl.TestUtils;
 import org.apache.directory.fortress.core.model.UserAudit;
 import org.apache.directory.fortress.core.model.Permission;
-import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.util.AuditUtil;
 import org.apache.directory.fortress.core.util.time.TUtil;
 import org.slf4j.Logger;
@@ -502,7 +502,7 @@ class AuditMgrConsole
         // Here the sample reqDN=ftOpNm=TOP2_2+ftObjId=002,ftObjNm=TOB2_1,ou=Permissions,ou=RBAC,dc=example,dc=com
         // Will be mapped to objName=TOB2_1, opName=TOP2_2, objId=002, in the returned permission object.
         Dn dn = new Dn( authZ.getReqDN() );
-        if(dn != null && dn.getRdns() != null && ObjUtil.isNotNullOrEmpty( dn.getRdns() ) )
+        if(dn != null && dn.getRdns() != null && CollectionUtils.isNotEmpty( dn.getRdns() ) )
         {
             for( Rdn rdn : dn.getRdns() )
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
index 1e4d16c..9d6cf30 100755
--- a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.model.Group;
 
@@ -250,7 +251,7 @@ class GroupMgrConsole
             System.out.println("    name        [" + outGroup.getName() + "]");
             System.out.println("    desc        [" + outGroup.getDescription() + "]");
             System.out.println("    protocol    [" + outGroup.getProtocol() + "]");
-            if ( ObjUtil.isNotNullOrEmpty( outGroup.getMembers() ) )
+            if ( CollectionUtils.isNotEmpty( outGroup.getMembers() ) )
             {
                 int ctr = 0;
                 for (String member : outGroup.getMembers() )
@@ -288,7 +289,7 @@ class GroupMgrConsole
             Group inGroup = new Group( ReaderUtil.readLn() );
 
             List<Group> outGroups = groupMgr.find( inGroup );
-            if(ObjUtil.isNotNullOrEmpty( outGroups ))
+            if(CollectionUtils.isNotEmpty( outGroups ))
             {
                 int grpctr = 0;
                 for( Group outGroup : outGroups )
@@ -297,7 +298,7 @@ class GroupMgrConsole
                     System.out.println("    name        [" + outGroup.getName() + "]");
                     System.out.println("    desc        [" + outGroup.getDescription() + "]");
                     System.out.println("    protocol    [" + outGroup.getProtocol() + "]");
-                    if ( ObjUtil.isNotNullOrEmpty( outGroup.getMembers() ) )
+                    if ( CollectionUtils.isNotEmpty( outGroup.getMembers() ) )
                     {
                         int memberctr = 0;
                         for (String member : outGroup.getMembers() )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index 38c526c..4a5bee2 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.util.ObjUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.impl.TestUtils;
@@ -479,7 +479,7 @@ class ReviewMgrConsole
         if ( address != null )
         {
             System.out.println( label );
-            if ( ObjUtil.isNotNullOrEmpty( address.getAddresses() ) )
+            if ( CollectionUtils.isNotEmpty( address.getAddresses() ) )
             {
                 for ( String addr : address.getAddresses() )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5942f627/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
index e0d69e2..4668ef2 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
@@ -31,6 +31,7 @@ import java.util.TreeSet;
 
 import jodd.util.StringUtil;
 import junit.framework.TestCase;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.model.Address;
@@ -6369,7 +6370,7 @@ public class UserTestData extends TestCase
     {
         List<String> expected = getEmails( usr );
 
-        if ( ObjUtil.isNotNullOrEmpty( expected ) )
+        if ( CollectionUtils.isNotEmpty( expected ) )
         {
             assertNotNull( UserTestData.class.getName() + ".assertEmail null for user: " + getUserId( usr ), emails );
 
@@ -6719,7 +6720,7 @@ public class UserTestData extends TestCase
 
         getElements( props, szInput, PROPS_COL );
 
-        if ( ObjUtil.isNotNullOrEmpty( props ) )
+        if ( CollectionUtils.isNotEmpty( props ) )
         {
             properties = new Properties();
 


Mime
View raw message