You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/10/14 08:12:42 UTC
[2/2] git commit: format code
format code
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/694e1be5
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/694e1be5
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/694e1be5
Branch: refs/heads/master
Commit: 694e1be55e36553afd35443d8953e8d781171781
Parents: 1e5c567
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 14 17:12:33 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 14 17:12:33 2014 +1100
----------------------------------------------------------------------
.../common/ldap/role/DefaultLdapRoleMapper.java | 2 +-
.../redback/common/ldap/user/LdapUserMapper.java | 19 +++++++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/694e1be5/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
index c63695b..572e9c7 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
@@ -379,7 +379,7 @@ public class DefaultLdapRoleMapper
//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 );
}
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/694e1be5/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
----------------------------------------------------------------------
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
index fb7c05f..ddfb329 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/user/LdapUserMapper.java
@@ -37,7 +37,7 @@ import java.util.Date;
/**
* @author <a href="jesse@codehaus.org"> jesse
*/
-@Service("userMapper#ldap")
+@Service( "userMapper#ldap" )
public class LdapUserMapper
implements UserMapper
{
@@ -60,7 +60,7 @@ public class LdapUserMapper
int maxResultCount = 0;
@Inject
- @Named(value = "userConfiguration#default")
+ @Named( value = "userConfiguration#default" )
private UserConfiguration userConf;
@PostConstruct
@@ -76,10 +76,12 @@ public class LdapUserMapper
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 class LdapUserMapper
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 class LdapUserMapper
public String[] getReturningAttributes()
{
- return new String[]{ getUserIdAttribute(), getEmailAttribute(), getFullNameAttribute(),
- getPasswordAttribute(), getDistinguishedNameAttribute() };
+ return new String[]{ getUserIdAttribute(), getEmailAttribute(), getFullNameAttribute(), getPasswordAttribute(),
+ getDistinguishedNameAttribute() };
}
public UserConfiguration getUserConf()