[java-shib-attribute] branch main updated: JSATTR-4 Remove springResources from data connector

[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=004c08410be1526b29d3e09714a93583a5bbacfc

The following commit(s) were added to refs/heads/main by this push:
     new 004c08410 JSATTR-4 Remove springResources from data connector
004c08410 is described below

commit 004c08410be1526b29d3e09714a93583a5bbacfc
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 26 17:33:13 2022 +0100

    JSATTR-4 Remove springResources from data connector
    
    https://shibboleth.atlassian.net/browse/JSATTR-4
    
    Refactor SubjectDataConnectorParser, it is not a child but a peer of
    ContextDerivedDataConnectorParser.
---
 .../spring/dc/impl/SubjectDataConnectorParser.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
index 601db09b2..a9408a1bd 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
@@ -29,14 +29,17 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
 import net.shibboleth.idp.attribute.resolver.dc.impl.ContextDerivedDataConnector;
+import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.spring.util.SpringSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
 
-/** Spring Bean Definition Parser for {@link ContextDerivedDataConnector} with a predefined mapping function. */
-public class SubjectDataConnectorParser extends ContextDerivedDataConnectorParser {
+/** Spring Bean Definition Parser for {@link ContextDerivedDataConnector} with a predefined mapping function. 
+ */
+public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
 
     /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
@@ -52,6 +55,12 @@ public class SubjectDataConnectorParser extends ContextDerivedDataConnectorParse
     /** Class for sourcing values from Subject(s). */
     @Nonnull private Class<? extends Function<?,?>> subjectDerivedClass;
 
+    /** {@inheritDoc} */
+    @Override
+    @Nonnull protected Class<? extends AbstractDataConnector> getNativeBeanClass() {
+        return ContextDerivedDataConnector.class;
+    }
+    
     /** Constructor. */
     @SuppressWarnings("unchecked")
     public SubjectDataConnectorParser() {
@@ -93,4 +102,9 @@ public class SubjectDataConnectorParser extends ContextDerivedDataConnectorParse
         }
     }
 
+    /** {@inheritDoc} */
+    @Override protected boolean failOnDependencies() {
+        return true;
+    }
+
 }
\ No newline at end of file

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