[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: Tue Jan  7 06:23:36 2014
New Revision: 5159

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5159&view=rev
Log:
IDP-350 After a year, the temporary "Attribute Recipient Context" is no more.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NavigationSupport.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeRecipientContext.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/FormatExecutableStatementBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/TemplatedExecutableStatementBuilder.java
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java?rev=5159&r1=5158&r2=5159&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java Tue Jan  7 06:23:36 2014
@@ -21,7 +21,6 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.context.AttributeRecipientContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -129,17 +128,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public ExecutableSearchFilter build(@Nonnull final AttributeResolutionContext resolutionContext)
             throws ResolutionException {
 
         final VelocityContext context = new VelocityContext();
         log.trace("Creating search filter using attribute resolution context {}", resolutionContext);
         context.put("resolutionContext", resolutionContext);
-
-        final AttributeRecipientContext recipientContext =
-                resolutionContext.getSubcontext(AttributeRecipientContext.class);
-        log.trace("Creating search filter using attribute recipient context {}", recipientContext);
-        context.put("recipientContext", recipientContext);
 
         if (isV2Compatibility()) {
             final V2SAMLProfileRequestContext requestContext =
@@ -181,6 +176,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
 

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/FormatExecutableStatementBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/FormatExecutableStatementBuilder.java?rev=5159&r1=5158&r2=5159&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/FormatExecutableStatementBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/FormatExecutableStatementBuilder.java Tue Jan  7 06:23:36 2014
@@ -19,7 +19,6 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.attribute.resolver.context.AttributeRecipientContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -54,9 +53,9 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected String getSQLQuery(AttributeResolutionContext resolutionContext) {
-        final AttributeRecipientContext subContext = resolutionContext.getSubcontext(AttributeRecipientContext.class);
-        final String query = String.format(sqlQuery, subContext);
+        final String query = String.format(sqlQuery, resolutionContext);
         return query;
     }
 

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/TemplatedExecutableStatementBuilder.java

[... 74 lines stripped ...]