[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: Thu Jun 20 11:10:16 2013
New Revision: 4537

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4537&view=rev
Log:
IDP-209  Cleanup over spring code.  Shut up (much of) checkstyle's whines.  Add appropriate logging of tests

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/package-info.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/package-info.java   (with props)
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/package-info.java   (with props)
Modified:
    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/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/test/resources/logback-test.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=4537&r1=4536&r2=4537&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 Thu Jun 20 11:10:16 2013
@@ -61,7 +61,8 @@
     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.");
+            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"));
     }
@@ -76,27 +77,27 @@
         // TODO remove debug logging
         log.debug("add constructor arg-value 0 '{}'", policyId);
         builder.addConstructorArgValue(policyId);
-        
+
         List<Element> children;
         Map<QName, List<Element>> childrenMap = ElementSupport.getIndexedChildElements(config);
 
         children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "PolicyRequirementRule"));
         if (children != null && children.size() > 0) {
-            // TODO Lists.newArrayList ?
-            // builder.addPropertyValue("policyRequirement",
-            //        SpringSupport.parseCustomElements(Lists.newArrayList(children.get(0)), parserContext));
-            // builder.addConstructorArgValue(SpringSupport.parseCustomElements(Lists.newArrayList(children.get(0)), parserContext));
+            /*
+             * TODO Lists.newArrayList ? builder.addPropertyValue("policyRequirement",
+             * SpringSupport.parseCustomElements(Lists.newArrayList(children.get(0)), parserContext));
+             * builder.addConstructorArgValue( SpringSupport.parseCustomElements(Lists.newArrayList(children.get(0)),
+             * parserContext));
+             */
             ManagedList<BeanDefinition> foo = SpringSupport.parseCustomElements(children, parserContext);
             log.debug("add constructor arg-value 1 '{}'", foo.get(0));
             builder.addConstructorArgValue(foo.get(0));
-        } else {
-            children =
-                    childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-                            "PolicyRequirementRuleReference"));
-            String reference = getAbsoluteReference(config, "PolicyRequirementRule", children.get(0).getTextContent());
-            // builder.addPropertyReference("policyRequirement", reference);
-            // TODO incomplete
-        }
+        } /*
+           * else { children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
+           * "PolicyRequirementRuleReference")); String reference = getAbsoluteReference(config,
+           * "PolicyRequirementRule", children.get(0).getTextContent()); //
+           * builder.addPropertyReference("policyRequirement", reference); // TODO incomplete }
+           */
 
         ManagedList attributeRules = new ManagedList();
         children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRule"));


[... 125 lines stripped ...]