[java-opensaml COMMIT] in /trunk/opensaml-security-api/src/main/java/org/opensaml/security: credential/AbstractCreden...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 26 17:16:13 2012
New Revision: 3104

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3104&view=rev
Log:
Warnings, annotations, port over fix for JXT-93.

Added:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/package-info.java
      - copied, changed from r3103, trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/package.html
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/package-info.java   (with props)
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/trust/package-info.java
      - copied, changed from r3103, trunk/opensaml-security-api/src/main/java/org/opensaml/security/trust/package.html
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509DigestCriterion.java   (with props)
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/package-info.java   (with props)
Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/EntityIDCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyAlgorithmCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyLengthCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/KeyNameCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PublicKeyCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/UsageCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/package.html
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/SigningUtil.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/trust/TrustEngine.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/trust/TrustedCredentialTrustEngine.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/trust/package.html
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/BasicX509Credential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/InternalX500DNHandler.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformation.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationInformationResolver.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXValidationOptions.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X500DNHandler.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Credential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509IssuerSerialCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectKeyIdentifierCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509SubjectNameCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/package.html

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java?rev=3104&r1=3103&r2=3104&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java Wed Dec 26 17:16:13 2012
@@ -134,8 +134,9 @@
      * 
      * @param newPrivateKey private key for this credential
      */
-    protected void setPrivateKey(@Nullable final PrivateKey newPrivateKey) {
+    protected void setPrivateKey(@Nonnull final PrivateKey newPrivateKey) {
         Constraint.isNull(getSecretKey(), "A credential with a secret key cannot contain a private key");
+        Constraint.isNotNull(newPrivateKey, "Credential private key cannot be null");
         privateKey = newPrivateKey;
     }
 

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java?rev=3104&r1=3103&r2=3104&view=diff

[... 2051 lines stripped ...]