[java-identity-provider] branch master updated: IDP-1192 Deprecate references in the Attribute Filter language

[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=ef7a1450af593a63e2e7a560c3d712b26e7a0e49

The following commit(s) were added to refs/heads/master by this push:
       new  ef7a145   IDP-1192 Deprecate references in the Attribute Filter language
ef7a145 is described below

commit ef7a1450af593a63e2e7a560c3d712b26e7a0e49
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 15 13:51:20 2017 +0100

    IDP-1192 Deprecate references in the Attribute Filter language
    
    https://issues.shibboleth.net/jira/browse/IDP-1192
    
    PolicyRequirementRuleReference
    AttributeRuleReference
    PermitValueRuleReference
    DenyValueRuleReference
---
 .../filter/spring/impl/AttributeFilterPolicyParser.java       | 11 +++++++++--
 .../idp/attribute/filter/spring/impl/AttributeRuleParser.java | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
index 87b3854..4801db9 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
@@ -25,6 +25,8 @@ import javax.xml.namespace.QName;
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
 import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
@@ -51,14 +53,14 @@ public class AttributeFilterPolicyParser extends BaseFilterParser {
             "AttributeFilterPolicyType");
 
     /** The PolicyRequirementRuleReference QName. */
-    public static final QName POLICY_REQUIREMENT_RULE_REF = new QName(BaseFilterParser.NAMESPACE,
+    @Deprecated public static final QName POLICY_REQUIREMENT_RULE_REF = new QName(BaseFilterParser.NAMESPACE,
             "PolicyRequirementRuleReference");
 
     /** The AttributeRule QName. */
     private static final QName ATTRIBUTE_RULE = new QName(BaseFilterParser.NAMESPACE, "AttributeRule");
 
     /** The AttributeRuleReference QName. */
-    private static final QName ATTRIBUTE_RULE_REF = new QName(BaseFilterParser.NAMESPACE,
+    @Deprecated private static final QName ATTRIBUTE_RULE_REF = new QName(BaseFilterParser.NAMESPACE,
             "AttributeRuleReference");
 
     /** Class logger. */
@@ -95,6 +97,8 @@ public class AttributeFilterPolicyParser extends BaseFilterParser {
             final List<Element> policyRequirementsRef =
                     ElementSupport.getChildElements(config, POLICY_REQUIREMENT_RULE_REF);
             if (policyRequirementsRef != null && policyRequirementsRef.size() > 0) {
+                    DeprecationSupport.warnOnce(ObjectType.ELEMENT, POLICY_REQUIREMENT_RULE.toString(),
+                        parserContext.getReaderContext().getResource().getDescription(),  null);
 
                 final String referenceText = getReferenceText(policyRequirementsRef.get(0));
                 if (null == referenceText) {
@@ -120,6 +124,9 @@ public class AttributeFilterPolicyParser extends BaseFilterParser {
 
         final List<Element> rulesRef = ElementSupport.getChildElements(config, ATTRIBUTE_RULE_REF);
         if (rulesRef != null && rulesRef.size() > 0) {
+            DeprecationSupport.warnOnce(ObjectType.ELEMENT, ATTRIBUTE_RULE_REF.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(),  null);
+            
             for (final Element ruleRef : rulesRef) {
                 final String reference = getAbsoluteReference(config, "AttributeRule", getReferenceText(ruleRef));
                 attributeRules.add(new RuntimeBeanReference(reference));
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 1a28a20..f0bf9fa 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
@@ -27,6 +27,8 @@ import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.filter.AttributeRule;
 import net.shibboleth.idp.attribute.filter.Matcher;
 import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -53,11 +55,11 @@ public class AttributeRuleParser extends BaseFilterParser {
     public static final QName TYPE_NAME = new QName(BaseFilterParser.NAMESPACE, "AttributeRuleType");
 
     /** PermitValueRuleReference. */
-    public static final QName PERMIT_VALUE_REF = new QName(BaseFilterParser.NAMESPACE,
+    @Deprecated public static final QName PERMIT_VALUE_REF = new QName(BaseFilterParser.NAMESPACE,
             "PermitValueRuleReference");
 
     /** DenyValueRuleReference. */
-    public static final QName DENY_VALUE_REF = new QName(BaseFilterParser.NAMESPACE,
+    @Deprecated public static final QName DENY_VALUE_REF = new QName(BaseFilterParser.NAMESPACE,
             "DenyValueRuleReference");
 
     /** permitAny Attribute. */
@@ -99,6 +101,8 @@ public class AttributeRuleParser extends BaseFilterParser {
             builder.addPropertyValue("isDenyRule", false);
 
         } else if (permitValueReference != null && !permitValueReference.isEmpty()) {
+            DeprecationSupport.warnOnce(ObjectType.ELEMENT, PERMIT_VALUE_REF.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(),  null);
 
             final String referenceText = getReferenceText(permitValueReference.get(0));
             if (null == referenceText) {
@@ -112,6 +116,8 @@ 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);

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