[java-opensaml COMMIT] /trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationPar...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 14 16:44:37 2014
New Revision: 3698

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3698&view=rev
Log:
Add missing method arg annotations and 'final'.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java?rev=3698&r1=3697&r2=3698&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java Fri Mar 14 16:44:37 2014
@@ -47,7 +47,9 @@
         implements SignatureValidationParametersResolver {
 
     /** {@inheritDoc} */
-    @Nonnull public Iterable<SignatureValidationParameters> resolve(CriteriaSet criteria) throws ResolverException {
+    @Nonnull public Iterable<SignatureValidationParameters> resolve(@Nonnull final CriteriaSet criteria) 
+            throws ResolverException {
+        
         SignatureValidationParameters params = resolveSingle(criteria);
         if (params != null) {
             return Collections.singletonList(params);
@@ -58,7 +60,7 @@
 
     /** {@inheritDoc} */
     @Nullable
-    public SignatureValidationParameters resolveSingle(CriteriaSet criteria) throws ResolverException {
+    public SignatureValidationParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
         Constraint.isNotNull(criteria, "CriteriaSet was null");
         Constraint.isNotNull(criteria.get(SignatureValidationConfiguratonCriterion.class), 
                 "Resolver requires an instance of SignatureValidationConfigurationCriterion");
@@ -80,7 +82,7 @@
      * 
      * @return the effective resolver, or null
      */
-    @Nullable protected SignatureTrustEngine resolveSignatureTrustEngine(CriteriaSet criteria) {
+    @Nullable protected SignatureTrustEngine resolveSignatureTrustEngine(@Nonnull final CriteriaSet criteria) {
         
         for (SignatureValidationConfiguration config : criteria.get(SignatureValidationConfiguratonCriterion.class)
                 .getConfigurations()) {