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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug  4 10:35:34 2014
New Revision: 6383

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6383&view=rev
Log:
IDP-451 Allow AttributeFilterPolicy to be anonymous (although it makes the logging very ugly).

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyParser.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.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=6383&r1=6382&r2=6383&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 Mon Aug  4 10:35:34 2014
@@ -68,17 +68,22 @@
     private Logger log = LoggerFactory.getLogger(AttributeFilterPolicyParser.class);
 
     /** {@inheritDoc} */
+    @Override
     protected Class<?> getBeanClass(Element arg0) {
         return AttributeFilterPolicy.class;
     }
 
     /** {@inheritDoc} */
  // Checkstyle: CyclomaticComplexity OFF
+    @Override
     protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
-        final String policyId = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
+        String policyId = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
+        if (null == policyId) {
+            policyId =  builder.getBeanDefinition().getAttribute("qualifiedId").toString();
+        }
         log.info("Parsing configuration for attribute filter policy {}", policyId);
         builder.addConstructorArgValue(policyId);
 

Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml?rev=6383&r1=6382&r2=6383&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml (original)
+++ trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml Mon Aug  4 10:35:34 2014
@@ -7,7 +7,7 @@
                             urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
 
     <!-- Release affiliation to anyone in the InCommon group -->
-    <afp:AttributeFilterPolicy id="InCommonRelease">
+    <afp:AttributeFilterPolicy >
         <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
         
         <afp:AttributeRule attributeID="affiliation">