[java-identity-provider] 01/03: IDP-1882 idp.attribute.resolver.LDAP.connectionStrategy ignored in attribute-resolver.xml

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch maint-4.1
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b3bcefa8e3ed4b9969aa6d8b974f4aa84dc0df3d

commit b3bcefa8e3ed4b9969aa6d8b974f4aa84dc0df3d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Dec 9 20:13:23 2021 +0000

    IDP-1882 idp.attribute.resolver.LDAP.connectionStrategy ignored in attribute-resolver.xml
    
    https://shibboleth.atlassian.net/browse/IDP-1882
    
    Add test.
---
 .../resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java         | 5 +++++
 .../idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties         | 1 +
 .../spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml     | 1 +
 3 files changed, 7 insertions(+)

diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index d77dabee0..15fdba39c 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -37,6 +37,8 @@ import java.util.stream.Collectors;
 import org.ldaptive.BindConnectionInitializer;
 import org.ldaptive.ConnectionConfig;
 import org.ldaptive.DefaultConnectionFactory;
+import org.ldaptive.RandomConnectionStrategy;
+import org.ldaptive.RoundRobinConnectionStrategy;
 import org.ldaptive.SearchExecutor;
 import org.ldaptive.pool.BlockingConnectionPool;
 import org.ldaptive.pool.IdlePruneStrategy;
@@ -370,6 +372,9 @@ public class LDAPDataConnectorParserTest {
         assertNotNull(attrs.get("homephone"));
         assertNotNull(attrs.get("mail"));
         assertNotNull(attrs.get("entryDN"));
+
+        assertEquals(dataConnector.getConnectionFactory().getConnection().getConnectionConfig().getConnectionStrategy().getClass(),
+                RandomConnectionStrategy.class);
     }
 
     @Test public void v2SaslConfig() throws Exception {
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
index 8fb999d25..4a7620464 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
@@ -4,6 +4,7 @@ connectionConfig.connectTimeout=PT2S
 connectionConfig.responseTimeout=PT4S
 connectionConfig.bindDn=cn=Directory Manager
 connectionConfig.bindCredential=password
+connectionConfig.connectStrategy=RANDOM
 
 noResultIsError=true
 multipleResultsIsError=true
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
index cc8742413..053c9f762 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
@@ -14,6 +14,7 @@
         multipleResultsIsError="%{multipleResultsIsError}"
         noRetryDelay="%{noRetryDelay}"
         connectTimeout="%{connectionConfig.connectTimeout}"
+        connectionStrategy="%{connectionConfig.connectStrategy}"
         responseTimeout="%{connectionConfig.responseTimeout}">
         <FilterTemplate>
             <![CDATA[

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.