[java-identity-provider] 04/07: IDP-1361 Deprecate PrincipalAuthenticationMethod Attribute Defn

[Rod Widdowson]

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

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

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

commit 85ef3a26ccfb4fd2424229e0fee1bd1378c620d5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 21 10:22:52 2018 +0000

    IDP-1361 Deprecate PrincipalAuthenticationMethod Attribute Defn
    
    https://issues.shibboleth.net/jira/browse/IDP-1361
---
 ...cipalAuthenticationMethodAttributeDefinitionParser.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
index 45dd9cd..be4e90e 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
@@ -22,7 +22,11 @@ import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.attribute.resolver.ad.impl.PrincipalAuthenticationMethodAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 /** Spring Bean Definition Parser for PrincipalAuthenticationMethod. */
@@ -42,9 +46,15 @@ public class PrincipalAuthenticationMethodAttributeDefinitionParser extends Abst
     }
     
     /** {@inheritDoc} */
-    @Override
-    @Nonnull protected QName getPreferredName() {
+    @Override @Nonnull protected QName getPreferredName() {
         return TYPE_NAME_RESOLVER;
     }
 
+    @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
+            @Nonnull final BeanDefinitionBuilder builder) {
+        DeprecationSupport.warnOnce(ObjectType.ELEMENT, "PrincipalAuthenticationMethod",
+                parserContext.getReaderContext().getResource().getDescription(), null);
+        super.doParse(config, parserContext, builder);
+    }
+
 }
\ No newline at end of file

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