Skip to content
Permalink
Browse files
format code
  • Loading branch information
olamy committed Oct 14, 2014
1 parent 1e5c567 commit 694e1be55e36553afd35443d8953e8d781171781
Showing 2 changed files with 12 additions and 9 deletions.
@@ -379,7 +379,7 @@ public List<String> getGroups( String username, DirContext context )
//failed to look up the user's groupEntry directly
StringBuilder builder = new StringBuilder();
String posixGroup = "posixGroup";
if (posixGroup.equals(getLdapGroupClass()))
if ( posixGroup.equals( getLdapGroupClass() ) )
{
builder.append( username );
}
@@ -37,7 +37,7 @@
/**
* @author <a href="jesse@codehaus.org"> jesse
*/
@Service("userMapper#ldap")
@Service( "userMapper#ldap" )
public class LdapUserMapper
implements UserMapper
{
@@ -60,7 +60,7 @@
int maxResultCount = 0;

@Inject
@Named(value = "userConfiguration#default")
@Named( value = "userConfiguration#default" )
private UserConfiguration userConf;

@PostConstruct
@@ -76,10 +76,12 @@ public void initialize()
userConf.getConcatenatedList( "ldap.config.base.dn", userBaseDn ) );
userObjectClass =
userConf.getString( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_OBJECT_CLASS, userObjectClass );
userFilter = userConf.getConcatenatedList( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter );
userFilter =
userConf.getConcatenatedList( UserConfigurationKeys.LDAP_MAPPER_USER_ATTRIBUTE_FILTER, userFilter );
maxResultCount = userConf.getInt( UserConfigurationKeys.LDAP_MAX_RESULT_COUNT, maxResultCount );

distinguishedNameAttribute = userConf.getString( UserConfigurationKeys.LDAP_DN_ATTRIBUTE, distinguishedNameAttribute );
distinguishedNameAttribute =
userConf.getString( UserConfigurationKeys.LDAP_DN_ATTRIBUTE, distinguishedNameAttribute );
}

public Attributes getCreationAttributes( User user, boolean encodePasswordIfChanged )
@@ -127,14 +129,15 @@ public String getDistinguishedNameAttribute()
return distinguishedNameAttribute;
}

public void setDistinguishedNameAttribute(String distinguishedNameAttribute)
public void setDistinguishedNameAttribute( String distinguishedNameAttribute )
{
this.distinguishedNameAttribute = distinguishedNameAttribute;
}

public String[] getUserAttributeNames()
{
return new String[]{ emailAttribute, fullNameAttribute, passwordAttribute, userIdAttribute, distinguishedNameAttribute };
return new String[]{ emailAttribute, fullNameAttribute, passwordAttribute, userIdAttribute,
distinguishedNameAttribute };
}

public int getMaxResultCount()
@@ -292,8 +295,8 @@ public LdapUser newTemplateUserInstance()

public String[] getReturningAttributes()
{
return new String[]{ getUserIdAttribute(), getEmailAttribute(), getFullNameAttribute(),
getPasswordAttribute(), getDistinguishedNameAttribute() };
return new String[]{ getUserIdAttribute(), getEmailAttribute(), getFullNameAttribute(), getPasswordAttribute(),
getDistinguishedNameAttribute() };
}

public UserConfiguration getUserConf()

0 comments on commit 694e1be

Please sign in to comment.