[java-shib-attribute] 02/05: Include connectorId in V2Parser.

[Scott Cantor]

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

scantor pushed a commit to branch maint-5.1
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=b6b56941ded9903559df7cacff48c0165d4aa25e

commit b6b56941ded9903559df7cacff48c0165d4aa25e
Author: Daniel Fisher <dfisher at vt.edu>
AuthorDate: Sun Jun 16 08:12:48 2024 -0400

    Include connectorId in V2Parser.
    
    Improve logging by using the connectorId in the resolver pool name.
---
 .../spring/dc/ldap/impl/LDAPDataConnectorParser.java      | 15 ++++++++++-----
 .../spring/dc/ldap/impl/LDAPDataConnectorParserTest.java  |  4 ++--
 .../dc/ldap/ldap-attribute-resolver-spring-context.xml    |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 029658880..01e23d7c6 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -134,7 +134,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             builder.addPropertyValue("failFastInitialize", FAIL_FAST_DEFAULT);
         }
         
-        final V2Parser v2Parser = new V2Parser(config, getLogPrefix());
+        final V2Parser v2Parser = new V2Parser(getDefinitionId(), config, getLogPrefix());
 
         final String searchBuilderID = v2Parser.getBeanSearchBuilderID();
         if (searchBuilderID != null) {
@@ -210,6 +210,9 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
         /** Class logger. */
         @Nonnull private static final Logger LOG = LoggerFactory.getLogger(V2Parser.class);
 
+        /** DataConnector ID. */
+        @Nonnull @NotEmpty private final String connectorId;
+
         /** LDAPDirectory XML element. */
         @Nonnull private final Element configElement;
         
@@ -218,13 +221,15 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
 
         /**
          * Creates a new V2Parser with the supplied LDAPDirectory element.
-         * 
+         *
+         * @param id Data connector ID
          * @param config LDAPDirectory element
          * @param prefix the parent's log prefix
          */
-        public V2Parser(@Nonnull final Element config, @Nonnull final String prefix) {
+        public V2Parser(@Nonnull final String id, @Nonnull final Element config, @Nonnull final String prefix) {
+            connectorId = Constraint.isNotEmpty(id, "Data connector ID cannot be null or empty");
             configElement = Constraint.isNotNull(config, "LDAPDirectory element cannot be null");
-            logPrefix = Constraint.isNotEmpty(prefix, "Log prefix cannot be null or empty"); 
+            logPrefix = Constraint.isNotEmpty(prefix, "Log prefix cannot be null or empty");
         }
 
         /**
@@ -601,7 +606,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
 
             final BeanDefinitionBuilder connectionFactory =
                 BeanDefinitionBuilder.genericBeanDefinition(PooledConnectionFactory.class);
-            connectionFactory.addPropertyValue("name", "resolver-pool");
+            connectionFactory.addPropertyValue("name", "resolver-pool-" + connectorId);
             connectionFactory.addPropertyValue("connectionConfig", createConnectionConfig(parserContext));
             if (blockWaitTime != null) {
                 connectionFactory.addPropertyValue("blockWaitTime", blockWaitTime);
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
index c4f823d8a..d2b52b285 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
@@ -258,7 +258,7 @@ public class LDAPDataConnectorParserTest {
         assertNotNull(connFactory);
         // note that default value changed from null to PT1M
         assertEquals(connFactory.getBlockWaitTime(), Duration.ofMinutes(1));
-        assertEquals("resolver-pool", connFactory.getName());
+        assertEquals(connFactory.getName(), "resolver-pool-myLDAP");
         assertEquals(connFactory.getMinPoolSize(), 0);
         assertEquals(connFactory.getMaxPoolSize(), 3);
         assertFalse(connFactory.isValidatePeriodically());
@@ -523,7 +523,7 @@ public class LDAPDataConnectorParserTest {
         final PooledConnectionFactory connFactory = (PooledConnectionFactory) dataConnector.getConnectionFactory();
         assertNotNull(connFactory);
         assertEquals(connFactory.getBlockWaitTime(), Duration.ofSeconds(5));
-        assertEquals(connFactory.getName(), "resolver-pool");
+        assertEquals(connFactory.getName(), "resolver-pool-myLDAP");
         assertEquals(connFactory.getMinPoolSize(), 5);
         assertEquals(connFactory.getMaxPoolSize(), 10);
         assertTrue(connFactory.isValidatePeriodically());
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
index 23f77319a..ad2b39c53 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
@@ -5,7 +5,7 @@
     <bean id="connectionFactory" class="org.ldaptive.PooledConnectionFactory" init-method="initialize" destroy-method="close"
           p:blockWaitTime="PT5S"
           p:failFastInitialize="false"
-          p:name="resolver-pool"
+          p:name="resolver-pool-myLDAP"
           p:minPoolSize="5"
           p:maxPoolSize="10"
           p:validatePeriodically="true">

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