LDAP-317: ldap:context-source@url supports SpEL

core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTest.java

@@ -154,6 +154,53 @@ public class LdapTemplateNamespaceHandlerTest {
         assertEquals(SearchControls.OBJECT_SCOPE, getInternalState(ldapTemplate, "defaultSearchScope"));
     }
 
+    @Test
+    public void supportsSpel() {
+        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/ldap-namespace-config-spel.xml");
+        ContextSource outerContextSource = ctx.getBean(ContextSource.class);
+
+        assertNotNull(outerContextSource);
+
+        assertTrue(outerContextSource instanceof TransactionAwareContextSourceProxy);
+        ContextSource contextSource = ((TransactionAwareContextSourceProxy) outerContextSource).getTarget();
+
+        assertEquals(LdapUtils.newLdapName("dc=261consulting,dc=com"), getInternalState(contextSource, "base"));
+        assertEquals("uid=admin", getInternalState(contextSource, "userDn"));
+        assertEquals("apassword", getInternalState(contextSource, "password"));
+        assertArrayEquals(new String[]{"ldap://localhost:389"}, (Object[]) getInternalState(contextSource, "urls"));
+
+    }
+
+    @Test
+    public void supportsSpelMultiUrls() {
+        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/ldap-namespace-config-spel-multiurls.xml");
+        ContextSource outerContextSource = ctx.getBean(ContextSource.class);
+
+        assertNotNull(outerContextSource);
+
+        assertTrue(outerContextSource instanceof TransactionAwareContextSourceProxy);
+        ContextSource contextSource = ((TransactionAwareContextSourceProxy) outerContextSource).getTarget();
+
+        assertArrayEquals(new String[] { "ldap://a.localhost:389", "ldap://b.localhost:389" },
+                (Object[]) getInternalState(contextSource, "urls"));
+
+    }
+
+    @Test
+    public void supportsMultipleUrls() {
+        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/ldap-namespace-config-multiurls.xml");
+        ContextSource outerContextSource = ctx.getBean(ContextSource.class);
+
+        assertNotNull(outerContextSource);
+
+        assertTrue(outerContextSource instanceof TransactionAwareContextSourceProxy);
+        ContextSource contextSource = ((TransactionAwareContextSourceProxy) outerContextSource).getTarget();
+
+        assertArrayEquals(new String[] { "ldap://a.localhost:389", "ldap://b.localhost:389" },
+                (Object[]) getInternalState(contextSource, "urls"));
+
+    }
+
     @Test
     public void verifyParseWithDefaultTransactions() {
         ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/ldap-namespace-config-transactional-defaults.xml");

core/src/test/resources/ldap-namespace-config-multiurls.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:ldap="http://www.springframework.org/schema/ldap"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/ldap http://www.springframework.org/schema/ldap/spring-ldap.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <ldap:context-source
+            username="username"
+            password="password"
+            url="ldap://a.localhost:389,ldap://b.localhost:389" />
+</beans>

core/src/test/resources/ldap-namespace-config-spel-multiurls.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:ldap="http://www.springframework.org/schema/ldap"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/ldap http://www.springframework.org/schema/ldap/spring-ldap.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <ldap:context-source
+            url="#{ldapProperties.url}"
+            username="username"
+            password="password" />
+
+    <util:properties id="ldapProperties">
+        <prop key="url">ldap://a.localhost:389,ldap://b.localhost:389</prop>
+    </util:properties>
+</beans>

core/src/test/resources/ldap-namespace-config-spel.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:ldap="http://www.springframework.org/schema/ldap"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/ldap http://www.springframework.org/schema/ldap/spring-ldap.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <ldap:context-source
+            url="#{ldapProperties.url}"
+            base="#{ldapProperties.base}"
+            username="#{ldapProperties.username}"
+            password="#{ldapProperties.password}" />
+
+    <util:properties id="ldapProperties">
+        <prop key="url">ldap://localhost:389</prop>
+        <prop key="username">uid=admin</prop>
+        <prop key="password">apassword</prop>
+        <prop key="base">dc=261consulting,dc=com</prop>
+    </util:properties>
+</beans>