[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: Tue Jun 24 07:55:35 2014
New Revision: 6159

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6159&view=rev
Log:
End to end testing.  Its attributeID not attributeId.

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueId.xml

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java?rev=6159&r1=6158&r2=6159&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java Tue Jun 24 07:55:35 2014
@@ -53,16 +53,19 @@
  * </table>
  */
 public abstract class BaseAttributeValueMatcherParser extends BaseFilterParser {
+    
+    /** ATTRIBUTE ID string. */
+    public static final String ATTRIBUTE_ID = "attributeID";
 
     /**
      * Helper function to determine if the Attribute Matcher has the attribute Id Specified. This influences decisions
-     * bioth in parsing and in which bean to summon.
+     * both in parsing and in which bean to summon.
      * 
      * @param configElement the config element to inspect
      * @return whether here is a an attribute Id
      */
     protected boolean hasAttributeId(@Nonnull final Element configElement) {
-        return configElement.hasAttributeNS(null, "attributeId");
+        return configElement.hasAttributeNS(null, ATTRIBUTE_ID);
     }
 
     /** {@inheritDoc} The table at the top describes the precise work. */
@@ -104,7 +107,7 @@
 
             builder.addConstructorArgValue(childBuilder.getBeanDefinition());
             if (hasAttributeId(element)) {
-                builder.addConstructorArgValue(element.getAttributeNS(null, "attributeId"));
+                builder.addConstructorArgValue(element.getAttributeNS(null, ATTRIBUTE_ID));
             }
         } else if (hasAttributeId(element)) {
             // Bean inside PolicyFromMatcherId inside MatcherFromPolicy
@@ -121,7 +124,7 @@
 
             childBuilder.addPropertyValue("id", "MfP:" + myId);
             childBuilder.addConstructorArgValue(grandChildBuilder.getBeanDefinition());
-            childBuilder.addConstructorArgValue(element.getAttributeNS(null, "attributeId"));
+            childBuilder.addConstructorArgValue(element.getAttributeNS(null, ATTRIBUTE_ID));
 
             builder.addConstructorArgValue(childBuilder.getBeanDefinition());
 

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java?rev=6159&r1=6158&r2=6159&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java Tue Jun 24 07:55:35 2014
@@ -21,6 +21,7 @@
 
 import net.shibboleth.idp.attribute.filter.MatcherFromPolicy;
 import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
+import net.shibboleth.idp.attribute.filter.spring.matcher.BaseAttributeValueMatcherParser;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -50,7 +51,7 @@
      * @return whether here is a an attribute Id
      */
     protected boolean hasAttributeId(@Nonnull final Element configElement) {
-        return configElement.hasAttributeNS(null, "attributeId");
+        return configElement.hasAttributeNS(null, BaseAttributeValueMatcherParser.ATTRIBUTE_ID);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml

[... 25 lines stripped ...]