root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' 

Closes gh-17889
This commit is contained in:
Stephane Nicoll 2019-08-17 06:38:00 +02:00
parent 76dfe1aae4 3a20b1d90c
commit 04b63cda8f
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java
View File

@ -22,6 +22,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
@ -46,12 +47,14 @@ public class LdapAutoConfiguration {
@ConditionalOnMissingBean @ConditionalOnMissingBean
public LdapContextSource ldapContextSource(LdapProperties properties, Environment environment) { public LdapContextSource ldapContextSource(LdapProperties properties, Environment environment) {
LdapContextSource source = new LdapContextSource(); LdapContextSource source = new LdapContextSource();
source.setUserDn(properties.getUsername()); PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
source.setPassword(properties.getPassword()); propertyMapper.from(properties.getUsername()).to(source::setUserDn);
source.setAnonymousReadOnly(properties.getAnonymousReadOnly()); propertyMapper.from(properties.getPassword()).to(source::setPassword);
source.setBase(properties.getBase()); propertyMapper.from(properties.getAnonymousReadOnly()).to(source::setAnonymousReadOnly);
source.setUrls(properties.determineUrls(environment)); propertyMapper.from(properties.getBase()).to(source::setBase);
source.setBaseEnvironmentProperties(Collections.unmodifiableMap(properties.getBaseEnvironment())); propertyMapper.from(properties.determineUrls(environment)).to(source::setUrls);
propertyMapper.from(properties.getBaseEnvironment()).to(
(baseEnvironment) -> source.setBaseEnvironmentProperties(Collections.unmodifiableMap(baseEnvironment)));
return source; return source;
} }

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java
View File

@ -87,6 +87,17 @@ class LdapAutoConfigurationTests {
}); });
} }
@Test
void contextSourceWithNoCustomization() {
this.contextRunner.run((context) -> {
LdapContextSource contextSource = context.getBean(LdapContextSource.class);
assertThat(contextSource.getUserDn()).isEqualTo("");
assertThat(contextSource.getPassword()).isEqualTo("");
assertThat(contextSource.isAnonymousReadOnly()).isFalse();
assertThat(contextSource.getBaseLdapPathAsString()).isEqualTo("");
});
}
@Test @Test
void templateExists() { void templateExists() {
this.contextRunner.withPropertyValues("spring.ldap.urls:ldap://localhost:389") this.contextRunner.withPropertyValues("spring.ldap.urls:ldap://localhost:389")