[java-identity-provider] branch master updated: IDP-1361 Flag c14n/LegacyPrincipalConnector as deprecated

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  8d48244   IDP-1361 Flag c14n/LegacyPrincipalConnector as deprecated
8d48244 is described below

commit 8d4824407c648c350614f6e44a72608c2a3986c8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 15 07:23:28 2018 -0500

    IDP-1361 Flag c14n/LegacyPrincipalConnector as deprecated
    
    https://issues.shibboleth.net/jira/browse/IDP-1361
    
    Channel the bean definition through a factory with a deprecation
    warning it it.  Make the bean itself lazy init so the warning
    only fires if the bean is declared by the user.
---
 .../src/main/resources/system/conf/subject-c14n-system.xml   |  7 ++++---
 .../idp/saml/nameid/impl/LegacyCanonicalization.java         | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml b/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
index 45d90f6..f246f4f 100644
--- a/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
+++ b/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
@@ -29,11 +29,12 @@
         </property>
     </bean>
 
-    <bean id="c14n/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
-        <property name="activationCondition">
+    <bean id="c14n/LegacyPrincipalConnector" class="net.shibboleth.idp.saml.nameid.impl.LegacyCanonicalization"
+          lazy-init="true" factory-method="c14LegacyPrincipalConnectorFactory">
+        <constructor-arg  name="activationCondition">
             <bean class="net.shibboleth.idp.saml.nameid.impl.LegacyCanonicalization.ActivationCondition" 
                 c:service-ref="shibboleth.AttributeResolverService"/>
-        </property>
+        </constructor-arg>
     </bean>
 
     <bean id="shibboleth.AbstractSAML1C14NFlowBean" abstract="true"
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
index b25c299..2ef4e05 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
@@ -36,11 +36,14 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.authn.AbstractSubjectCanonicalizationAction;
 import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.SubjectCanonicalizationException;
+import net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
 import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
 import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
@@ -116,6 +119,15 @@ public class LegacyCanonicalization extends AbstractSubjectCanonicalizationActio
     }
 //CheckStyle: ReturnCount ON
     
+    public static SubjectCanonicalizationFlowDescriptor c14LegacyPrincipalConnectorFactory(
+                @ParameterName(name="activationCondition") Predicate<ProfileRequestContext> activationCondition)
+    {
+        DeprecationSupport.warn(ObjectType.BEAN, "c14n/LegacyPrincipalConnector", "c14n/subject-c14n.xml", "<remove>");
+        final SubjectCanonicalizationFlowDescriptor result = new SubjectCanonicalizationFlowDescriptor ();
+        result.setActivationCondition(activationCondition);
+        return result;
+    }
+
     /**
      * A predicate that determines if this action can run or not - it does this by inspecting the attribute resolver for
      * principal connectors.

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