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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb  5 14:03:28 2014
New Revision: 3595

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3595&view=rev
Log:
Simplified constructors

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java?rev=3595&r1=3594&r2=3595&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Decrypter.java Wed Feb  5 14:03:28 2014
@@ -17,6 +17,10 @@
 
 package org.opensaml.saml.saml2.encryption;
 
+import javax.annotation.Nonnull;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.saml2.core.Assertion;
@@ -27,6 +31,7 @@
 import org.opensaml.saml.saml2.core.EncryptedID;
 import org.opensaml.saml.saml2.core.NewEncryptedID;
 import org.opensaml.saml.saml2.core.NewID;
+import org.opensaml.xmlsec.DecryptionConfiguration;
 import org.opensaml.xmlsec.encryption.support.DecryptionException;
 import org.opensaml.xmlsec.encryption.support.EncryptedKeyResolver;
 import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
@@ -45,6 +50,15 @@
     
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(Decrypter.class);
+    
+    /**
+     * Constructor.
+     *
+     * @param decryptionConfig  source of configuration material for decryption
+     */
+    public Decrypter(@Nonnull final DecryptionConfiguration decryptionConfig) {
+        super(Constraint.isNotNull(decryptionConfig, "DecryptionConfiguration cannot be null"));
+    }
     
     /**
      * Constructor.

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java?rev=3595&r1=3594&r2=3595&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java Wed Feb  5 14:03:28 2014
@@ -55,6 +55,7 @@
 import org.opensaml.security.criteria.KeyAlgorithmCriterion;
 import org.opensaml.security.criteria.KeyLengthCriterion;
 import org.opensaml.security.criteria.UsageCriterion;
+import org.opensaml.xmlsec.DecryptionConfiguration;
 import org.opensaml.xmlsec.crypto.AlgorithmSupport;
 import org.opensaml.xmlsec.encryption.EncryptedData;
 import org.opensaml.xmlsec.encryption.EncryptedKey;
@@ -215,7 +216,17 @@
      * root of a new DOM document. */
     private boolean defaultRootInNewDocument;
     
-
+    /**
+     * Constructor.
+     *
+     * @param decryptionConfig  source of configuration material for decryption
+     */
+    public Decrypter(@Nonnull final DecryptionConfiguration decryptionConfig) {
+        this(decryptionConfig.getDataKeyInfoCredentialResolver(), decryptionConfig.getKEKKeyInfoCredentialResolver(),
+                decryptionConfig.getEncryptedKeyResolver());
+        // TODO incorporate algorithm lists
+    }
+    
     /**
      * Constructor.
      *