[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun 26 13:30:29 2013
New Revision: 4541

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4541&view=rev
Log:
IDP-209 Start on wiring up the Attribute filters.  Some code rationalization.  Centralize the answer to the (as yet) open question about references.

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AnyMatcher.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterService.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeRuleParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/MatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyMatcherParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/service.xml

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java?rev=4541&r1=4540&r2=4541&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java Wed Jun 26 13:30:29 2013
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.attribute.filter.spring;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.xml.namespace.QName;
 
@@ -29,15 +28,14 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-// TODO incomplete v2 port
 /** Bean definition parser for an {@link AttributeFilterPolicy}. */
 public class AttributeFilterPolicyParser extends BaseFilterParser {
 
@@ -49,8 +47,23 @@
     public static final QName TYPE_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
             "AttributeFilterPolicyType");
 
+    /** The PolicyRequirementRule QName. */
+    private static final QName POLICY_REQUIREMENT_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+            "PolicyRequirementRule");
+
+    /** The PolicyRequirementRuleReference QName. */
+    private static final QName POLICY_REQUIREMENT_RULE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+            "PolicyRequirementRuleReference");
+
+    /** The AttributeRule QName. */
+    private static final QName ATTRIBUTE_RULE = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRule");
+
+    /** The AttributeRuleReference QName. */
+    private static final QName ATTRIBUTE_RULE_REF = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+            "AttributeRuleReference");
+
     /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(AttributeFilterPolicyParser.class);
+    private Logger log = LoggerFactory.getLogger(AttributeFilterPolicyParser.class);
 
     /** {@inheritDoc} */
     protected Class getBeanClass(Element arg0) {
@@ -58,65 +71,52 @@
     }
 
     /** {@inheritDoc} */
-    protected String
-            resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        if (!configElement.hasAttributeNS(null, "id")) {
-            log.warn("AttributeFilterPolicy elements should include an 'id' attribute."
-                    + "  This is not currently required but will be in future versions.");
-        }
-        return getQualifiedId(configElement, configElement.getLocalName(), configElement.getAttributeNS(null, "id"));
-    }
-
-    /** {@inheritDoc} */
     protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {

[... 519 lines stripped ...]