You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/06/02 17:26:13 UTC
[1/2] directory-fortress-core git commit: FC-109 - convert to use
StringUtils.isNotBlank instead
Repository: directory-fortress-core
Updated Branches:
refs/heads/1.0-RC41 041697017 -> e447a1ccd
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
index debe582..63e99c4 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+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;
import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -415,7 +416,7 @@ final class UserDAO extends ApacheDsDataProvider
myEntry.add( SchemaConstants.UID_AT, entity.getUserId() );
// CN is required on inetOrgPerson object class, if caller did not set, use the userId:
- if ( !VUtil.isNotNullOrEmpty( entity.getCn() ) )
+ if ( !StringUtils.isNotEmpty( entity.getCn() ) )
{
entity.setCn( entity.getUserId() );
}
@@ -423,7 +424,7 @@ final class UserDAO extends ApacheDsDataProvider
myEntry.add( SchemaConstants.CN_AT, entity.getCn() );
// SN is required on inetOrgPerson object class, if caller did not set, use the userId:
- if ( !VUtil.isNotNullOrEmpty( entity.getSn() ) )
+ if ( !StringUtils.isNotEmpty( entity.getSn() ) )
{
entity.setSn( entity.getUserId() );
}
@@ -436,39 +437,39 @@ final class UserDAO extends ApacheDsDataProvider
{} ) );
myEntry.add( SchemaConstants.DISPLAY_NAME_AT, entity.getCn() );
- if ( VUtil.isNotNullOrEmpty( entity.getTitle() ) )
+ if ( StringUtils.isNotEmpty( entity.getTitle() ) )
{
myEntry.add( SchemaConstants.TITLE_AT, entity.getTitle() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEmployeeType() ) )
+ if ( StringUtils.isNotEmpty( entity.getEmployeeType() ) )
{
myEntry.add( EMPLOYEE_TYPE, entity.getEmployeeType() );
}
/*
TODO: add RFC2307BIS
- if ( VUtil.isNotNullOrEmpty( entity.getUidNumber() ) )
+ if ( StringUtils.isNotEmpty( entity.getUidNumber() ) )
{
myEntry.add( UID_NUMBER, entity.getUidNumber() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getGidNumber() ) )
+ if ( StringUtils.isNotEmpty( entity.getGidNumber() ) )
{
myEntry.add( GID_NUMBER, entity.getGidNumber() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getHomeDirectory() ) )
+ if ( StringUtils.isNotEmpty( entity.getHomeDirectory() ) )
{
myEntry.add( HOME_DIRECTORY, entity.getHomeDirectory() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getLoginShell() ) )
+ if ( StringUtils.isNotEmpty( entity.getLoginShell() ) )
{
myEntry.add( LOGIN_SHELL, entity.getLoginShell() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getGecos() ) )
+ if ( StringUtils.isNotEmpty( entity.getGecos() ) )
{
myEntry.add( GECOS, entity.getGecos() );
}
@@ -486,19 +487,19 @@ final class UserDAO extends ApacheDsDataProvider
myEntry.add( SYSTEM_USER, entity.isSystem().toString().toUpperCase() );
}
- if ( GlobalIds.IS_OPENLDAP && VUtil.isNotNullOrEmpty( entity.getPwPolicy() ) )
+ if ( GlobalIds.IS_OPENLDAP && StringUtils.isNotEmpty( entity.getPwPolicy() ) )
{
String pwdPolicyDn = GlobalIds.POLICY_NODE_TYPE + "=" + entity.getPwPolicy() + "," + getRootDn(
entity.getContextId(), GlobalIds.PPOLICY_ROOT );
myEntry.add( OPENLDAP_POLICY_SUBENTRY, pwdPolicyDn );
}
- if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
+ if ( StringUtils.isNotEmpty( entity.getOu() ) )
{
myEntry.add( SchemaConstants.OU_AT, entity.getOu() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
myEntry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
@@ -549,19 +550,19 @@ final class UserDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getCn() ) )
+ if ( StringUtils.isNotEmpty( entity.getCn() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.CN_AT,
entity.getCn() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getSn() ) )
+ if ( StringUtils.isNotEmpty( entity.getSn() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.SN_AT,
entity.getSn() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
+ if ( StringUtils.isNotEmpty( entity.getOu() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.OU_AT,
entity.getOu() ) );
@@ -573,25 +574,25 @@ final class UserDAO extends ApacheDsDataProvider
.USER_PASSWORD_AT, new String( entity.getPassword() ) ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants
.DESCRIPTION_AT, entity.getDescription() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEmployeeType() ) )
+ if ( StringUtils.isNotEmpty( entity.getEmployeeType() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, EMPLOYEE_TYPE, entity
.getEmployeeType() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getTitle() ) )
+ if ( StringUtils.isNotEmpty( entity.getTitle() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.TITLE_AT,
entity.getTitle() ) );
}
- if ( GlobalIds.IS_OPENLDAP && VUtil.isNotNullOrEmpty( entity.getPwPolicy() ) )
+ if ( GlobalIds.IS_OPENLDAP && StringUtils.isNotEmpty( entity.getPwPolicy() ) )
{
String szDn = GlobalIds.POLICY_NODE_TYPE + "=" + entity.getPwPolicy() + "," + getRootDn( entity
.getContextId(), GlobalIds.PPOLICY_ROOT );
@@ -611,7 +612,7 @@ final class UserDAO extends ApacheDsDataProvider
entity.setName( entity.getUserId() );
String szRawData = CUtil.setConstraint( entity );
- if ( VUtil.isNotNullOrEmpty( szRawData ) )
+ if ( StringUtils.isNotEmpty( szRawData ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.CONSTRAINT,
szRawData ) );
@@ -1135,7 +1136,7 @@ final class UserDAO extends ApacheDsDataProvider
{
//String filter;
StringBuilder filterbuf = new StringBuilder();
- if ( VUtil.isNotNullOrEmpty( user.getUserId() ) )
+ if ( StringUtils.isNotEmpty( user.getUserId() ) )
{
// place a wild card after the input userId:
String searchVal = encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
@@ -1147,7 +1148,7 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( searchVal );
filterbuf.append( "*))" );
}
- else if ( VUtil.isNotNullOrEmpty( user.getInternalId() ) )
+ else if ( StringUtils.isNotEmpty( user.getInternalId() ) )
{
// internalUserId search
String searchVal = encodeSafeText( user.getInternalId(), GlobalIds.USERID_LEN );
@@ -2087,7 +2088,7 @@ final class UserDAO extends ApacheDsDataProvider
entity.setReset( true );
}
String szPolicy = getAttribute( entry, OPENLDAP_POLICY_SUBENTRY );
- if ( VUtil.isNotNullOrEmpty( szPolicy ) )
+ if ( StringUtils.isNotEmpty( szPolicy ) )
{
entity.setPwPolicy( getRdn( szPolicy ) );
}
@@ -2288,42 +2289,42 @@ final class UserDAO extends ApacheDsDataProvider
}
}
- if ( VUtil.isNotNullOrEmpty( address.getCity() ) )
+ if ( StringUtils.isNotEmpty( address.getCity() ) )
{
entry.add( SchemaConstants.L_AT, address.getCity() );
}
- //if(VUtil.isNotNullOrEmpty(address.getCountry()))
+ //if(StringUtils.isNotEmpty(address.getCountry()))
//{
// attrs.add(GlobalIds.COUNTRY, address.getAddress1());
//}
- if ( VUtil.isNotNullOrEmpty( address.getPostalCode() ) )
+ if ( StringUtils.isNotEmpty( address.getPostalCode() ) )
{
entry.add( SchemaConstants.POSTALCODE_AT, address.getPostalCode() );
}
- if ( VUtil.isNotNullOrEmpty( address.getPostOfficeBox() ) )
+ if ( StringUtils.isNotEmpty( address.getPostOfficeBox() ) )
{
entry.add( SchemaConstants.POSTOFFICEBOX_AT, address.getPostOfficeBox() );
}
- if ( VUtil.isNotNullOrEmpty( address.getState() ) )
+ if ( StringUtils.isNotEmpty( address.getState() ) )
{
entry.add( SchemaConstants.ST_AT, address.getState() );
}
- if ( VUtil.isNotNullOrEmpty( address.getBuilding() ) )
+ if ( StringUtils.isNotEmpty( address.getBuilding() ) )
{
entry.add( SchemaConstants.PHYSICAL_DELIVERY_OFFICE_NAME_AT, address.getBuilding() );
}
- if ( VUtil.isNotNullOrEmpty( address.getDepartmentNumber() ) )
+ if ( StringUtils.isNotEmpty( address.getDepartmentNumber() ) )
{
entry.add( DEPARTMENT_NUMBER, address.getDepartmentNumber() );
}
- if ( VUtil.isNotNullOrEmpty( address.getRoomNumber() ) )
+ if ( StringUtils.isNotEmpty( address.getRoomNumber() ) )
{
entry.add( ROOM_NUMBER, address.getRoomNumber() );
}
@@ -2353,43 +2354,43 @@ final class UserDAO extends ApacheDsDataProvider
}
}
- if ( VUtil.isNotNullOrEmpty( address.getCity() ) )
+ if ( StringUtils.isNotEmpty( address.getCity() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.L_AT,
address.getCity() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getPostalCode() ) )
+ if ( StringUtils.isNotEmpty( address.getPostalCode() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants
.POSTALCODE_AT, address.getPostalCode() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getPostOfficeBox() ) )
+ if ( StringUtils.isNotEmpty( address.getPostOfficeBox() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants
.POSTOFFICEBOX_AT, address.getPostOfficeBox() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getState() ) )
+ if ( StringUtils.isNotEmpty( address.getState() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.ST_AT,
address.getState() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getBuilding() ) )
+ if ( StringUtils.isNotEmpty( address.getBuilding() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants
.PHYSICAL_DELIVERY_OFFICE_NAME_AT, address.getBuilding() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getDepartmentNumber() ) )
+ if ( StringUtils.isNotEmpty( address.getDepartmentNumber() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, DEPARTMENT_NUMBER,
address.getDepartmentNumber() ) );
}
- if ( VUtil.isNotNullOrEmpty( address.getRoomNumber() ) )
+ if ( StringUtils.isNotEmpty( address.getRoomNumber() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, ROOM_NUMBER, address
.getRoomNumber() ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
index a2c5905..7b234d8 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.apache.directory.fortress.core.model.PwPolicy;
@@ -716,11 +717,11 @@ public final class UserP
*/
private void validate( UserRole uRole ) throws ValidationException
{
- if ( !VUtil.isNotNullOrEmpty( uRole.getUserId() ) )
+ if ( !StringUtils.isNotEmpty( uRole.getUserId() ) )
{
throw new ValidationException( GlobalErrIds.USER_ID_NULL, CLS_NM + ".validate userId is NULL" );
}
- if ( !VUtil.isNotNullOrEmpty( uRole.getName() ) )
+ if ( !StringUtils.isNotEmpty( uRole.getName() ) )
{
throw new ValidationException( GlobalErrIds.ROLE_NM_NULL, CLS_NM + ".validate name is NULL" );
}
@@ -747,12 +748,12 @@ public final class UserP
VUtil.userId( entity.getUserId() );
// the cn attribute is optional as input. entity will default to userId if cn not set by caller on add:
- if ( VUtil.isNotNullOrEmpty( entity.getCn() ) )
+ if ( StringUtils.isNotEmpty( entity.getCn() ) )
{
VUtil.safeText( entity.getCn(), GlobalIds.CN_LEN );
}
// the sn attribute is optional as input. entity will default to userId if sn not set by caller on add:
- if ( VUtil.isNotNullOrEmpty( entity.getSn() ) )
+ if ( StringUtils.isNotEmpty( entity.getSn() ) )
{
VUtil.safeText( entity.getSn(), GlobalIds.SN_LEN );
}
@@ -762,7 +763,7 @@ public final class UserP
VUtil.password( entity.getPassword() );
}
// the OU attribute is required:
- if ( !VUtil.isNotNullOrEmpty( entity.getOu() ) )
+ if ( !StringUtils.isNotEmpty( entity.getOu() ) )
{
String error = "OU validation failed, null or empty value";
throw new ValidationException( GlobalErrIds.ORG_NULL_USER, error );
@@ -778,7 +779,7 @@ public final class UserP
throw new ValidationException( GlobalErrIds.USER_OU_INVALID, error );
}
// description attribute is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
@@ -786,11 +787,11 @@ public final class UserP
else
{
// on User update, all attributes are optional:
- if ( VUtil.isNotNullOrEmpty( entity.getCn() ) )
+ if ( StringUtils.isNotEmpty( entity.getCn() ) )
{
VUtil.safeText( entity.getCn(), GlobalIds.CN_LEN );
}
- if ( VUtil.isNotNullOrEmpty( entity.getSn() ) )
+ if ( StringUtils.isNotEmpty( entity.getSn() ) )
{
VUtil.safeText( entity.getSn(), GlobalIds.SN_LEN );
}
@@ -798,7 +799,7 @@ public final class UserP
{
VUtil.password( entity.getPassword() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
+ if ( StringUtils.isNotEmpty( entity.getOu() ) )
{
VUtil.orgUnit( entity.getOu() );
// ensure ou exists in the OS-U pool:
@@ -811,14 +812,14 @@ public final class UserP
throw new ValidationException( GlobalErrIds.USER_OU_INVALID, error );
}
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
}
// 1 OpenLDAP password policy name must be valid if set:
- if ( VUtil.isNotNullOrEmpty( entity.getPwPolicy() ) )
+ if ( StringUtils.isNotEmpty( entity.getPwPolicy() ) )
{
PwPolicy policy = new PwPolicy( entity.getPwPolicy() );
policy.setContextId( entity.getContextId() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
index 4419751..f29e94a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
+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;
@@ -300,7 +301,7 @@ public final class UsoUtil
private static String getKey( String contextId )
{
String key = HierUtil.Type.USO.toString();
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/util/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index a598a93..159b8b0 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -25,6 +25,7 @@ import java.util.Enumeration;
import java.util.Properties;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.ConfigMgr;
import org.apache.directory.fortress.core.ConfigMgrFactory;
import org.apache.directory.fortress.core.util.attr.VUtil;
@@ -397,14 +398,14 @@ public final class Config
String PREFIX = "getExternalConfig override name [{}] value [{}]";
// Check to see if the ldap host has been overridden by a system property:
String szValue = System.getProperty( EXT_LDAP_HOST );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_HOST, szValue );
LOG.info( PREFIX, GlobalIds.LDAP_HOST, szValue );
}
// Check to see if the ldap port has been overridden by a system property:
szValue = System.getProperty( EXT_LDAP_PORT );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_PORT, szValue );
LOG.info( PREFIX, GlobalIds.LDAP_PORT, szValue );
@@ -412,7 +413,7 @@ public final class Config
// Check to see if the admin pool uid has been overridden by a system property:
szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_UID );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_ADMIN_POOL_UID, szValue );
// never display ldap admin userid name to log:
@@ -421,7 +422,7 @@ public final class Config
// Check to see if the admin pool pw has been overridden by a system property:
szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_PW );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_ADMIN_POOL_PW, szValue );
// never display password of any type to log:
@@ -430,7 +431,7 @@ public final class Config
// Check to see if the admin pool min connections has been overridden by a system property:
szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MIN );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MIN, szValue );
@@ -438,7 +439,7 @@ public final class Config
// Check to see if the admin pool max connections has been overridden by a system property:
szValue = System.getProperty( EXT_LDAP_ADMIN_POOL_MAX );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.LDAP_ADMIN_POOL_MAX, Integer.valueOf( szValue ) );
LOG.info( PREFIX, GlobalIds.LDAP_ADMIN_POOL_MAX, szValue );
@@ -446,7 +447,7 @@ public final class Config
// Check to see if ssl enabled parameter has been overridden by a system property:
szValue = System.getProperty( EXT_ENABLE_LDAP_SSL );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.ENABLE_LDAP_SSL, szValue );
LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL, szValue );
@@ -454,7 +455,7 @@ public final class Config
// Check to see if the ssl debug enabled parameter has been overridden by a system property:
szValue = System.getProperty( EXT_ENABLE_LDAP_SSL_DEBUG );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
LOG.info( PREFIX, GlobalIds.ENABLE_LDAP_SSL_DEBUG, szValue );
@@ -462,7 +463,7 @@ public final class Config
// Check to see if the trust store location has been overridden by a system property:
szValue = System.getProperty( EXT_TRUST_STORE );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.TRUST_STORE, szValue );
LOG.info( PREFIX, GlobalIds.TRUST_STORE, szValue );
@@ -470,7 +471,7 @@ public final class Config
// Check to see if the trust store password has been overridden by a system property:
szValue = System.getProperty( EXT_TRUST_STORE_PW );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.TRUST_STORE_PW, szValue );
// never display password value to log:
@@ -479,7 +480,7 @@ public final class Config
// Check to see if the trust store set parameter has been overridden by a system property:
szValue = System.getProperty( EXT_SET_TRUST_STORE_PROP );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.SET_TRUST_STORE_PROP, szValue );
LOG.info( PREFIX, GlobalIds.SET_TRUST_STORE_PROP, szValue );
@@ -487,7 +488,7 @@ public final class Config
// Check to see if the config realm name has been overridden by a system property:
szValue = System.getProperty( EXT_CONFIG_REALM );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.CONFIG_REALM, szValue );
LOG.info( PREFIX, GlobalIds.CONFIG_REALM, szValue );
@@ -495,7 +496,7 @@ public final class Config
// Check to see if the ldap server type has been overridden by a system property:
szValue = System.getProperty( EXT_SERVER_TYPE );
- if( VUtil.isNotNullOrEmpty( szValue ))
+ if( StringUtils.isNotEmpty( szValue ))
{
config.setProperty( GlobalIds.SERVER_TYPE, szValue );
LOG.info( PREFIX, GlobalIds.SERVER_TYPE, szValue );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
index 89f95c9..a311618 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.util;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.GlobalIds;
@@ -50,7 +51,7 @@ public final class LogUtil
{
if ( LOG.isDebugEnabled() || LOG.isInfoEnabled() || LOG.isWarnEnabled() || LOG.isErrorEnabled() )
{
- if ( VUtil.isNotNullOrEmpty( getContext() ) )
+ if ( StringUtils.isNotEmpty( getContext() ) )
{
msg = getContext() + " " + msg;
}
@@ -79,7 +80,7 @@ public final class LogUtil
String contextId = null;
String tenant = System.getProperty( GlobalIds.TENANT );
- if ( VUtil.isNotNullOrEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
+ if ( StringUtils.isNotEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
{
contextId = tenant;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
index a391583..0565b77 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.Properties;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -104,7 +105,7 @@ public final class VUtil
*/
public static void orgUnit( String orgUnitId ) throws ValidationException
{
- if ( !isNotNullOrEmpty( orgUnitId ) )
+ if ( !StringUtils.isNotEmpty( orgUnitId ) )
{
String error = "orgUnit is null";
throw new ValidationException( GlobalErrIds.ORG_NULL, error );
@@ -166,7 +167,7 @@ public final class VUtil
*/
public static void safeText( String value, int validLen ) throws ValidationException
{
- if ( !isNotNullOrEmpty( value ) )
+ if ( !StringUtils.isNotEmpty( value ) )
{
String error = "safeText null value";
throw new ValidationException( GlobalErrIds.CONST_NULL_TEXT, error );
@@ -192,7 +193,7 @@ public final class VUtil
*/
public static void userId( String userId ) throws ValidationException
{
- if ( !isNotNullOrEmpty( userId ) )
+ if ( !StringUtils.isNotEmpty( userId ) )
{
String error = "userId validation failed, null or empty value";
throw new ValidationException( GlobalErrIds.USER_ID_NULL, error );
@@ -302,7 +303,7 @@ public final class VUtil
public static void beginDate( String beginDate )
throws ValidationException
{
- if ( isNotNullOrEmpty( beginDate ) )
+ if ( StringUtils.isNotEmpty( beginDate ) )
{
if ( ( beginDate.compareToIgnoreCase( GlobalIds.NONE ) != 0 ) &&
( ( beginDate.length() != DATE_LEN ) || checkDate( beginDate ) ) )
@@ -326,7 +327,7 @@ public final class VUtil
*/
public static void endDate( String endDate ) throws ValidationException
{
- if ( isNotNullOrEmpty( endDate ) )
+ if ( StringUtils.isNotEmpty( endDate ) )
{
if ( endDate.compareToIgnoreCase( GlobalIds.NONE ) != 0 )
{
@@ -352,7 +353,7 @@ public final class VUtil
*/
public static void dayMask( String dayMask ) throws ValidationException
{
- if ( isNotNullOrEmpty( dayMask ) )
+ if ( StringUtils.isNotEmpty( dayMask ) )
{
if ( dayMask.compareToIgnoreCase( GlobalIds.ALL ) != 0 )
{
@@ -470,7 +471,7 @@ public final class VUtil
public static void assertNotNullOrEmpty( String value, int errorCode, String method )
throws ValidationException
{
- if ( !isNotNullOrEmpty( value ) )
+ if ( !StringUtils.isNotEmpty( value ) )
{
String error = "assertContext detected null entity for method [" + method + "], error code ["
+ errorCode + "]";
@@ -517,10 +518,12 @@ public final class VUtil
* @param value contains the reference to string.
* @return boolean if validation succeeds.
*/
+/*
public static boolean isNotNullOrEmpty( String value )
{
return ( value != null ) && ( value.length() > 0 );
}
+*/
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
index 1410015..9e8bc20 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.util.time;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.CfgException;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.model.ObjectFactory;
@@ -81,7 +82,7 @@ public class CUtil
*/
public static void setConstraint( String inputString, Constraint constraint )
{
- if ( VUtil.isNotNullOrEmpty( inputString ) )
+ if ( StringUtils.isNotEmpty( inputString ) )
{
StringTokenizer tkn = new StringTokenizer( inputString, GlobalIds.DELIMITER, true );
if ( tkn.countTokens() > 0 )
@@ -234,31 +235,31 @@ public class CUtil
{
VUtil.timeout( c1.getTimeout() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getBeginTime() ) )
+ if ( StringUtils.isNotEmpty( c1.getBeginTime() ) )
{
VUtil.beginTime( c1.getBeginTime() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getEndTime() ) )
+ if ( StringUtils.isNotEmpty( c1.getEndTime() ) )
{
VUtil.endTime( c1.getEndTime() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getBeginDate() ) )
+ if ( StringUtils.isNotEmpty( c1.getBeginDate() ) )
{
VUtil.beginDate( c1.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getEndDate() ) )
+ if ( StringUtils.isNotEmpty( c1.getEndDate() ) )
{
VUtil.endDate( c1.getEndDate() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getDayMask() ) )
+ if ( StringUtils.isNotEmpty( c1.getDayMask() ) )
{
VUtil.dayMask( c1.getDayMask() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getBeginLockDate() ) )
+ if ( StringUtils.isNotEmpty( c1.getBeginLockDate() ) )
{
VUtil.beginDate( c1.getBeginLockDate() );
}
- if ( VUtil.isNotNullOrEmpty( c1.getEndLockDate() ) )
+ if ( StringUtils.isNotEmpty( c1.getEndLockDate() ) )
{
VUtil.endDate( c1.getEndLockDate() );
}
@@ -286,59 +287,59 @@ public class CUtil
{
trgC.setTimeout( srcC.getTimeout() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getBeginTime() ) )
+ if ( StringUtils.isNotEmpty( trgC.getBeginTime() ) )
{
VUtil.beginTime( trgC.getBeginTime() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getBeginTime() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getBeginTime() ) )
{
trgC.setBeginTime( srcC.getBeginTime() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getEndTime() ) )
+ if ( StringUtils.isNotEmpty( trgC.getEndTime() ) )
{
VUtil.endTime( trgC.getEndTime() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getEndTime() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getEndTime() ) )
{
trgC.setEndTime( srcC.getEndTime() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getBeginDate() ) )
+ if ( StringUtils.isNotEmpty( trgC.getBeginDate() ) )
{
VUtil.beginDate( trgC.getBeginDate() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getBeginDate() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getBeginDate() ) )
{
trgC.setBeginDate( srcC.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getEndDate() ) )
+ if ( StringUtils.isNotEmpty( trgC.getEndDate() ) )
{
VUtil.endDate( trgC.getEndDate() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getEndDate() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getEndDate() ) )
{
trgC.setEndDate( srcC.getEndDate() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getDayMask() ) )
+ if ( StringUtils.isNotEmpty( trgC.getDayMask() ) )
{
VUtil.dayMask( trgC.getDayMask() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getDayMask() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getDayMask() ) )
{
trgC.setDayMask( srcC.getDayMask() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getBeginLockDate() ) )
+ if ( StringUtils.isNotEmpty( trgC.getBeginLockDate() ) )
{
VUtil.beginDate( trgC.getBeginLockDate() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getBeginLockDate() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getBeginLockDate() ) )
{
trgC.setBeginLockDate( srcC.getBeginLockDate() );
}
- if ( VUtil.isNotNullOrEmpty( trgC.getEndLockDate() ) )
+ if ( StringUtils.isNotEmpty( trgC.getEndLockDate() ) )
{
VUtil.endDate( trgC.getEndLockDate() );
}
- else if ( VUtil.isNotNullOrEmpty( srcC.getEndLockDate() ) )
+ else if ( StringUtils.isNotEmpty( srcC.getEndLockDate() ) )
{
trgC.setEndLockDate( srcC.getEndLockDate() );
}
@@ -386,35 +387,35 @@ public class CUtil
// Both variables must be instantiated before being passed in to this method.
trgC.setTimeout( srcC.getTimeout() );
- if ( VUtil.isNotNullOrEmpty( srcC.getName() ) )
+ if ( StringUtils.isNotEmpty( srcC.getName() ) )
{
trgC.setName( srcC.getName() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getBeginTime() ) )
+ if ( StringUtils.isNotEmpty( srcC.getBeginTime() ) )
{
trgC.setBeginTime( srcC.getBeginTime() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getEndTime() ) )
+ if ( StringUtils.isNotEmpty( srcC.getEndTime() ) )
{
trgC.setEndTime( srcC.getEndTime() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getDayMask() ) )
+ if ( StringUtils.isNotEmpty( srcC.getDayMask() ) )
{
trgC.setDayMask( srcC.getDayMask() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getBeginDate() ) )
+ if ( StringUtils.isNotEmpty( srcC.getBeginDate() ) )
{
trgC.setBeginDate( srcC.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getEndDate() ) )
+ if ( StringUtils.isNotEmpty( srcC.getEndDate() ) )
{
trgC.setEndDate( srcC.getEndDate() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getBeginLockDate() ) )
+ if ( StringUtils.isNotEmpty( srcC.getBeginLockDate() ) )
{
trgC.setBeginLockDate( srcC.getBeginLockDate() );
}
- if ( VUtil.isNotNullOrEmpty( srcC.getEndLockDate() ) )
+ if ( StringUtils.isNotEmpty( srcC.getEndLockDate() ) )
{
trgC.setEndLockDate( srcC.getEndLockDate() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/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 fcc03f3..9ad54ee 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.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.example.Example;
import org.apache.directory.fortress.core.example.ExampleAdminMgr;
@@ -388,7 +389,7 @@ class AdminMgrConsole
System.out.println("Enter password policy (or NULL to skip):");
String policy = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(policy))
+ if( StringUtils.isNotEmpty( policy ))
{
ue.setPwPolicy(policy);
}
@@ -407,7 +408,7 @@ class AdminMgrConsole
ue.setMobile("444-222-3333");
*/
User ue2 = am.addUser(ue);
- if(VUtil.isNotNullOrEmpty(ue.getRoles()))
+ if(VUtil.isNotNullOrEmpty( ue.getRoles() ) )
{
for(UserRole uRole : ue.getRoles())
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/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 1b4ee42..4c56f0d 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.lang.StringUtils;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.fortress.core.model.Bind;
import org.apache.directory.fortress.core.model.AuthZ;
@@ -269,7 +270,7 @@ class AuditMgrConsole
uAudit.setOpName(val);
System.out.println("Enter userId to search Audit AuthZs with:");
val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -308,7 +309,7 @@ class AuditMgrConsole
UserAudit uAudit = new UserAudit();
System.out.println("Enter userId to search Audit AuthZs with:");
String val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -346,7 +347,7 @@ class AuditMgrConsole
UserAudit uAudit = new UserAudit();
System.out.println("Enter userId to search Audit AuthZs with:");
String val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -644,7 +645,7 @@ class AuditMgrConsole
UserAudit uAudit = new UserAudit();
System.out.println("Enter userId to search Audit Mods with:");
String val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -738,7 +739,7 @@ class AuditMgrConsole
UserAudit uAudit = new UserAudit();
System.out.println("Enter userId to search Audit Mods with or NULL for skip:");
String val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -779,14 +780,14 @@ class AuditMgrConsole
System.out.println("Enter admin object name to search Audit Mods with or NULL for skip:");
val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setObjName(val);
System.out.println("size=" + val.length() + " val=" + val);
}
System.out.println("Enter admin operation name to search Audit Mods with or NULL for skip:");
val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if(StringUtils.isNotEmpty( val ))
{
uAudit.setOpName(val);
System.out.println("size=" + val.length() + " val=" + val);
@@ -811,7 +812,7 @@ class AuditMgrConsole
UserAudit uAudit = new UserAudit();
System.out.println("Enter userId to search Audit AuthZs with:");
String val = ReaderUtil.readLn();
- if(VUtil.isNotNullOrEmpty(val))
+ if( StringUtils.isNotEmpty( val ))
{
uAudit.setUserId(val);
System.out.println("size=" + val.length() + " val=" + val);
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/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 96ad389..db2de58 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.lang.StringUtils;
import org.apache.directory.fortress.core.ldap.group.Group;
import org.apache.directory.fortress.core.ldap.group.GroupMgr;
import org.apache.directory.fortress.core.ldap.group.GroupMgrFactory;
@@ -105,12 +106,12 @@ class GroupMgrConsole
System.out.println("Enter member userId or NULL to skip");
String userId = ReaderUtil.readLn();
- if (VUtil.isNotNullOrEmpty( userId ))
+ if ( StringUtils.isNotEmpty( userId ))
group.setMember( userId );
System.out.println("Enter property key or NULL to skip");
String key = ReaderUtil.readLn();
- if (VUtil.isNotNullOrEmpty( key ))
+ if (StringUtils.isNotEmpty( key ))
{
System.out.println("Enter property value");
String value = ReaderUtil.readLn();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 920b444..939601e 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.jmeter;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
@@ -161,7 +162,7 @@ public class CheckAccess extends AbstractJavaSamplerClient
public void setupTest( JavaSamplerContext samplerContext )
{
ctr = 0;
- if(!VUtil.isNotNullOrEmpty( userId ))
+ if(!StringUtils.isNotEmpty( userId ))
{
// Load userids are format: loadtestuserN - where N is a number between 0 and 99.
// i.e. loadtestuser0, loadtestuser1, ... loadtestuser99
@@ -179,7 +180,7 @@ public class CheckAccess extends AbstractJavaSamplerClient
User user = new User(userId);
// positive test case:
user.setPassword( "secret".toCharArray() );
- if( VUtil.isNotNullOrEmpty( val ) && val.equals( "1" ))
+ if( StringUtils.isNotEmpty( val ) && val.equals( "1" ))
{
message = "AC SETUP CreateSession, User: " + user.getUserId() + ", key: " + key + ", TID: " + getThreadId();
isFortress = false;
@@ -209,7 +210,7 @@ public class CheckAccess extends AbstractJavaSamplerClient
session = accessMgr.createSession( user, false );
}
/*
- if( VUtil.isNotNullOrEmpty( val ) && val.equals( "1" ))
+ if( StringUtils.isNotEmpty( val ) && val.equals( "1" ))
{
message = "FT SETUP CreateSession, User: " + user.getUserId() + ", key: " + key + ", TID: " + getThreadId();
isFortress = true;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
index 60029c2..4668b5f 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
@@ -26,6 +26,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.model.User;
@@ -238,7 +239,7 @@ public class AccelMgrImplTest extends TestCase
for ( String[] op : opArray )
{
Permission goodPerm;
- if( VUtil.isNotNullOrEmpty( PermTestData.getObjId( opArray[j] ) ) )
+ if( StringUtils.isNotEmpty( PermTestData.getObjId( opArray[j] ) ) )
{
// with an objectId:
goodPerm = new Permission(
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
index f3237f2..f41a2c5 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
@@ -29,6 +29,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.SDSet;
import org.apache.directory.fortress.core.model.Session;
@@ -749,7 +750,7 @@ public class AccessMgrImplTest extends TestCase
for ( String[] op : opArray )
{
Permission goodPerm;
- if( VUtil.isNotNullOrEmpty( PermTestData.getObjId( opArray[j] ) ) )
+ if( StringUtils.isNotEmpty( PermTestData.getObjId( opArray[j] ) ) )
{
// with an objectId:
goodPerm = new Permission(
@@ -770,7 +771,7 @@ public class AccessMgrImplTest extends TestCase
PermTestData.getName( obj ) + "] operationName [" + PermTestData.getName( op ) + "]",
accessMgr.checkAccess( session, goodPerm ) );
Permission badPerm;
- if( VUtil.isNotNullOrEmpty( PermTestData.getObjId( opArrayBad[j] ) ) )
+ if( StringUtils.isNotEmpty( PermTestData.getObjId( opArrayBad[j] ) ) )
{
// with an objectId:
badPerm = new Permission(
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
index c6f1b7a..7d871b1 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.util.time.Constraint;
import org.slf4j.Logger;
@@ -905,7 +906,7 @@ public class AdminRoleTestData extends TestCase
private static Set<String> getOsU( String[] rle )
{
Set<String> members = new HashSet<>();
- if ( VUtil.isNotNullOrEmpty( rle[OSU] ) )
+ if ( StringUtils.isNotEmpty( rle[OSU] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[OSU], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -924,7 +925,7 @@ public class AdminRoleTestData extends TestCase
private static Set<String> getOsP( String[] rle )
{
Set<String> members = new HashSet<>();
- if ( VUtil.isNotNullOrEmpty( rle[OSP] ) )
+ if ( StringUtils.isNotEmpty( rle[OSP] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[OSP], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -955,7 +956,7 @@ public class AdminRoleTestData extends TestCase
private static boolean isBeginInclusive( String[] rle )
{
boolean result = false;
- if ( VUtil.isNotNullOrEmpty( rle[IS_BEGIN_INCLUSIVE] )
+ if ( StringUtils.isNotEmpty( rle[IS_BEGIN_INCLUSIVE] )
&& rle[IS_BEGIN_INCLUSIVE].equalsIgnoreCase( "T" ) )
{
result = true;
@@ -968,7 +969,7 @@ public class AdminRoleTestData extends TestCase
private static boolean isEndInclusive( String[] rle )
{
boolean result = false;
- if ( VUtil.isNotNullOrEmpty( rle[IS_END_INCLUSIVE] ) && rle[IS_END_INCLUSIVE].equalsIgnoreCase( "T" ) )
+ if ( StringUtils.isNotEmpty( rle[IS_END_INCLUSIVE] ) && rle[IS_END_INCLUSIVE].equalsIgnoreCase( "T" ) )
{
result = true;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
index b52d16f..eb15bd9 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
@@ -27,6 +27,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -846,7 +847,7 @@ public class OrgUnitTestData extends TestCase
{
String relationShip = ole[RELATIONSHIP_COL];
- if ( VUtil.isNotNullOrEmpty( relationShip ) )
+ if ( StringUtils.isNotEmpty( relationShip ) )
{
StringTokenizer charSetTkn = new StringTokenizer( relationShip, TestUtils.DELIMITER_TEST_DATA );
@@ -874,7 +875,7 @@ public class OrgUnitTestData extends TestCase
Set<String> rels = new HashSet<>();
String inheritances = ole[INHERITANCE_COL];
- if ( VUtil.isNotNullOrEmpty( inheritances ) )
+ if ( StringUtils.isNotEmpty( inheritances ) )
{
StringTokenizer charSetTkn = new StringTokenizer( inheritances, TestUtils.DELIMITER_TEST_DATA );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
index e63fc69..8dbdb13 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
@@ -25,6 +25,7 @@ import java.util.Map;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -995,7 +996,7 @@ public class PRATestData extends TestCase
public static boolean isCanGrant( String[] ura )
{
boolean isCanGrant = false;
- if ( VUtil.isNotNullOrEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
+ if ( StringUtils.isNotEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
{
isCanGrant = true;
}
@@ -1006,7 +1007,7 @@ public class PRATestData extends TestCase
public static boolean isCanRevoke( String[] ura )
{
boolean isCanRevoke = false;
- if ( VUtil.isNotNullOrEmpty( ura[CAN_ASSIGN_COL] )
+ if ( StringUtils.isNotEmpty( ura[CAN_ASSIGN_COL] )
&& ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
{
isCanRevoke = true;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
index 86ac5f0..f9ee498 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
@@ -30,6 +30,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.Role;
import org.apache.directory.fortress.core.model.SDSet;
import org.apache.directory.fortress.core.model.UserRole;
@@ -3259,7 +3260,7 @@ public class RoleTestData extends TestCase
public static Set<String> getRelationships( String[] rle )
{
Set<String> parents = new HashSet<>();
- if ( VUtil.isNotNullOrEmpty( rle[RELATIONSHIP_COL] ) )
+ if ( StringUtils.isNotEmpty( rle[RELATIONSHIP_COL] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[RELATIONSHIP_COL], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -3278,7 +3279,7 @@ public class RoleTestData extends TestCase
public static List<String> getRelationshipList( String[] rle )
{
List<String> parents = new ArrayList<>();
- if ( VUtil.isNotNullOrEmpty( rle[RELATIONSHIP_COL] ) )
+ if ( StringUtils.isNotEmpty( rle[RELATIONSHIP_COL] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[RELATIONSHIP_COL], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -3302,7 +3303,7 @@ public class RoleTestData extends TestCase
public static Set<String> getInheritances( String[] rle )
{
Set<String> rels = new HashSet<>();
- if ( VUtil.isNotNullOrEmpty( rle[INHERITANCE_COL] ) )
+ if ( StringUtils.isNotEmpty( rle[INHERITANCE_COL] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[INHERITANCE_COL], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -3326,7 +3327,7 @@ public class RoleTestData extends TestCase
public static boolean isCreate( String[] rle )
{
boolean isAsc = false;
- if ( VUtil.isNotNullOrEmpty( rle[INHERITANCE_FLAG_COL] ) && rle[INHERITANCE_FLAG_COL].equalsIgnoreCase( "C" ) )
+ if ( StringUtils.isNotEmpty( rle[INHERITANCE_FLAG_COL] ) && rle[INHERITANCE_FLAG_COL].equalsIgnoreCase( "C" ) )
{
isAsc = true;
}
@@ -3343,7 +3344,7 @@ public class RoleTestData extends TestCase
public static boolean isTree( String[] rle )
{
boolean result = false;
- if ( VUtil.isNotNullOrEmpty( rle[INHERITANCE_FLAG_COL] ) && rle[INHERITANCE_FLAG_COL].equalsIgnoreCase( "T" ) )
+ if ( StringUtils.isNotEmpty( rle[INHERITANCE_FLAG_COL] ) && rle[INHERITANCE_FLAG_COL].equalsIgnoreCase( "T" ) )
{
result = true;
}
@@ -3444,7 +3445,7 @@ public class RoleTestData extends TestCase
public static Set<String> getMembers( String[] rle )
{
Set<String> mems = new HashSet<>();
- if ( VUtil.isNotNullOrEmpty( rle[MEMBERS] ) )
+ if ( StringUtils.isNotEmpty( rle[MEMBERS] ) )
{
StringTokenizer charSetTkn = new StringTokenizer( rle[MEMBERS], TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
@@ -3469,7 +3470,7 @@ public class RoleTestData extends TestCase
public static Map<String, String> getMembers(String[] rle)
{
Map<String, String> mems = new HashMap<>();
- if(org.apache.directory.fortress.core.util.attr.VUtil.isNotNullOrEmpty(rle[MEMBERS]))
+ if(org.apache.directory.fortress.core.util.attr.StringUtils.isNotEmpty(rle[MEMBERS]))
{
StringTokenizer charSetTkn = new StringTokenizer(rle[MEMBERS], TestUtils.DELIMITER_TEST_DATA);
if (charSetTkn.countTokens() > 0)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java b/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
index 5470a80..cb4dcb2 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
@@ -33,6 +33,7 @@ import java.util.TreeSet;
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.time.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +67,7 @@ public class TestUtils extends TestCase
// This property can be overriden with system property:
String tenant = System.getProperty( GlobalIds.TENANT );
- if ( VUtil.isNotNullOrEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
+ if ( StringUtils.isNotEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
{
contextId = tenant;
}
@@ -273,7 +274,7 @@ public class TestUtils extends TestCase
Set<String> vSets = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
try
{
- if ( VUtil.isNotNullOrEmpty( szInput ) )
+ if ( StringUtils.isNotEmpty( szInput ) )
{
StringTokenizer charSetTkn = new StringTokenizer( szInput, TestUtils.DELIMITER_TEST_DATA );
if ( charSetTkn.countTokens() > 0 )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
index 282a672..916e297 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
@@ -25,6 +25,7 @@ import java.util.Map;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -995,7 +996,7 @@ public class URATestData extends TestCase
public static boolean isCanAssign( String[] ura )
{
boolean isCanAssign = false;
- if ( VUtil.isNotNullOrEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
+ if ( StringUtils.isNotEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
{
isCanAssign = true;
}
@@ -1006,7 +1007,7 @@ public class URATestData extends TestCase
public static boolean isCanDeassign( String[] ura )
{
boolean isCanDeassign = false;
- if ( VUtil.isNotNullOrEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
+ if ( StringUtils.isNotEmpty( ura[CAN_ASSIGN_COL] ) && ura[CAN_ASSIGN_COL].equalsIgnoreCase( "T" ) )
{
isCanDeassign = true;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
index 51db3c3..4b624ee 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
@@ -29,7 +29,9 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeSet;
+import jodd.util.StringUtil;
import junit.framework.TestCase;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.model.Address;
import org.apache.directory.fortress.core.model.User;
@@ -6512,7 +6514,7 @@ public class UserTestData extends TestCase
public static String getBeginDate( String[] usr )
{
String value = null;
- if(VUtil.isNotNullOrEmpty( usr[BDATE_COL] ))
+ if(StringUtil.isNotEmpty( usr[BDATE_COL] ))
value = usr[BDATE_COL];
return value;
}
@@ -6525,7 +6527,7 @@ public class UserTestData extends TestCase
public static String getEndDate( String[] usr )
{
String value = null;
- if(VUtil.isNotNullOrEmpty( usr[EDATE_COL] ))
+ if(StringUtil.isNotEmpty( usr[EDATE_COL] ))
value = usr[EDATE_COL];
return value;
}
@@ -6538,7 +6540,7 @@ public class UserTestData extends TestCase
public static String getBeginLockDate( String[] usr )
{
String value = null;
- if(VUtil.isNotNullOrEmpty( usr[BLOCKDATE_COL] ))
+ if(StringUtil.isNotEmpty( usr[BLOCKDATE_COL] ))
value = usr[BLOCKDATE_COL];
return value;
}
@@ -6551,7 +6553,7 @@ public class UserTestData extends TestCase
public static String getEndLockDate( String[] usr )
{
String value = null;
- if(VUtil.isNotNullOrEmpty( usr[ELOCKDATE_COL] ))
+ if(StringUtil.isNotEmpty( usr[ELOCKDATE_COL] ))
value = usr[ELOCKDATE_COL];
return value;
}
@@ -6819,7 +6821,7 @@ public class UserTestData extends TestCase
try
{
- if ( VUtil.isNotNullOrEmpty( szInput[col] ) )
+ if ( StringUtil.isNotEmpty( szInput[col] ) )
{
address = new Address();
StringTokenizer charSetTkn = new StringTokenizer( szInput[col], TestUtils.DELIMITER_TEST_DATA );
@@ -6891,7 +6893,7 @@ public class UserTestData extends TestCase
{
String input = szInput[col];
- if ( VUtil.isNotNullOrEmpty( input ) )
+ if ( StringUtils.isNotEmpty( input ) )
{
StringTokenizer charSetTkn = new StringTokenizer( input, TestUtils.DELIMITER_TEST_DATA );
[2/2] directory-fortress-core git commit: FC-109 - convert to use
StringUtils.isNotBlank instead
Posted by sm...@apache.org.
FC-109 - convert to use StringUtils.isNotBlank 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/e447a1cc
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/e447a1cc
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/e447a1cc
Branch: refs/heads/1.0-RC41
Commit: e447a1ccd5050591a4bde8ab6dea8debd9496cb2
Parents: 0416970
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Jun 2 10:26:22 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Jun 2 10:26:22 2015 -0500
----------------------------------------------------------------------
.../fortress/core/AccelMgrFactory.java | 3 +-
.../fortress/core/AccessMgrFactory.java | 3 +-
.../fortress/core/AdminMgrFactory.java | 3 +-
.../fortress/core/AuditMgrFactory.java | 3 +-
.../fortress/core/DelAccessMgrFactory.java | 3 +-
.../fortress/core/DelReviewMgrFactory.java | 3 +-
.../fortress/core/PwPolicyMgrFactory.java | 3 +-
.../fortress/core/ReviewMgrFactory.java | 3 +-
.../fortress/core/ant/FortressAntTask.java | 3 +-
.../directory/fortress/core/ant/UserAnt.java | 3 +-
.../directory/fortress/core/cfg/ConfigP.java | 5 +-
.../core/cli/CommandLineInterpreter.java | 5 +-
.../directory/fortress/core/cli/Options.java | 5 +-
.../core/ldap/ApacheDsDataProvider.java | 29 ++++----
.../ldap/container/OrganizationalUnitDAO.java | 5 +-
.../ldap/container/OrganizationalUnitP.java | 5 +-
.../fortress/core/ldap/group/GroupDAO.java | 7 +-
.../fortress/core/ldap/suffix/SuffixDAO.java | 3 +-
.../fortress/core/ldap/suffix/SuffixP.java | 7 +-
.../fortress/core/model/AdminRole.java | 3 +-
.../fortress/core/model/UserAdminRole.java | 6 +-
.../directory/fortress/core/model/UserRole.java | 2 +-
.../fortress/core/rbac/AcceleratorDAO.java | 3 +-
.../fortress/core/rbac/AdminRoleDAO.java | 11 +--
.../fortress/core/rbac/AdminRoleP.java | 23 +++---
.../fortress/core/rbac/AdminRoleUtil.java | 3 +-
.../directory/fortress/core/rbac/AuditDAO.java | 13 ++--
.../fortress/core/rbac/AuditMgrImpl.java | 3 +-
.../directory/fortress/core/rbac/OrgUnitP.java | 5 +-
.../directory/fortress/core/rbac/PermDAO.java | 23 +++---
.../directory/fortress/core/rbac/PermP.java | 15 ++--
.../directory/fortress/core/rbac/PolicyDAO.java | 29 ++++----
.../directory/fortress/core/rbac/PolicyP.java | 3 +-
.../directory/fortress/core/rbac/PsoUtil.java | 3 +-
.../directory/fortress/core/rbac/RoleDAO.java | 7 +-
.../directory/fortress/core/rbac/RoleP.java | 17 +++--
.../directory/fortress/core/rbac/RoleUtil.java | 3 +-
.../directory/fortress/core/rbac/SDUtil.java | 3 +-
.../directory/fortress/core/rbac/SdDAO.java | 5 +-
.../directory/fortress/core/rbac/SdP.java | 3 +-
.../directory/fortress/core/rbac/UserDAO.java | 77 ++++++++++----------
.../directory/fortress/core/rbac/UserP.java | 23 +++---
.../directory/fortress/core/rbac/UsoUtil.java | 3 +-
.../directory/fortress/core/util/Config.java | 27 +++----
.../directory/fortress/core/util/LogUtil.java | 5 +-
.../fortress/core/util/attr/VUtil.java | 17 +++--
.../fortress/core/util/time/CUtil.java | 61 ++++++++--------
.../fortress/core/AdminMgrConsole.java | 5 +-
.../fortress/core/AuditMgrConsole.java | 17 +++--
.../fortress/core/GroupMgrConsole.java | 5 +-
.../fortress/core/jmeter/CheckAccess.java | 7 +-
.../fortress/core/rbac/AccelMgrImplTest.java | 3 +-
.../fortress/core/rbac/AccessMgrImplTest.java | 5 +-
.../fortress/core/rbac/AdminRoleTestData.java | 9 ++-
.../fortress/core/rbac/OrgUnitTestData.java | 5 +-
.../fortress/core/rbac/PRATestData.java | 5 +-
.../fortress/core/rbac/RoleTestData.java | 15 ++--
.../directory/fortress/core/rbac/TestUtils.java | 5 +-
.../fortress/core/rbac/URATestData.java | 5 +-
.../fortress/core/rbac/UserTestData.java | 14 ++--
60 files changed, 329 insertions(+), 268 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index e83b9ef..22fe161 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.rbac.AccelMgrImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
@@ -63,7 +64,7 @@ public final class AccelMgrFactory
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
AccelMgr accelMgr;
- if (!VUtil.isNotNullOrEmpty(accelClassName))
+ if (!StringUtils.isNotEmpty( accelClassName ))
{
accelMgr = new AccelMgrImpl();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index a6b70a7..4d5ce13 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.rbac.AccessMgrImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
@@ -64,7 +65,7 @@ public final class AccessMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
AccessMgr accessMgr;
- if (!VUtil.isNotNullOrEmpty(accessClassName))
+ if (!StringUtils.isNotEmpty( accessClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index ee2b750..e51ffeb 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.rbac.AdminMgrImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
@@ -67,7 +68,7 @@ public final class AdminMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
AdminMgr adminMgr;
- if (!VUtil.isNotNullOrEmpty(adminClassName))
+ if (!StringUtils.isNotEmpty( adminClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 5d69391..3b47f0f 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.rbac.AuditMgrImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
@@ -65,7 +66,7 @@ public final class AuditMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
AuditMgr auditMgr;
- if (!VUtil.isNotNullOrEmpty(auditClassName))
+ if (!StringUtils.isNotEmpty( auditClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index 6a7ed9a..80d8138 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.rbac.DelAccessMgrImpl;
@@ -66,7 +67,7 @@ public final class DelAccessMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
DelAccessMgr accessMgr;
- if (!VUtil.isNotNullOrEmpty(accessClassName))
+ if (!StringUtils.isNotEmpty( accessClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index f28a6a7..74683ee 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.rbac.DelReviewMgrImpl;
@@ -65,7 +66,7 @@ public final class DelReviewMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
DelReviewMgr delReviewMgr;
- if (!VUtil.isNotNullOrEmpty(dReviewClassName))
+ if (!StringUtils.isNotEmpty( dReviewClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index f43b42d..d208064 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl;
@@ -65,7 +66,7 @@ public final class PwPolicyMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
PwPolicyMgr policyMgr;
- if (!VUtil.isNotNullOrEmpty(policyClassName))
+ if (!StringUtils.isNotEmpty( policyClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index 47072be..bbebc2f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.rbac.ReviewMgrImpl;
@@ -65,7 +66,7 @@ public final class ReviewMgrFactory
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
ReviewMgr reviewMgr;
- if (!VUtil.isNotNullOrEmpty(reviewClassName))
+ if (!StringUtils.isNotEmpty( reviewClassName ))
{
if(GlobalIds.IS_REST)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/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 18105e1..e7582b4 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.lang.StringUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.input.InputHandler;
@@ -856,7 +857,7 @@ public class FortressAntTask extends Task implements InputHandler
try
{
String testClassName = Config.getProperty( getTaskName() );
- if ( !VUtil.isNotNullOrEmpty( testClassName ) )
+ if ( !StringUtils.isNotEmpty( testClassName ) )
{
testClassName = "org.apache.directory.fortress.core.rbac.FortressAntLoadTest";
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index 0b7811f..f6cc856 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -21,6 +21,7 @@ package org.apache.directory.fortress.core.ant;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.model.User;
@@ -421,7 +422,7 @@ public class UserAnt extends User
public void setPhoto( String photo )
{
this.photo = photo;
- if ( VUtil.isNotNullOrEmpty( photo ) )
+ if ( StringUtils.isNotEmpty( photo ) )
{
byte[] jpeg = getJpegPhoto( photo );
if ( VUtil.isNotNullOrEmpty( jpeg ) )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
index df9ed9d..80043b5 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
@@ -22,6 +22,7 @@ package org.apache.directory.fortress.core.cfg;
import java.util.Properties;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
@@ -122,7 +123,7 @@ final class ConfigP
void delete( String name )
throws SecurityException
{
- if ( !VUtil.isNotNullOrEmpty( name ) )
+ if ( !StringUtils.isNotEmpty( name ) )
{
String error = "delete detected null config realm name";
LOG.warn( error );
@@ -178,7 +179,7 @@ final class ConfigP
private void validate( String name, Properties entity )
throws ValidationException
{
- if ( !VUtil.isNotNullOrEmpty( name ) )
+ if ( !StringUtils.isNotEmpty( name ) )
{
String error = "validate detected null config realm name";
LOG.warn( error );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/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 3055a2f..c2a3815 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.lang.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.ldap.group.Group;
@@ -181,7 +182,7 @@ public class CommandLineInterpreter
+ DELEGATED_ADMIN + ", " + GROUP );
LOG.info( "Enter one from above or 'q' to quit" );
input = br.readLine();
- if ( VUtil.isNotNullOrEmpty( input ) )
+ if ( StringUtils.isNotEmpty( input ) )
{
if ( "Q".equalsIgnoreCase( input ) )
{
@@ -1458,7 +1459,7 @@ public class CommandLineInterpreter
boolean success = false;
// This property can be overriden with system property:
String tenant = System.getProperty( GlobalIds.TENANT );
- if ( VUtil.isNotNullOrEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
+ if ( StringUtils.isNotEmpty( tenant ) && !tenant.equals( "${tenant}" ) )
{
contextId = tenant;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/cli/Options.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/Options.java b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
index 977e567..61f08b6 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/Options.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.cli;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.ldap.group.Group;
import org.apache.directory.fortress.core.model.Address;
@@ -304,7 +305,7 @@ public class Options implements java.io.Serializable
{
char[] pw = null;
String szPw = (String) parser.getOptionValue(password);
- if (VUtil.isNotNullOrEmpty(szPw))
+ if (StringUtils.isNotEmpty(szPw))
{
pw = szPw.toCharArray();
}
@@ -315,7 +316,7 @@ public class Options implements java.io.Serializable
{
char[] pw = null;
String szPw = (String) parser.getOptionValue(newPassword);
- if (VUtil.isNotNullOrEmpty(szPw))
+ if ( StringUtils.isNotEmpty( szPw ))
{
pw = szPw.toCharArray();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 2f60c4e..ff00dc1 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -29,6 +29,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.pool.PoolableObjectFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -171,8 +172,8 @@ public abstract class ApacheDsDataProvider
config.setUseSsl( IS_SSL );
//config.setTrustManagers( new NoVerificationTrustManager() );
- if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE )
- && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
+ if ( IS_SSL && StringUtils.isNotEmpty( GlobalIds.TRUST_STORE )
+ && StringUtils.isNotEmpty( GlobalIds.TRUST_STORE_PW ) )
{
// validate certificates but allow self-signed certs if within this truststore:
config.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE, GlobalIds.TRUST_STORE_PW
@@ -236,7 +237,7 @@ public abstract class ApacheDsDataProvider
// This pool of access log connections is used by {@link org.apache.directory.fortress.AuditMgr}.
// To enable, set {@code log.admin.user} && {@code log.admin.pw} inside fortress.properties file:
- if ( VUtil.isNotNullOrEmpty( LDAP_LOG_POOL_UID ) && VUtil.isNotNullOrEmpty( LDAP_LOG_POOL_PW ) )
+ if ( StringUtils.isNotEmpty( LDAP_LOG_POOL_UID ) && StringUtils.isNotEmpty( LDAP_LOG_POOL_PW ) )
{
// TODO: Initializing the log pool in static block requires static props set within fortress.properties.
// To make this dynamic requires moving this code outside of static block AND storing the connection metadata inside fortress config node (in ldap).
@@ -247,8 +248,8 @@ public abstract class ApacheDsDataProvider
logConfig.setUseSsl( IS_SSL );
- if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE )
- && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
+ if ( IS_SSL && StringUtils.isNotEmpty( GlobalIds.TRUST_STORE )
+ && StringUtils.isNotEmpty( GlobalIds.TRUST_STORE_PW ) )
{
// validate certificates but allow self-signed certs if within this truststore:
logConfig.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE,
@@ -289,7 +290,7 @@ public abstract class ApacheDsDataProvider
String szDn = Config.getProperty( root );
// The contextId must not be null, or "HOME" or "null"
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
.equals( GlobalIds.HOME ) )
{
int idx = szDn.indexOf( Config.getProperty( GlobalIds.SUFFIX ) );
@@ -326,7 +327,7 @@ public abstract class ApacheDsDataProvider
protected String getRootDn( String contextId )
{
StringBuilder dn = new StringBuilder();
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
.equals( GlobalIds.HOME ) )
{
dn.append( SchemaConstants.OU_AT ).append( "=" ).append( contextId ).append( "," +
@@ -423,17 +424,17 @@ public abstract class ApacheDsDataProvider
if ( GlobalIds.IS_AUDIT && ( entity != null ) && ( entity.getAdminSession() != null ) )
{
- if ( VUtil.isNotNullOrEmpty( entity.getAdminSession().getInternalUserId() ) )
+ if ( StringUtils.isNotEmpty( entity.getAdminSession().getInternalUserId() ) )
{
entry.add( GlobalIds.FT_MODIFIER, entity.getAdminSession().getInternalUserId() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getModCode() ) )
+ if ( StringUtils.isNotEmpty( entity.getModCode() ) )
{
entry.add( GlobalIds.FT_MODIFIER_CODE, entity.getModCode() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getModId() ) )
+ if ( StringUtils.isNotEmpty( entity.getModId() ) )
{
entry.add( GlobalIds.FT_MODIFIER_ID, entity.getModId() );
}
@@ -687,21 +688,21 @@ public abstract class ApacheDsDataProvider
{
if ( GlobalIds.IS_AUDIT && ( entity != null ) && ( entity.getAdminSession() != null ) )
{
- if ( VUtil.isNotNullOrEmpty( entity.getAdminSession().getInternalUserId() ) )
+ if ( StringUtils.isNotEmpty( entity.getAdminSession().getInternalUserId() ) )
{
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
GlobalIds.FT_MODIFIER, entity.getAdminSession().getInternalUserId() );
mods.add( modification );
}
- if ( VUtil.isNotNullOrEmpty( entity.getModCode() ) )
+ if ( StringUtils.isNotEmpty( entity.getModCode() ) )
{
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
GlobalIds.FT_MODIFIER_CODE, entity.getModCode() );
mods.add( modification );
}
- if ( VUtil.isNotNullOrEmpty( entity.getModId() ) )
+ if ( StringUtils.isNotEmpty( entity.getModId() ) )
{
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
GlobalIds.FT_MODIFIER_ID, entity.getModId() );
@@ -1362,7 +1363,7 @@ public abstract class ApacheDsDataProvider
*/
protected String encodeSafeText( String value, int validLen ) throws LdapException
{
- if ( VUtil.isNotNullOrEmpty( value ) )
+ if ( StringUtils.isNotEmpty( value ) )
{
int length = value.length();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
index 275e0e5..178b074 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.ldap.container;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -86,7 +87,7 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
LdapConnection ld = null;
String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
- if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ if ( StringUtils.isNotEmpty( oe.getParent() ) )
{
nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
}
@@ -128,7 +129,7 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
LdapConnection ld = null;
String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
- if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ if ( StringUtils.isNotEmpty( oe.getParent() ) )
{
nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
index a3f9014..e741284 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.ldap.container;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +121,7 @@ public class OrganizationalUnitP
throw new ValidationException( GlobalErrIds.CNTR_NAME_INVLD, error );
}
- if ( !VUtil.isNotNullOrEmpty( entity.getName() ) )
+ if ( !StringUtils.isNotEmpty( entity.getName() ) )
{
String error = "validate name validation failed, null or empty value";
LOG.warn( error );
@@ -136,7 +137,7 @@ public class OrganizationalUnitP
throw new ValidationException( GlobalErrIds.CNTR_PARENT_INVLD, error );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
index 22bda22..b6bc472 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
@@ -21,6 +21,7 @@
package org.apache.directory.fortress.core.ldap.group;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -108,7 +109,7 @@ final class GroupDAO extends ApacheDsDataProvider
loadAttrs( group.getMembers(), myEntry, SchemaConstants.MEMBER_AT );
loadProperties( group.getProperties(), myEntry, GROUP_PROPERTY_ATTR_IMPL, '=' );
- if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
+ if ( StringUtils.isNotEmpty( group.getDescription() ) )
{
myEntry.add( SchemaConstants.DESCRIPTION_AT, group.getDescription() );
}
@@ -146,13 +147,13 @@ final class GroupDAO extends ApacheDsDataProvider
LOG.debug( "update group dn [{}]", nodeDn );
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
+ if ( StringUtils.isNotEmpty( group.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, group.getDescription() ) );
}
- if ( VUtil.isNotNullOrEmpty( group.getProtocol() ) )
+ if ( StringUtils.isNotEmpty( group.getProtocol() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, GROUP_PROTOCOL_ATTR_IMPL, group.getProtocol() ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 16cfc7f..660ab1d 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.ldap.suffix;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -167,7 +168,7 @@ final class SuffixDAO extends ApacheDsDataProvider
String dn = SchemaConstants.DC_AT + "=" + se.getName() + "," + SchemaConstants.DC_AT + "=" + se.getDc();
// only use this domain component variable if it has been set in the build.properties file:
- if ( VUtil.isNotNullOrEmpty( se.getDc2() ) && !se.getDc2().equals( "${suffix.dc2}" ) )
+ if ( StringUtils.isNotEmpty( se.getDc2() ) && !se.getDc2().equals( "${suffix.dc2}" ) )
{
dn += "," + SchemaConstants.DC_AT + "=" + se.getDc2();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
index 2ea7100..1785f66 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.ldap.suffix;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.ValidationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -118,7 +119,7 @@ public class SuffixP
LOG.warn( error );
throw new ValidationException( GlobalErrIds.SUFX_NAME_INVLD, error );
}
- if ( !VUtil.isNotNullOrEmpty( entity.getName() ) )
+ if ( !StringUtils.isNotEmpty( entity.getName() ) )
{
String error = "validate name validation failed, null or empty value";
LOG.warn( error );
@@ -131,14 +132,14 @@ public class SuffixP
LOG.warn( error );
throw new ValidationException( GlobalErrIds.SUFX_DCTOP_INVLD, error );
}
- if ( !VUtil.isNotNullOrEmpty( entity.getDc() ) )
+ if ( !StringUtils.isNotEmpty( entity.getDc() ) )
{
String error = "validate dc validation failed, null or empty value";
LOG.warn( error );
throw new ValidationException( GlobalErrIds.SUFX_DCTOP_NULL, error );
}
VUtil.safeText( entity.getDescription(), GlobalIds.DESC_LEN );
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index 44f7fdf..24287fb 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.util.attr.VUtil;
import org.apache.directory.fortress.core.util.time.CUtil;
import org.apache.directory.fortress.core.util.time.Constraint;
@@ -227,7 +228,7 @@ public class AdminRole extends Role implements Administrator
@Override
public void setRoleRangeRaw( String szRaw )
{
- if ( VUtil.isNotNullOrEmpty( szRaw ) )
+ if ( StringUtils.isNotEmpty( szRaw ) )
{
int bindx = szRaw.indexOf( '(' );
if ( bindx > -1 )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index be41629..5af0223 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -169,7 +169,7 @@ public class UserAdminRole extends UserRole implements Administrator
String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.DELIMITER );
for ( int i = 0; i < tokens.length; i++ )
{
- if ( VUtil.isNotNullOrEmpty( tokens[i] ) )
+ if ( StringUtils.isNotEmpty( tokens[i] ) )
{
switch ( i )
{
@@ -325,7 +325,7 @@ public class UserAdminRole extends UserRole implements Administrator
sb.append( org );
}
}
- if ( VUtil.isNotNullOrEmpty( this.getRoleRangeRaw() ) )
+ if ( StringUtils.isNotEmpty( this.getRoleRangeRaw() ) )
{
sb.append( GlobalIds.DELIMITER );
sb.append( R );
@@ -348,7 +348,7 @@ public class UserAdminRole extends UserRole implements Administrator
@Override
public void setRoleRangeRaw( String szRaw )
{
- if ( VUtil.isNotNullOrEmpty( szRaw ) )
+ if ( StringUtils.isNotEmpty( szRaw ) )
{
int bindx = szRaw.indexOf( LEFT_PAREN );
if ( bindx > -1 )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index 05c7813..485126f 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -159,7 +159,7 @@ public class UserRole extends FortEntity implements Serializable, Constraint
String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.DELIMITER );
for ( int i = 0; i < tokens.length; i++ )
{
- if ( VUtil.isNotNullOrEmpty( tokens[i] ) )
+ if ( StringUtils.isNotEmpty( tokens[i] ) )
{
switch ( i )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
index 528838d..8b0ebd2 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.rbac;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -174,7 +175,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
rbacCheckAccessRequest.setObject( perm.getObjName() );
// objectId is optional
- if ( VUtil.isNotNullOrEmpty( perm.getObjId() ) )
+ if ( StringUtils.isNotEmpty( perm.getObjId() ) )
{
rbacCheckAccessRequest.setObjectId( perm.getObjId() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
index 2738539..2535dd5 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -164,7 +165,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entry.add( ROLE_NM, entity.getName() );
// description field is optional on this object class:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
@@ -176,7 +177,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
loadAttrs( entity.getOsU(), entry, ROLE_OSU );
String szRaw = entity.getRoleRangeRaw();
- if ( VUtil.isNotNullOrEmpty( szRaw ) )
+ if ( StringUtils.isNotEmpty( szRaw ) )
{
entry.add( ROLE_RANGE, szRaw );
}
@@ -218,7 +219,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE,
@@ -238,7 +239,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
{
String szRawData = CUtil.setConstraint( entity );
- if ( VUtil.isNotNullOrEmpty( szRawData ) )
+ if ( StringUtils.isNotEmpty( szRawData ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.CONSTRAINT, szRawData ) );
@@ -249,7 +250,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
loadAttrs( entity.getOsP(), mods, ROLE_OSP );
String szRaw = entity.getRoleRangeRaw();
- if ( VUtil.isNotNullOrEmpty( szRaw ) )
+ if ( StringUtils.isNotEmpty( szRaw ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, ROLE_RANGE, szRaw ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
index ba4fc82..dad532b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.List;
import java.util.Set;
+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.OrgUnit;
@@ -310,7 +311,7 @@ public final class AdminRoleP
{
VUtil.safeText( entity.getName(), GlobalIds.ROLE_LEN );
- if ( VUtil.isNotNullOrEmpty( entity.getBeginRange() ) && VUtil.isNotNullOrEmpty( entity.getEndRange() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginRange() ) && StringUtils.isNotEmpty( entity.getEndRange() ) )
{
VUtil.safeText( entity.getBeginRange(), GlobalIds.ROLE_LEN );
VUtil.safeText( entity.getEndRange(), GlobalIds.ROLE_LEN );
@@ -333,20 +334,20 @@ public final class AdminRoleP
throw new SecurityException( GlobalErrIds.ARLE_INVLD_RANGE, error );
}
}
- else if ( !VUtil.isNotNullOrEmpty( entity.getBeginRange() ) && VUtil.isNotNullOrEmpty( entity.getEndRange() ) )
+ else if ( !StringUtils.isNotEmpty( entity.getBeginRange() ) && StringUtils.isNotEmpty( entity.getEndRange() ) )
{
String error = "validate role name [" + entity.getName() + "] begin range value null or empty.";
LOG.warn( error );
throw new SecurityException( GlobalErrIds.ARLE_BEGIN_RANGE_NULL, error );
}
- else if ( VUtil.isNotNullOrEmpty( entity.getBeginRange() ) && !VUtil.isNotNullOrEmpty( entity.getEndRange() ) )
+ else if ( StringUtils.isNotEmpty( entity.getBeginRange() ) && !StringUtils.isNotEmpty( entity.getEndRange() ) )
{
String error = "validate role name [" + entity.getName() + "] end range value null or empty.";
LOG.warn( error );
throw new SecurityException( GlobalErrIds.ARLE_END_RANGE_NULL, error );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
@@ -356,37 +357,37 @@ public final class AdminRoleP
VUtil.timeout( entity.getTimeout() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginTime() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginTime() ) )
{
VUtil.beginTime( entity.getBeginTime() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndTime() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndTime() ) )
{
VUtil.endTime( entity.getEndTime() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndDate() ) )
{
VUtil.endDate( entity.getEndDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDayMask() ) )
+ if ( StringUtils.isNotEmpty( entity.getDayMask() ) )
{
VUtil.dayMask( entity.getDayMask() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginLockDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginLockDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndLockDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndLockDate() ) )
{
VUtil.endDate( entity.getEndLockDate() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
index fc3adcb..65df532 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
+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;
@@ -329,7 +330,7 @@ public final class AdminRoleUtil
private static String getKey( String contextId )
{
String key = HierUtil.Type.ARLE.toString();
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
index 23bdfa2..adf0acf 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -241,7 +242,7 @@ final class AuditDAO extends ApacheDsDataProvider
String filter = GlobalIds.FILTER_PREFIX + ACCESS_AUTHZ_CLASS_NM + ")(";
String userId;
- if ( VUtil.isNotNullOrEmpty( audit.getUserId() ) )
+ if ( StringUtils.isNotEmpty( audit.getUserId() ) )
{
userId = audit.getUserId();
filter += REQDN + "=" + SchemaConstants.UID_AT + "=" + userId + "," + userRoot + ")(" +
@@ -613,16 +614,16 @@ final class AuditDAO extends ApacheDsDataProvider
String filter = "(&(|(objectclass=" + ACCESS_MOD_CLASS_NM + ")";
filter += "(objectclass=" + ACCESS_ADD_CLASS_NM + "))";
- if ( VUtil.isNotNullOrEmpty( audit.getDn() ) )
+ if ( StringUtils.isNotEmpty( audit.getDn() ) )
{
filter += "(" + REQDN + "=" + audit.getDn() + ")";
}
- if ( VUtil.isNotNullOrEmpty( audit.getObjName() ) )
+ if ( StringUtils.isNotEmpty( audit.getObjName() ) )
{
filter += "(|(" + REQMOD + "=" + GlobalIds.FT_MODIFIER_CODE + ":= " + audit.getObjName() + ".";
- if ( VUtil.isNotNullOrEmpty( audit.getOpName() ) )
+ if ( StringUtils.isNotEmpty( audit.getOpName() ) )
{
filter += audit.getOpName();
}
@@ -630,7 +631,7 @@ final class AuditDAO extends ApacheDsDataProvider
filter += "*)";
filter += "(" + REQMOD + "=" + GlobalIds.FT_MODIFIER_CODE + ":+ " + audit.getObjName() + ".";
- if ( VUtil.isNotNullOrEmpty( audit.getOpName() ) )
+ if ( StringUtils.isNotEmpty( audit.getOpName() ) )
{
filter += audit.getOpName();
}
@@ -638,7 +639,7 @@ final class AuditDAO extends ApacheDsDataProvider
filter += "*))";
}
- if ( VUtil.isNotNullOrEmpty( audit.getInternalUserId() ) )
+ if ( StringUtils.isNotEmpty( audit.getInternalUserId() ) )
{
filter += "(|(" + REQMOD + "=" + GlobalIds.FT_MODIFIER + ":= " + audit.getInternalUserId() + ")";
filter += "(" + REQMOD + "=" + GlobalIds.FT_MODIFIER + ":+ " + audit.getInternalUserId() + "))";
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
index 120610e..cb72dd6 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.rbac;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.AuditMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.ReviewMgrFactory;
@@ -220,7 +221,7 @@ public class AuditMgrImpl extends Manageable implements AuditMgr
String methodName = "searchAdminMods";
assertContext(CLS_NM, methodName, uAudit, GlobalErrIds.AUDT_INPUT_NULL);
checkAccess(CLS_NM, methodName);
- if (VUtil.isNotNullOrEmpty(uAudit.getUserId()))
+ if ( StringUtils.isNotEmpty( uAudit.getUserId() ))
{
ReviewMgr rMgr = ReviewMgrFactory.createInstance(this.contextId);
User user = rMgr.readUser(new User(uAudit.getUserId()));
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
index 4734328..b8a8ea3 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.Graphable;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.slf4j.Logger;
@@ -424,7 +425,7 @@ public final class OrgUnitP
{
VUtil.safeText( entity.getName(), GlobalIds.OU_LEN );
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
@@ -459,7 +460,7 @@ public final class OrgUnitP
{
String key = type;
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
index f79af81..3616f6f 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -231,13 +232,13 @@ final class PermDAO extends ApacheDsDataProvider
entry.add( SchemaConstants.OU_AT, entity.getOu() );
// description is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// type is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
+ if ( StringUtils.isNotEmpty( entity.getType() ) )
{
entry.add( TYPE, entity.getType() );
}
@@ -285,19 +286,19 @@ final class PermDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
+ if ( StringUtils.isNotEmpty( entity.getOu() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.OU_AT, entity.getOu() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
+ if ( StringUtils.isNotEmpty( entity.getType() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, TYPE, entity.getType() ) );
@@ -391,7 +392,7 @@ final class PermDAO extends ApacheDsDataProvider
entry.add( GlobalIds.FT_IID, entity.getInternalId() );
// description is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
@@ -403,13 +404,13 @@ final class PermDAO extends ApacheDsDataProvider
entry.add( SchemaConstants.CN_AT, entity.getAbstractName() );
// objectid is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getObjId() ) )
+ if ( StringUtils.isNotEmpty( entity.getObjId() ) )
{
entry.add( GlobalIds.POBJ_ID, entity.getObjId() );
}
// type is optional:
- if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
+ if ( StringUtils.isNotEmpty( entity.getType() ) )
{
entry.add( TYPE, entity.getType() );
}
@@ -462,20 +463,20 @@ final class PermDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getAbstractName() ) )
+ if ( StringUtils.isNotEmpty( entity.getAbstractName() ) )
{
// the abstract name is the human readable identifier:
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, PERM_NAME, entity.getAbstractName() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
- if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
+ if ( StringUtils.isNotEmpty( entity.getType() ) )
{
mods.add( new DefaultModification(
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
index 1b6eacd..c2f55a7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
@@ -514,22 +515,22 @@ public final class PermP
//log.warn(error);
throw new ValidationException( GlobalErrIds.PERM_OU_INVALID, error );
}
- if ( VUtil.isNotNullOrEmpty( pObj.getObjName() ) )
+ if ( StringUtils.isNotEmpty( pObj.getObjName() ) )
{
VUtil.description( pObj.getObjName() );
}
- if ( VUtil.isNotNullOrEmpty( pObj.getOu() ) )
+ if ( StringUtils.isNotEmpty( pObj.getOu() ) )
{
VUtil.orgUnit( pObj.getOu() );
}
- if ( VUtil.isNotNullOrEmpty( pObj.getDescription() ) )
+ if ( StringUtils.isNotEmpty( pObj.getDescription() ) )
{
VUtil.description( pObj.getDescription() );
}
}
else
{
- if ( VUtil.isNotNullOrEmpty( pObj.getOu() ) )
+ if ( StringUtils.isNotEmpty( pObj.getOu() ) )
{
VUtil.orgUnit( pObj.getOu() );
// ensure ou exists in the OS-P pool:
@@ -542,7 +543,7 @@ public final class PermP
throw new ValidationException( GlobalErrIds.PERM_OU_INVALID, error );
}
}
- if ( VUtil.isNotNullOrEmpty( pObj.getDescription() ) )
+ if ( StringUtils.isNotEmpty( pObj.getDescription() ) )
{
VUtil.description( pObj.getDescription() );
}
@@ -569,11 +570,11 @@ public final class PermP
VUtil.description( pOp.getOpName() );
}
}
- if ( VUtil.isNotNullOrEmpty( pOp.getType() ) )
+ if ( StringUtils.isNotEmpty( pOp.getType() ) )
{
VUtil.description( pOp.getType() );
}
- if ( VUtil.isNotNullOrEmpty( pOp.getDescription() ) )
+ if ( StringUtils.isNotEmpty( pOp.getDescription() ) )
{
VUtil.description( pOp.getDescription() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
index b0e8fc0..ff82fb4 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -484,84 +485,84 @@ final class PolicyDAO extends ApacheDsDataProvider
entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
String val = getAttribute( le, OLPW_MIN_AGE );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setMinAge( Integer.valueOf( val ) );
}
val = getAttribute( le, OLPW_MAX_AGE );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setMaxAge( Long.valueOf( val ) );
}
val = getAttribute( le, OLPW_IN_HISTORY );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setInHistory( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_CHECK_QUALITY );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setCheckQuality( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_MIN_LENGTH );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setMinLength( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_EXPIRE_WARNING );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setExpireWarning( Long.valueOf( val ) );
}
val = getAttribute( le, OLPW_GRACE_LOGIN_LIMIT );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setGraceLoginLimit( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_LOCKOUT );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setLockout( Boolean.valueOf( val ) );
}
val = getAttribute( le, OLPW_LOCKOUT_DURATION );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setLockoutDuration( Integer.valueOf( val ) );
}
val = getAttribute( le, OLPW_MAX_FAILURE );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setMaxFailure( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_FAILURE_COUNT_INTERVAL );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setFailureCountInterval( Short.valueOf( val ) );
}
val = getAttribute( le, OLPW_MUST_CHANGE );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
//noinspection BooleanConstructorCall
entity.setMustChange( Boolean.valueOf( val ) );
@@ -569,14 +570,14 @@ final class PolicyDAO extends ApacheDsDataProvider
val = getAttribute( le, OLPW_ALLOW_USER_CHANGE );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setAllowUserChange( Boolean.valueOf( val ) );
}
val = getAttribute( le, OLPW_SAFE_MODIFY );
- if ( VUtil.isNotNullOrEmpty( val ) )
+ if ( StringUtils.isNotEmpty( val ) )
{
entity.setSafeModify( Boolean.valueOf( val ) );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
index 2f9b9b9..e7eeff7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.model.PwPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -429,7 +430,7 @@ public final class PolicyP
{
String key = POLICIES;
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
index 93fe49f..ebd68db 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
+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;
@@ -304,7 +305,7 @@ public final class PsoUtil
private static String getKey( String contextId )
{
String key = HierUtil.Type.PSO.toString();
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
index b710ac8..5623900 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -150,7 +151,7 @@ final class RoleDAO extends ApacheDsDataProvider
entry.add( ROLE_NM, entity.getName() );
// description field is optional on this object class:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
@@ -194,7 +195,7 @@ final class RoleDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
@@ -204,7 +205,7 @@ final class RoleDAO extends ApacheDsDataProvider
{
String szRawData = CUtil.setConstraint( entity );
- if ( VUtil.isNotNullOrEmpty( szRawData ) )
+ if ( StringUtils.isNotEmpty( szRawData ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
GlobalIds.CONSTRAINT, szRawData ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
index ebe8fd3..2a0c963 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
@@ -22,6 +22,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -269,7 +270,7 @@ public final class RoleP
throws ValidationException
{
VUtil.safeText( entity.getName(), GlobalIds.ROLE_LEN );
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
@@ -277,31 +278,31 @@ public final class RoleP
{
VUtil.timeout( entity.getTimeout() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginTime() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginTime() ) )
{
VUtil.beginTime( entity.getBeginTime() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndTime() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndTime() ) )
{
VUtil.endTime( entity.getEndTime() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndDate() ) )
{
VUtil.endDate( entity.getEndDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getDayMask() ) )
+ if ( StringUtils.isNotEmpty( entity.getDayMask() ) )
{
VUtil.dayMask( entity.getDayMask() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getBeginLockDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getBeginLockDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
- if ( VUtil.isNotNullOrEmpty( entity.getEndLockDate() ) )
+ if ( StringUtils.isNotEmpty( entity.getEndLockDate() ) )
{
VUtil.endDate( entity.getEndLockDate() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
index 3ba0b06..d2d477b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
@@ -25,6 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
+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.ParentUtil;
@@ -366,7 +367,7 @@ public final class RoleUtil implements ParentUtil
{
String key = HierUtil.Type.ROLE.toString();
- if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
+ if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
index 468b012..185515d 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.rbac;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -538,7 +539,7 @@ final class SDUtil
private static String getContextId(String contextId)
{
String szContextId = GlobalIds.HOME;
- if(VUtil.isNotNullOrEmpty(contextId) && !contextId.equals(GlobalIds.NULL))
+ if( StringUtils.isNotEmpty( contextId ) && !contextId.equals(GlobalIds.NULL))
{
szContextId = contextId;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
index eaae106..cc28c93 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
@@ -163,7 +164,7 @@ final class SdDAO extends ApacheDsDataProvider
entry.add( SD_SET_NM, entity.getName() );
// description field is optional on this object class:
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
@@ -214,7 +215,7 @@ final class SdDAO extends ApacheDsDataProvider
{
List<Modification> mods = new ArrayList<Modification>();
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e447a1cc/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java b/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
index 57eb996..79cba9a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.Role;
@@ -196,7 +197,7 @@ public final class SdP
{
// TODO: Add more validations here:
VUtil.safeText( entity.getName(), GlobalIds.OU_LEN );
- if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
+ if ( StringUtils.isNotEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}