[java-shib-attribute] 05/06: JSATTR-5 Remove deprecations

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=4f950194b5c252052075a31296bca341c106522a

commit 4f950194b5c252052075a31296bca341c106522a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 23 16:39:39 2022 +0000

    JSATTR-5 Remove deprecations
    
    https://shibboleth.atlassian.net/browse/JSATTR-5
    
    Attribute contextStrategyRef no longer honoured.  Remove it.
---
 .../filter/spring/policyrule/impl/PredicateRuleParser.java  |  6 ------
 .../src/main/resources/schema/shibboleth-afp.xsd            | 13 +++----------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
index d68014fcd..5843a1efb 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
@@ -27,9 +27,7 @@ import org.w3c.dom.Element;
 import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PredicatePolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser;
-import net.shibboleth.shared.primitive.DeprecationSupport;
 import net.shibboleth.shared.xml.AttributeSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
 
 /**
  * Bean definition parser for {@link PredicatePolicyRule}.
@@ -50,10 +48,6 @@ public class PredicateRuleParser extends BasePolicyRuleParser {
 
         builder.addPropertyReference("rulePredicate",
                 AttributeSupport.getRequiredAttributeValue(element, null, "rulePredicateRef"));
-        if (element.hasAttributeNS(null, "contextStrategyRef")) {
-            DeprecationSupport.warn(ObjectType.ATTRIBUTE, "contextStrategyRef",
-                    parserContext.getReaderContext().getResource().getDescription(), "(removed)");
-        }
     }
 
 }
\ No newline at end of file
diff --git a/shib-attribute-filter-spring/src/main/resources/schema/shibboleth-afp.xsd b/shib-attribute-filter-spring/src/main/resources/schema/shibboleth-afp.xsd
index a2fe84a8a..061c38fe3 100644
--- a/shib-attribute-filter-spring/src/main/resources/schema/shibboleth-afp.xsd
+++ b/shib-attribute-filter-spring/src/main/resources/schema/shibboleth-afp.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
         xmlns:afp="urn:mace:shibboleth:2.0:afp"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
         targetNamespace="urn:mace:shibboleth:2.0:afp"
-        version="4.2.0"
+        version="5.0.0"
         elementFormDefault="qualified">
 
     <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
@@ -299,13 +299,6 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="contextStrategyRef" type="afp:string">
-                    <annotation>
-                        <documentation>
-                            DEPRECATED: The reference to an externally define bean to lookup the context
-                        </documentation>
-                    </annotation>
-                </attribute>
             </extension>
         </complexContent>
     </complexType>

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