[java-shib-attribute] branch main updated: IDP-2141 - Bug in BaseResolverPluginParser breaks resolutionPhases

[Scott Cantor]

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

scantor 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=ba4f5d5de34ab2b7484ea812ccb04f69f8282203

The following commit(s) were added to refs/heads/main by this push:
     new ba4f5d5de IDP-2141 - Bug in BaseResolverPluginParser breaks resolutionPhases
ba4f5d5de is described below

commit ba4f5d5de34ab2b7484ea812ccb04f69f8282203
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 28 09:36:02 2023 -0400

    IDP-2141 - Bug in BaseResolverPluginParser breaks resolutionPhases
    
    https://shibboleth.atlassian.net/browse/IDP-2141
    
    Add missing setFactoryMethod call.
---
 .../idp/attribute/resolver/spring/BaseResolverPluginParser.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
index 4e23c695c..669d559b8 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
@@ -189,14 +189,13 @@ public abstract class BaseResolverPluginParser extends AbstractCustomBeanDefinit
                 log.warn("excludeResolutionPhases ignored, using resolutionPhases");
             }
             phasesBuilder = BeanDefinitionBuilder.genericBeanDefinition(ResolutionLabelPredicate.class);
-            phasesBuilder.addConstructorArgValue(
-                    SpringSupport.getAttributeValueAsList(resolutionPhasesAttr));
+            phasesBuilder.setFactoryMethod("byList");
+            phasesBuilder.addConstructorArgValue(SpringSupport.getAttributeValueAsList(resolutionPhasesAttr));
         } else if (excludeResolutionPhasesAttr!=null) {
             final BeanDefinitionBuilder unnegated =
                     BeanDefinitionBuilder.genericBeanDefinition(ResolutionLabelPredicate.class);
             unnegated.setFactoryMethod("byList");
-            unnegated.addConstructorArgValue(
-                    SpringSupport.getAttributeValueAsList(excludeResolutionPhasesAttr));
+            unnegated.addConstructorArgValue(SpringSupport.getAttributeValueAsList(excludeResolutionPhasesAttr));
             phasesBuilder = BeanDefinitionBuilder.genericBeanDefinition(PredicateSupport.class);
             phasesBuilder.setFactoryMethod("not");
             phasesBuilder.addConstructorArgValue(unnegated.getBeanDefinition());

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