[java-identity-provider] branch master updated: IDP-680 - Deprecate Dependency

[Scott Cantor]

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  7a09dc4   IDP-680 - Deprecate Dependency
7a09dc4 is described below

commit 7a09dc4f4341fcbe67f50b45d60edb6b1386d5b7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 20 13:46:02 2018 -0400

    IDP-680 - Deprecate Dependency
    
    https://issues.shibboleth.net/jira/browse/IDP-680
    
    Guard deprecation warning.
---
 .../resolver/spring/ResolverPluginDependencyParser.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyParser.java
index aae8cd5..0ce7933 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyParser.java
@@ -55,10 +55,12 @@ public class ResolverPluginDependencyParser extends AbstractSingleBeanDefinition
     @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
 
-        DeprecationSupport.warnOnce(ObjectType.ELEMENT, ELEMENT_NAME.toString(),
-                parserContext.getReaderContext().getResource().getDescription(),
-                InputDataConnectorParser.ELEMENT_NAME.toString()  + " or "
-                        + InputAttributeDefinitionParser.ELEMENT_NAME.toString());
+        if (ELEMENT_NAME.getLocalPart().equals(config.getLocalName())) {
+            DeprecationSupport.warnOnce(ObjectType.ELEMENT, ELEMENT_NAME.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(),
+                    InputDataConnectorParser.ELEMENT_NAME.toString()  + " or "
+                            + InputAttributeDefinitionParser.ELEMENT_NAME.toString());
+        }
         
         final String pluginId = StringSupport.trimOrNull(config.getAttributeNS(null, "ref"));
         log.info("Parsing configuration for {} with pluginId: {}", config.getLocalName(), pluginId);

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