cherry-pick [Improvement] [LDAP] Config value should return real null instead of 'null' string (#12031)

Co-authored-by: Guanhua Li <guanhua_li@foxmail.com>
This commit is contained in:
Kerwin 2022-09-19 09:48:17 +08:00 committed by GitHub
parent 3b947cebc7
commit 2b016356a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,25 +42,25 @@ import org.springframework.stereotype.Component;
public class LdapService {
private static final Logger logger = LoggerFactory.getLogger(LdapService.class);
@Value("${security.authentication.ldap.user.admin:null}")
@Value("${security.authentication.ldap.user.admin:#{null}}")
private String adminUserId;
@Value("${security.authentication.ldap.urls:null}")
@Value("${security.authentication.ldap.urls:#{null}}")
private String ldapUrls;
@Value("${security.authentication.ldap.base.dn:null}")
@Value("${security.authentication.ldap.base-dn:#{null}}")
private String ldapBaseDn;
@Value("${security.authentication.ldap.username:null}")
@Value("${security.authentication.ldap.username:#{null}}")
private String ldapSecurityPrincipal;
@Value("${security.authentication.ldap.password:null}")
@Value("${security.authentication.ldap.password:#{null}}")
private String ldapPrincipalPassword;
@Value("${security.authentication.ldap.user.identity.attribute:null}")
@Value("${security.authentication.ldap.user.identity-attribute:#{null}}")
private String ldapUserIdentifyingAttribute;
@Value("${security.authentication.ldap.user.email.attribute:null}")
@Value("${security.authentication.ldap.user.email-attribute:#{null}}")
private String ldapEmailAttribute;
/***