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

Revert "Reuse spring.ldap.base in Embedded support"

This commit is contained in:
Stephane Nicoll 2017-10-02 10:12:10 +02:00
parent 5e2ec29413
commit 1254c44985
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java
View File

@ -98,7 +98,6 @@ public class EmbeddedLdapAutoConfiguration {
source.setPassword(this.embeddedProperties.getCredential().getPassword()); source.setPassword(this.embeddedProperties.getCredential().getPassword());
} }
source.setUrls(this.properties.determineUrls(this.environment)); source.setUrls(this.properties.determineUrls(this.environment));
source.setBase(this.properties.getBase());
return source; return source;
} }

15
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
View File

@ -131,21 +131,6 @@ public class EmbeddedLdapAutoConfigurationTests {
assertThat(ldapTemplate.list("ou=company1,c=Sweden,dc=spring,dc=org")).hasSize(4); assertThat(ldapTemplate.list("ou=company1,c=Sweden,dc=spring,dc=org")).hasSize(4);
} }
@Test
public void testQueryEmbeddedLdapWithBase() throws LDAPException {
TestPropertyValues.of("spring.ldap.embedded.base-dn:dc=spring,dc=org",
"spring.ldap.base:dc=spring,dc=org")
.applyTo(this.context);
this.context.register(EmbeddedLdapAutoConfiguration.class,
LdapAutoConfiguration.class, LdapDataAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
this.context.refresh();
assertThat(this.context.getBeanNamesForType(LdapTemplate.class).length)
.isEqualTo(1);
LdapTemplate ldapTemplate = this.context.getBean(LdapTemplate.class);
assertThat(ldapTemplate.list("ou=company1,c=Sweden")).hasSize(4);
}
@Test @Test
public void testDisableSchemaValidation() throws LDAPException { public void testDisableSchemaValidation() throws LDAPException {
load("spring.ldap.embedded.validation.enabled:false", load("spring.ldap.embedded.validation.enabled:false",