[java-opensaml COMMIT] in /trunk/opensaml-security-impl/src/main/java/org/opensaml/security: trust/impl/ChainingTrust...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 28 16:42:28 2012
New Revision: 3114

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3114&view=rev
Log:
Annotations and constraints.

Added:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/package-info.java   (with props)
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/package-info.java   (with props)
Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ChainingTrustEngine.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEvaluator.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngine.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEvaluator.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicPKIXValidationInformation.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluator.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/CertPathPKIXValidationOptions.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/KeyStoreX509CredentialAdapter.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngine.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/StaticPKIXValidationInformationResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509CredentialNameEvaluator.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/X509KeyManagerX509CredentialAdapter.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ChainingTrustEngine.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ChainingTrustEngine.java?rev=3114&r1=3113&r2=3114&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ChainingTrustEngine.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ChainingTrustEngine.java Fri Dec 28 16:42:28 2012
@@ -19,6 +19,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
@@ -51,12 +54,13 @@
      * 
      * @return the modifiable list of trust engines in the chain
      */
-    public List<TrustEngine<TokenType>> getChain() {
+    @Nonnull public List<TrustEngine<TokenType>> getChain() {
         return engines;
     }
 
     /** {@inheritDoc} */
-    public boolean validate(TokenType token, CriteriaSet trustBasisCriteria) throws SecurityException {
+    public boolean validate(@Nonnull final TokenType token, @Nullable final CriteriaSet trustBasisCriteria)
+            throws SecurityException {
         for (TrustEngine<TokenType> engine : engines) {
             if (engine.validate(token, trustBasisCriteria)) {
                 log.debug("Token was trusted by chain member: {}", engine.getClass().getName());
@@ -66,4 +70,4 @@
         return false;
     }
 
-}
+}

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java?rev=3114&r1=3113&r2=3114&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngine.java Fri Dec 28 16:42:28 2012
@@ -17,6 +17,10 @@
 
 package org.opensaml.security.trust.impl;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -40,64 +44,42 @@
     private final Logger log = LoggerFactory.getLogger(ExplicitKeyTrustEngine.class);
 
     /** Resolver used for resolving trusted credentials. */
-    private CredentialResolver credentialResolver;
+    private final CredentialResolver credentialResolver;
 
     /** Trust evaluator. */
-    private ExplicitKeyTrustEvaluator trustEvaluator;
+    private final ExplicitKeyTrustEvaluator trustEvaluator;
 
     /**
      * Constructor.
      * 

[... 1409 lines stripped ...]