[java-identity-provider] branch master updated: IDP-1347 Move deprecation warning from <DenyValueRule>

[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=03735d9b773bf2ce0991e455f17902f5d3ae7328

The following commit(s) were added to refs/heads/master by this push:
       new  03735d9   IDP-1347 Move deprecation warning from <DenyValueRule>
03735d9 is described below

commit 03735d9b773bf2ce0991e455f17902f5d3ae7328
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 15 19:32:30 2018 +0100

    IDP-1347 Move deprecation warning from <DenyValueRule>
    
    https://issues.shibboleth.net/jira/browse/IDP-1347
    
    The <DenyValueRuleReference /> warning was on the
    <DenyValueRUle> leg.
---
 .../idp/attribute/filter/spring/impl/AttributeRuleParser.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeRuleParser.java
index f0bf9fa..57d45bf 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeRuleParser.java
@@ -116,8 +116,6 @@ public class AttributeRuleParser extends BaseFilterParser {
             builder.addPropertyValue("isDenyRule", false);
 
         } else if (denyValueRule != null && !denyValueRule.isEmpty()) {
-            DeprecationSupport.warnOnce(ObjectType.ELEMENT, DENY_VALUE_REF.toString(),
-                    parserContext.getReaderContext().getResource().getDescription(),  null);
 
             final ManagedList<BeanDefinition> denyValueRules =
                     SpringSupport.parseCustomElements(denyValueRule, parserContext);
@@ -126,6 +124,8 @@ public class AttributeRuleParser extends BaseFilterParser {
             builder.addPropertyValue("isDenyRule", true);
 
         } else if (denyValueReference != null && !denyValueReference.isEmpty()) {
+            DeprecationSupport.warnOnce(ObjectType.ELEMENT, DENY_VALUE_REF.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(),  null);
 
             final String referenceText = getReferenceText(denyValueReference.get(0));
             if (null == referenceText) {

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