[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElement...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed May 28 18:59:38 2014
New Revision: 3897

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3897&view=rev
Log:
Update ChainingCredentialResolver and ChainingEncryptedKeyResolver to be more Spring-friendly, with constructor injection of chain.
For all EncryptedKeyResolver impls, do same by having recipients set supplied via constructor injection.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
    trunk/opensaml-saml-impl/src/test/resources/logback-test.xml
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/ChainingCredentialResolver.java
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/credential/impl/ChainingCredentialResolverTest.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/DefaultSecurityConfigurationBootstrap.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/ChainingEncryptedKeyResolverTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolverTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolverTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolverTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolver.java?rev=3897&r1=3896&r2=3897&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolver.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolver.java Wed May 28 18:59:38 2014
@@ -19,6 +19,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nullable;
 
 import org.opensaml.saml.saml2.core.EncryptedElementType;
 import org.opensaml.xmlsec.encryption.EncryptedData;
@@ -32,6 +35,19 @@
  * is the parent of the {@link EncryptedData} context.
  */
 public class EncryptedElementTypeEncryptedKeyResolver extends AbstractEncryptedKeyResolver {
+    
+    /** Constructor. */
+    public EncryptedElementTypeEncryptedKeyResolver() {
+        super();
+    }
+
+    /** Constructor. 
+     * 
+     * @param recipients the set of recipients
+     */
+    public EncryptedElementTypeEncryptedKeyResolver(@Nullable final Set<String> recipients) {
+        super(recipients);
+    }
 
     /** {@inheritDoc} */
     public Iterable<EncryptedKey> resolve(EncryptedData encryptedData) {

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java?rev=3897&r1=3896&r2=3897&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/EncryptedElementTypeEncryptedKeyResolverTest.java Wed May 28 18:59:38 2014
@@ -30,6 +30,8 @@
 import org.opensaml.xmlsec.encryption.EncryptedKey;
 import org.opensaml.xmlsec.encryption.support.EncryptedKeyResolver;
 
+import com.google.common.collect.Sets;
+
 /**
  * Test the SAML EncryptedElementType encrypted key resolver, with keys as peers.
  */
@@ -37,16 +39,31 @@
     
     /** The resolver instance to be tested. */
     private EncryptedElementTypeEncryptedKeyResolver resolver;
-    
-    /** {@inheritDoc} */
-    @BeforeMethod
-    protected void setUp() throws Exception {
+

[... 1073 lines stripped ...]