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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 26 23:18:24 2012
New Revision: 3107

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

Added:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/package-info.java
      - copied, changed from r3101, trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/package.html
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/package-info.java   (with props)
Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyAlgorithmCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyLengthCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableKeyNameCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluablePublicKeyCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableUsageCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509CertSelectorCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509IssuerSerialCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectKeyIdentifierCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableX509SubjectNameCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/package.html
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/AbstractCriteriaFilteringCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/ChainingCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/CollectionCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/FilesystemCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/StaticCredentialResolver.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java?rev=3107&r1=3106&r2=3107&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableCredentialCriteriaRegistry.java Wed Dec 26 23:18:24 2012
@@ -25,23 +25,26 @@
 import java.util.Map;
 import java.util.Properties;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.security.SecurityException;
-import org.opensaml.security.credential.Credential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A registry which manages mappings from types of {@link Criterion} to the class type which can evaluate that criteria's
- * data against a {@link Credential} target. That latter class will be a subtype of {@link EvaluableCredentialCriterion}.
- * Each EvaluableCredentialCriterion implementation that is registered <strong>MUST</strong> implement a single-arg
- * constructor which takes an instance of the Criterion to be evaluated. The evaluable instance is instantiated
- * reflectively based on this requirement.
+ * A registry which manages mappings from types of {@link Criterion} to the class type which can evaluate that
+ * criteria's data against a Credential target. That latter class will be a subtype of

[... 1565 lines stripped ...]