diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesRegistrar.java index 8070beb9d1..eb275fa36a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesRegistrar.java @@ -31,8 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi * @author Eddú Meléndez * @since 1.5.0 */ -class LdapRepositoriesRegistrar - extends AbstractRepositoryConfigurationSourceSupport { +class LdapRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport { @Override protected Class getAnnotation() { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java index 7e5e9447ed..d8f3acd6e8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java @@ -39,27 +39,26 @@ import org.springframework.ldap.core.support.LdapContextSource; @EnableConfigurationProperties(LdapProperties.class) public class LdapAutoConfiguration { - private LdapProperties properties; + private final LdapProperties properties; - private Environment environment; + private final Environment environment; - public LdapAutoConfiguration(LdapProperties properties, - Environment environment) { + public LdapAutoConfiguration(LdapProperties properties, Environment environment) { this.properties = properties; this.environment = environment; } @Bean @ConditionalOnMissingBean - public ContextSource contextSource() { - LdapContextSource contextSource = new LdapContextSource(); - contextSource.setUserDn(this.properties.getUsername()); - contextSource.setPassword(this.properties.getPassword()); - contextSource.setBase(this.properties.getBase()); - contextSource.setUrls(this.properties.determineUrls(this.environment)); - contextSource.setBaseEnvironmentProperties(Collections + public ContextSource ldapContextSource() { + LdapContextSource source = new LdapContextSource(); + source.setUserDn(this.properties.getUsername()); + source.setPassword(this.properties.getPassword()); + source.setBase(this.properties.getBase()); + source.setUrls(this.properties.determineUrls(this.environment)); + source.setBaseEnvironmentProperties(Collections .unmodifiableMap(this.properties.getBaseEnvironment())); - return contextSource; + return source; } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java index 018adc9f30..35c8ad8b9f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java @@ -22,6 +22,9 @@ import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.env.Environment; import org.springframework.ldap.core.LdapTemplate; +import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; + /** * Configuration properties to configure {@link LdapTemplate}. * @@ -36,7 +39,7 @@ public class LdapProperties { /** * LDAP urls. */ - private String[] urls = new String[0]; + private String[] urls; /** * Base suffix from which all operations should originate. @@ -99,29 +102,19 @@ public class LdapProperties { } public String[] determineUrls(Environment environment) { - if (this.urls.length == 0) { - String protocol = "ldap://"; - String host = "localhost"; - int port = determinePort(environment); - String[] ldapUrls = new String[1]; - ldapUrls[0] = protocol + host + ":" + port; - return ldapUrls; + if (ObjectUtils.isEmpty(this.urls)) { + return new String[] { "ldap://localhost:" + determinePort(environment) }; } return this.urls; } private int determinePort(Environment environment) { - if (environment != null) { - String localPort = environment.getProperty("local.ldap.port"); - if (localPort != null) { - return Integer.valueOf(localPort); - } - else { - return DEFAULT_PORT; - } + Assert.state(environment != null, "No local LDAP port configured"); + String localPort = environment.getProperty("local.ldap.port"); + if (localPort != null) { + return Integer.valueOf(localPort); } - throw new IllegalStateException( - "No local ldap port configuration is available"); + return DEFAULT_PORT; } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java index a3c4e55acf..3d0670be3c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java @@ -16,9 +16,6 @@ package org.springframework.boot.autoconfigure.ldap.embedded; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -30,14 +27,15 @@ import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig; import com.unboundid.ldap.listener.InMemoryListenerConfig; import com.unboundid.ldap.sdk.LDAPException; import com.unboundid.ldif.LDIFReader; -import org.apache.commons.io.IOUtils; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration; import org.springframework.boot.autoconfigure.ldap.LdapProperties; +import org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapProperties.Credential; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; @@ -63,22 +61,24 @@ import org.springframework.util.StringUtils; @EnableConfigurationProperties({ LdapProperties.class, EmbeddedLdapProperties.class }) @AutoConfigureBefore(LdapAutoConfiguration.class) @ConditionalOnClass(InMemoryDirectoryServer.class) +@ConditionalOnProperty(prefix = "spring.ldap.embedded", name = "base-dn") public class EmbeddedLdapAutoConfiguration { + private static final String PROPERTY_SOURCE_NAME = "ldap.ports"; + + private final EmbeddedLdapProperties embeddedProperties; + + private final LdapProperties properties; + + private final ConfigurableApplicationContext applicationContext; + + private final Environment environment; + private InMemoryDirectoryServer server; - private EmbeddedLdapProperties embeddedProperties; - - private LdapProperties properties; - - private ConfigurableApplicationContext applicationContext; - - private Environment environment; - public EmbeddedLdapAutoConfiguration(EmbeddedLdapProperties embeddedProperties, - LdapProperties properties, - ConfigurableApplicationContext applicationContext, - Environment environment) { + LdapProperties properties, ConfigurableApplicationContext applicationContext, + Environment environment) { this.embeddedProperties = embeddedProperties; this.properties = properties; this.applicationContext = applicationContext; @@ -88,100 +88,83 @@ public class EmbeddedLdapAutoConfiguration { @Bean @DependsOn("directoryServer") @ConditionalOnMissingBean - public ContextSource contextSource() { - LdapContextSource contextSource = new LdapContextSource(); - - EmbeddedLdapProperties.Credential credential = this.embeddedProperties - .getCredential(); - if (StringUtils.hasText(credential.getUsername()) && - StringUtils.hasText(credential.getPassword())) { - contextSource.setUserDn(credential.getUsername()); - contextSource.setPassword(credential.getPassword()); + public ContextSource ldapContextSource() { + LdapContextSource source = new LdapContextSource(); + if (hasCredentials(this.embeddedProperties.getCredential())) { + source.setUserDn(this.embeddedProperties.getCredential().getUsername()); + source.setPassword(this.embeddedProperties.getCredential().getPassword()); } - contextSource.setUrls(this.properties.determineUrls(this.environment)); - return contextSource; + source.setUrls(this.properties.determineUrls(this.environment)); + return source; } @Bean public InMemoryDirectoryServer directoryServer() throws LDAPException { - InMemoryDirectoryServerConfig config = - new InMemoryDirectoryServerConfig(this.embeddedProperties - .getPartitionSuffix()); - - EmbeddedLdapProperties.Credential credential = this.embeddedProperties - .getCredential(); - if (StringUtils.hasText(credential.getUsername()) && - StringUtils.hasText(credential.getPassword())) { - config.addAdditionalBindCredentials(credential - .getUsername(), credential.getPassword()); + InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig( + this.embeddedProperties.getBaseDn()); + if (hasCredentials(this.embeddedProperties.getCredential())) { + config.addAdditionalBindCredentials( + this.embeddedProperties.getCredential().getUsername(), + this.embeddedProperties.getCredential().getPassword()); } - - config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("LDAP", - this.embeddedProperties.getPort())); - + InMemoryListenerConfig listenerConfig = InMemoryListenerConfig + .createLDAPConfig("LDAP", this.embeddedProperties.getPort()); + config.setListenerConfigs(listenerConfig); this.server = new InMemoryDirectoryServer(config); - - populateDirectoryServer(); - + importLdif(); this.server.startListening(); - publishPortInfo(this.server.getListenPort()); + setPortProperty(this.applicationContext, this.server.getListenPort()); return this.server; } - private void publishPortInfo(int port) { - setPortProperty(this.applicationContext, port); + private boolean hasCredentials(Credential credential) { + return StringUtils.hasText(credential.getUsername()) + && StringUtils.hasText(credential.getPassword()); } - private void setPortProperty(ApplicationContext currentContext, - int port) { - if (currentContext instanceof ConfigurableApplicationContext) { - MutablePropertySources sources = ((ConfigurableApplicationContext) - currentContext).getEnvironment().getPropertySources(); + private void importLdif() throws LDAPException { + String location = this.embeddedProperties.getLdif(); + if (StringUtils.hasText(location)) { + try { + Resource resource = this.applicationContext.getResource(location); + if (resource.exists()) { + InputStream inputStream = resource.getInputStream(); + try { + this.server.importFromLDIF(true, new LDIFReader(inputStream)); + } + finally { + inputStream.close(); + } + } + } + catch (Exception ex) { + throw new IllegalStateException("Unable to load LDIF " + location, ex); + } + } + } + + private void setPortProperty(ApplicationContext context, int port) { + if (context instanceof ConfigurableApplicationContext) { + MutablePropertySources sources = ((ConfigurableApplicationContext) context) + .getEnvironment().getPropertySources(); getLdapPorts(sources).put("local.ldap.port", port); } - if (currentContext.getParent() != null) { - setPortProperty(currentContext.getParent(), port); + if (context.getParent() != null) { + setPortProperty(context.getParent(), port); } } + @SuppressWarnings("unchecked") private Map getLdapPorts(MutablePropertySources sources) { - PropertySource propertySource = sources.get("ldap.ports"); + PropertySource propertySource = sources.get(PROPERTY_SOURCE_NAME); if (propertySource == null) { - propertySource = new MapPropertySource("ldap.ports", + propertySource = new MapPropertySource(PROPERTY_SOURCE_NAME, new HashMap()); sources.addFirst(propertySource); } return (Map) propertySource.getSource(); } - private void populateDirectoryServer() throws LDAPException { - String location = this.embeddedProperties.getLdif(); - if (StringUtils.hasText(location)) { - try { - Resource resource = this.applicationContext.getResource( - this.embeddedProperties.getLdif()); - if (resource.exists()) { - File tempFile = File.createTempFile("ldap_test_data", ".ldif"); - try { - InputStream inputStream = resource.getInputStream(); - IOUtils.copy(inputStream, new FileOutputStream(tempFile)); - this.server.importFromLDIF(true, new LDIFReader(tempFile)); - } - catch (LDAPException e) { - e.printStackTrace(); - } - finally { - tempFile.delete(); - } - } - } - catch (IOException ex) { - throw new IllegalStateException( - "Unable to load resource from " + location, ex); - } - } - } - @PreDestroy public void close() { if (this.server != null) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java index 0729b03f9c..1a4ac083ed 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java @@ -38,14 +38,14 @@ public class EmbeddedLdapProperties { private Credential credential = new Credential(); /** - * LDAP partition suffix. + * Base DNs. */ - private String partitionSuffix; + private String baseDn; /** * Schema (LDIF) script resource reference. */ - private String ldif; + private String ldif = "classpath:schema.ldif"; public int getPort() { return this.port; @@ -63,12 +63,12 @@ public class EmbeddedLdapProperties { this.credential = credential; } - public String getPartitionSuffix() { - return this.partitionSuffix; + public String getBaseDn() { + return this.baseDn; } - public void setPartitionSuffix(String partitionSuffix) { - this.partitionSuffix = partitionSuffix; + public void setBaseDn(String baseDn) { + this.baseDn = baseDn; } public String getLdif() { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/ldap/PersonLdapRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/ldap/PersonLdapRepository.java index cffe65943f..baa9fcbf64 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/ldap/PersonLdapRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/ldap/PersonLdapRepository.java @@ -22,4 +22,5 @@ import org.springframework.boot.autoconfigure.data.ldap.person.Person; import org.springframework.data.repository.Repository; public interface PersonLdapRepository extends Repository { + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java index c907ae0a68..1301db97c9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java @@ -49,8 +49,7 @@ public class LdapDataAutoConfigurationTests { this.context.register(PropertyPlaceholderAutoConfiguration.class, LdapAutoConfiguration.class, LdapDataAutoConfiguration.class); this.context.refresh(); - assertThat(this.context.getBeanNamesForType(LdapTemplate.class).length) - .isEqualTo(1); + assertThat(this.context.getBeanNamesForType(LdapTemplate.class)).hasSize(1); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java index 27be0268c3..6ebb70597a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java @@ -52,16 +52,13 @@ public class LdapRepositoriesAutoConfigurationTests { @Test public void testDefaultRepositoryConfiguration() throws Exception { load(TestConfiguration.class); - assertThat(this.context.getBean(PersonRepository.class)).isNotNull(); } @Test public void testNoRepositoryConfiguration() throws Exception { load(EmptyConfiguration.class); - - assertThat(this.context.getBeanNamesForType(PersonRepository.class).length) - .isEqualTo(0); + assertThat(this.context.getBeanNamesForType(PersonRepository.class)).isEmpty(); } @Test @@ -76,8 +73,7 @@ public class LdapRepositoriesAutoConfigurationTests { "spring.ldap.urls:ldap://localhost:389"); this.context.register(configurationClasses); this.context.register(LdapAutoConfiguration.class, - LdapDataAutoConfiguration.class, - LdapRepositoriesAutoConfiguration.class, + LdapDataAutoConfiguration.class, LdapRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/person/Person.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/person/Person.java index 52e4b7bcb4..02bb4600c3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/person/Person.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/person/Person.java @@ -23,7 +23,7 @@ import org.springframework.ldap.odm.annotations.DnAttribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -@Entry(objectClasses = {"person", "top"}, base = "ou=someOu") +@Entry(objectClasses = { "person", "top" }, base = "ou=someOu") public class Person { @Id diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java index 2f8653e4d0..102e205a6b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java @@ -52,52 +52,44 @@ public class LdapAutoConfigurationTests { @Test public void testDefaultUrl() { load(); - assertThat(this.context.getBeanNamesForType(ContextSource.class).length) - .isEqualTo(1); - assertThat(ReflectionTestUtils.getField(this.context.getBean(ContextSource.class), - "urls")).isEqualTo(new String[]{"ldap://localhost:389"}); + ContextSource contextSource = this.context.getBean(ContextSource.class); + String[] urls = (String[]) ReflectionTestUtils.getField(contextSource, "urls"); + assertThat(urls).containsExactly("ldap://localhost:389"); } @Test public void testContextSourceSetOneUrl() { load("spring.ldap.urls:ldap://localhost:123"); - assertThat(this.context.getBeanNamesForType(ContextSource.class).length) - .isEqualTo(1); - assertThat(ReflectionTestUtils.getField(this.context.getBean(ContextSource.class), - "urls")).isEqualTo(new String[]{"ldap://localhost:123"}); + ContextSource contextSource = this.context.getBean(ContextSource.class); + String[] urls = (String[]) ReflectionTestUtils.getField(contextSource, "urls"); + assertThat(urls).containsExactly("ldap://localhost:123"); } @Test public void testContextSourceSetTwoUrls() { load("spring.ldap.urls:ldap://localhost:123,ldap://mycompany:123"); - assertThat(this.context.getBeanNamesForType(ContextSource.class).length) - .isEqualTo(1); - assertThat(this.context.getBean(LdapProperties.class).getUrls().length) - .isEqualTo(2); - assertThat(ReflectionTestUtils.getField(this.context.getBean(ContextSource.class), - "urls")) - .isEqualTo(new String[]{"ldap://localhost:123", "ldap://mycompany:123"}); + ContextSource contextSource = this.context.getBean(ContextSource.class); + LdapProperties ldapProperties = this.context.getBean(LdapProperties.class); + String[] urls = (String[]) ReflectionTestUtils.getField(contextSource, "urls"); + assertThat(urls).containsExactly("ldap://localhost:123", "ldap://mycompany:123"); + assertThat(ldapProperties.getUrls()).hasSize(2); } @Test public void testContextSourceWithMoreProperties() { - load("spring.ldap.urls:ldap://localhost:123", - "spring.ldap.username:root", - "spring.ldap.password:root", - "spring.ldap.base:cn=SpringDevelopers", - "spring.ldap.baseEnvironment.java.naming.security" + - ".authentication:DIGEST-MD5"); - assertThat(this.context.getBeanNamesForType(ContextSource.class).length) - .isEqualTo(1); - assertThat(this.context.getBean(LdapProperties.class).getBaseEnvironment()) + load("spring.ldap.urls:ldap://localhost:123", "spring.ldap.username:root", + "spring.ldap.password:root", "spring.ldap.base:cn=SpringDevelopers", + "spring.ldap.baseEnvironment.java.naming.security" + + ".authentication:DIGEST-MD5"); + LdapProperties ldapProperties = this.context.getBean(LdapProperties.class); + assertThat(ldapProperties.getBaseEnvironment()) .containsEntry("java.naming.security.authentication", "DIGEST-MD5"); } private void load(String... properties) { EnvironmentTestUtils.addEnvironment(this.context, properties); - this.context - .register(LdapAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class); + this.context.register(LdapAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java index 3cb6c00743..c425850826 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java @@ -61,7 +61,7 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testSetDefaultPort() throws LDAPException { load("spring.ldap.embedded.port:1234", - "spring.ldap.embedded.partitionSuffix:dc=spring,dc=org"); + "spring.ldap.embedded.base-dn:dc=spring,dc=org"); InMemoryDirectoryServer server = this.context .getBean(InMemoryDirectoryServer.class); assertThat(server.getListenPort()).isEqualTo(1234); @@ -69,7 +69,7 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testRandomPortWithEnvironment() throws LDAPException { - load("spring.ldap.embedded.partitionSuffix:dc=spring,dc=org"); + load("spring.ldap.embedded.base-dn:dc=spring,dc=org"); InMemoryDirectoryServer server = this.context .getBean(InMemoryDirectoryServer.class); assertThat(server.getListenPort()).isEqualTo(this.context.getEnvironment() @@ -79,21 +79,19 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testRandomPortWithValueAnnotation() throws LDAPException { EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.embedded.partitionSuffix:dc=spring,dc=org"); + "spring.ldap.embedded.base-dn:dc=spring,dc=org"); this.context.register(EmbeddedLdapAutoConfiguration.class, LdapClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); - LDAPConnection connection = this.context - .getBean(LDAPConnection.class); - assertThat(connection.getConnectedPort()) - .isEqualTo(this.context.getEnvironment() + LDAPConnection connection = this.context.getBean(LDAPConnection.class); + assertThat(connection.getConnectedPort()).isEqualTo(this.context.getEnvironment() .getProperty("local.ldap.port", Integer.class)); } @Test public void testSetCredentials() throws LDAPException { - load("spring.ldap.embedded.partitionSuffix:dc=spring,dc=org", + load("spring.ldap.embedded.base-dn:dc=spring,dc=org", "spring.ldap.embedded.credential.username:uid=root", "spring.ldap.embedded.credential.password:boot"); InMemoryDirectoryServer server = this.context @@ -104,7 +102,7 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testSetPartitionSuffix() throws LDAPException { - load("spring.ldap.embedded.partitionSuffix:dc=spring,dc=org"); + load("spring.ldap.embedded.base-dn:dc=spring,dc=org"); InMemoryDirectoryServer server = this.context .getBean(InMemoryDirectoryServer.class); assertThat(server.getBaseDNs()).containsExactly(new DN("dc=spring,dc=org")); @@ -112,35 +110,31 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testSetLdifFile() throws LDAPException { - load("spring.ldap.embedded.partitionSuffix:dc=spring,dc=org", - "spring.ldap.embedded.ldif:classpath:schema.ldif"); + load("spring.ldap.embedded.base-dn:dc=spring,dc=org"); InMemoryDirectoryServer server = this.context .getBean(InMemoryDirectoryServer.class); assertThat(server.countEntriesBelow("ou=company1,c=Sweden,dc=spring,dc=org")) .isEqualTo(5); } + @Test public void testQueryEmbeddedLdap() throws LDAPException { EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.embedded.partitionSuffix:dc=spring,dc=org", - "spring.ldap.embedded.ldif:classpath:schema.ldif"); + "spring.ldap.embedded.base-dn:dc=spring,dc=org"); this.context.register(EmbeddedLdapAutoConfiguration.class, - LdapAutoConfiguration.class, - LdapDataAutoConfiguration.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,dc=spring,dc=org").size()) - .isEqualTo(4); + LdapTemplate ldapTemplate = this.context.getBean(LdapTemplate.class); + assertThat(ldapTemplate.list("ou=company1,c=Sweden,dc=spring,dc=org")).hasSize(4); } private void load(String... properties) { EnvironmentTestUtils.addEnvironment(this.context, properties); this.context.register(EmbeddedLdapAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class); + PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); } diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 7f828a13ed..73b463b3f9 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -345,6 +345,11 @@ spring-boot-starter-data-jpa 1.5.0.BUILD-SNAPSHOT + + org.springframework.boot + spring-boot-starter-data-ldap + 1.5.0.BUILD-SNAPSHOT + org.springframework.boot spring-boot-starter-data-mongodb diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 5eb9b7cfda..82e83fdf38 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -315,13 +315,6 @@ content into your application; rather pick only the properties that you need. spring.jersey.servlet.load-on-startup=-1 # Load on startup priority of the Jersey servlet. spring.jersey.type=servlet # Jersey integration type. - # EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties]) - spring.ldap.embedded.port= # Embedded LDAP port. - spring.ldap.embedded.credential.username= # Embedded LDAP username. - spring.ldap.embedded.credential.password= # Embedded LDAP password. - spring.ldap.embedded.partition-suffix= # LDAP partition suffix. - spring.ldap.embedded.ldif= # Schema (LDIF) script resource reference. - # SPRING LDAP ({sc-spring-boot-autoconfigure}/ldap/LdapProperties.{sc-ext}[LdapProperties]) spring.ldap.urls= # LDAP url of the server. spring.ldap.base= # Base suffix from which all operations should originate. @@ -329,6 +322,13 @@ content into your application; rather pick only the properties that you need. spring.ldap.password= # Login password of the server. spring.ldap.base-environment.*= # Ldap specification settings. + # EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties]) + spring.ldap.embedded.port= # Embedded LDAP port. + spring.ldap.embedded.credential.username= # Embedded LDAP username. + spring.ldap.embedded.credential.password= # Embedded LDAP password. + spring.ldap.embedded.base-dn= # The base DN + spring.ldap.embedded.ldif= # Schema (LDIF) script resource reference. + # SPRING MOBILE DEVICE VIEWS ({sc-spring-boot-autoconfigure}/mobile/DeviceDelegatingViewResolverAutoConfiguration.{sc-ext}[DeviceDelegatingViewResolverAutoConfiguration]) spring.mobile.devicedelegatingviewresolver.enable-fallback=false # Enable support for fallback resolution. spring.mobile.devicedelegatingviewresolver.enabled=false # Enable device view resolver. diff --git a/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml b/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml index 0f1d8e079d..09ae22b28d 100644 --- a/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 spring-boot-starters @@ -27,6 +28,26 @@ spring-data-ldap - - - \ No newline at end of file + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + +