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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 18 11:37:56 2013
New Revision: 4340

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4340&view=rev
Log:
Add some todos around throwing and catching or RuntimeExceptions inside the filtering code.

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4340&r1=4339&r2=4340&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Mon Mar 18 11:37:56 2013
@@ -143,7 +143,7 @@
         try {
             isActive = activationCriteria.apply(filterContext);
         } catch (RuntimeException e) {
-            // TODO deal with this.
+            // TODO deal with this. It is pig ugly.
             throw new AttributeFilteringException(e);
         }
         if (isActive) {

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java?rev=4340&r1=4339&r2=4340&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/ScriptedMatcher.java Mon Mar 18 11:37:56 2013
@@ -111,6 +111,7 @@
         try {
             final Optional<Object> optionalResult = currentScript.eval(scriptContext);
             if (!optionalResult.isPresent()) {
+                //TODO
                 throw new IllegalArgumentException("Matcher script did not return a result");
             }
 
@@ -118,9 +119,11 @@
             if (result instanceof Boolean) {
                 return ((Boolean) result).booleanValue();
             } else {
+                //TODO
                 throw new IllegalArgumentException("Matcher script did not return a Collection");
             }
         } catch (ScriptException e) {
+            //TODO
             throw new IllegalArgumentException("Error while executing value matching script", e);
         }
     }