[java-identity-provider] branch main updated: IDP-1959 IdPAttributes to stop carrying Display Information

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new bae28326a IDP-1959 IdPAttributes to stop carrying Display Information
bae28326a is described below

commit bae28326a26a61800d5574273dfc99db4cc986b2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 21 16:28:11 2022 +0100

    IDP-1959 IdPAttributes to stop carrying Display Information
    
    https://shibboleth.atlassian.net/browse/IDP-1959
    
    The Attribute Resolution context no longer needs a
    AttributeTranscoderRegistry.
---
 .../idp/flows/admin/admin-abstract-beans.xml          |  1 -
 .../shibboleth/idp/flows/cas/cas-abstract-beans.xml   |  1 -
 .../shibboleth/idp/flows/saml/saml-abstract-beans.xml |  1 -
 .../idp/profile/impl/ResolveAttributes.java           | 19 +------------------
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
index adb77cbff..d13d7e880 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
@@ -56,7 +56,6 @@
 
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
         c:resolverService-ref="shibboleth.AttributeResolverService"
-        p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
         p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="PopulatePostAuthnInterceptContext"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
index 86c0ea389..a095dfd7d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
@@ -73,7 +73,6 @@
     <bean id="ResolveAttributes"
           class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
           c:resolverService-ref="shibboleth.AttributeResolverService"
-          p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
           p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="FilterAttributes"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index fcb1eba48..e1cc5dbf3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -210,7 +210,6 @@
 
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
         c:resolverService-ref="shibboleth.AttributeResolverService"
-        p:transcoderRegistry-ref="shibboleth.AttributeRegistryService"
         p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" scope="prototype"
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 7cb22c1a1..f4bb5ba4e 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -35,7 +35,6 @@ import net.shibboleth.idp.attribute.context.AttributeContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
 import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFunction;
 import net.shibboleth.idp.profile.AbstractProfileAction;
@@ -44,7 +43,6 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.profile.context.SpringRequestContext;
 import net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction;
 import net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -68,9 +66,6 @@ public final class ResolveAttributes extends AbstractProfileAction {
     /** Service used to get the resolver used to fetch attributes. */
     @Nonnull private final ReloadableService<AttributeResolver> attributeResolverService;
 
-    /** Transcoder registry service object. */
-    @NonnullAfterInit private ReloadableService<AttributeTranscoderRegistry> transcoderRegistry;
-    
     /** Strategy used to locate the identity of the issuer associated with the attribute resolution. */
     @Nullable private Function<ProfileRequestContext,String> issuerLookupStrategy;
 
@@ -123,16 +118,6 @@ public final class ResolveAttributes extends AbstractProfileAction {
         createResolutionContext = true;
     }
 
-    /**
-     * Sets the registry of transcoding rules to apply to supply attribute display metadata.
-     * 
-     * @param registry registry service interface
-     */
-    public void setTranscoderRegistry(@Nullable final ReloadableService<AttributeTranscoderRegistry> registry) {
-        checkSetterPreconditions();
-        transcoderRegistry = registry;
-    }
-    
     /**
      * Set the strategy used to lookup the issuer for this attribute resolution.
      * 
@@ -319,9 +304,7 @@ public final class ResolveAttributes extends AbstractProfileAction {
     private void populateResolutionContext(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AttributeResolutionContext resolutionContext) {
 
-        resolutionContext
-            .setResolutionLabel(resolutionLabel)
-            .setTranscoderRegistry(transcoderRegistry);
+        resolutionContext.setResolutionLabel(resolutionLabel);
         
         // Populate requested attributes, if not already set.
         if (resolutionContext.getRequestedIdPAttributeNames() == null

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