[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCre...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Oct 21 22:54:54 2015
New Revision: 7852

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7852&view=rev
Log:
Update IdP signing credentials resolver to extend abstract base class to support predicate-based filtering.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java?rev=7852&r1=7851&r2=7852&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	Wed Oct 21 22:54:54 2015
@@ -32,14 +32,15 @@
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
 import org.opensaml.security.credential.Credential;
-import org.opensaml.security.credential.CredentialResolver;
+import org.opensaml.security.credential.impl.AbstractCriteriaFilteringCredentialResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Credential resolver whose purpose is to resolve all the configured signing credentials.
+ * Credential resolver whose purpose is to resolve configured IdP signing credentials.
  */
-public class SigningCredentialsResolver implements CredentialResolver, IdentifiableComponent {
+public class SigningCredentialsResolver extends AbstractCriteriaFilteringCredentialResolver 
+        implements IdentifiableComponent {
     
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(SigningCredentialsResolver.class);
@@ -81,7 +82,8 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull public Iterable<Credential> resolve(@Nullable final CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteria) 
+            throws ResolverException {
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;
         try {
             component = service.getServiceableComponent();