[java-shib-attribute] 01/02: JSATTR-7 PairwiseIdDataConnectorParser does not derive from the data connector parser base class

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-shib-attribute.

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

commit 90658ddc637c838665103d2537e6033b28866e61
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 12 16:26:29 2022 +0000

    JSATTR-7 PairwiseIdDataConnectorParser does not derive from the data connector parser base class
    
    https://shibboleth.atlassian.net/browse/JSATTR-7
    
    Special case the handling of failFastInitialize to the LDAP, RDBMS and HTTP
    data connectors (the Stored Id handler mananges this itself)
---
 .../attribute/resolver/spring/dc/AbstractDataConnectorParser.java   | 5 -----
 .../resolver/spring/dc/http/impl/HTTPDataConnectorParser.java       | 6 ++++++
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java       | 6 ++++++
 .../resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java     | 6 ++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
index 497fb042e..1dce785dd 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
@@ -111,11 +111,6 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
                     SpringSupport.getAttributeValueAsList(config.getAttributeNodeNS(null, ATTR_EXPORT_NAMES)));
         }
 
-        if (config.hasAttributeNS(null, ATTR_FAIL_FAST)) {
-            // LDAP, Relational & HTTP only, limited in the schema
-            builder.addPropertyValue("failFastInitialize", 
-                    StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FAIL_FAST)));
-        }
     }
 
     /**
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 80e427f62..7be66dd75 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -72,6 +72,12 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
         super.doParse(config, parserContext, builder);
         log.debug("{} Parsing custom configuration {}", getLogPrefix(), config);
 
+        if (config.hasAttributeNS(null, ATTR_FAIL_FAST)) {
+            // LDAP, Relational & HTTP only, limited in the schema
+            builder.addPropertyValue("failFastInitialize",
+                    StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FAIL_FAST)));
+        }
+
         final V2Parser v2Parser = new V2Parser(config, getLogPrefix());
 
         final String httpClientID = v2Parser.getBeanHttpClientID();
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 bf0546e28..9fc0c8956 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
@@ -142,6 +142,12 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
                         "(replacement depends on property)");
             }
         }
+
+        if (config.hasAttributeNS(null, ATTR_FAIL_FAST)) {
+            // LDAP, Relational & HTTP only, limited in the schema
+            builder.addPropertyValue("failFastInitialize", 
+                    StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FAIL_FAST)));
+        }
         
         final V2Parser v2Parser = new V2Parser(config, getLogPrefix());
 
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index d7e62ad92..7e9e7bd3f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -71,6 +71,12 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
 
         final V2Parser v2Parser = new V2Parser(config, getLogPrefix());
 
+        if (config.hasAttributeNS(null, ATTR_FAIL_FAST)) {
+            // LDAP, Relational & HTTP only, limited in the schema
+            builder.addPropertyValue("failFastInitialize",
+                    StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FAIL_FAST)));
+        }
+
         final String dataSourceID = ManagedConnectionParser.getBeanDataSourceID(config);
         final BeanDefinition dataSource;
         if (dataSourceID != null) {

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