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

[noreply at shibboleth.net]

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

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3113&view=rev
Log:
Changing method annotations to match subclasses.

Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEvaluator.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java?rev=3113&r1=3112&r2=3113&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEngine.java Fri Dec 28 16:42:06 2012
@@ -17,7 +17,7 @@
 
 package org.opensaml.security.x509;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 
 import org.opensaml.security.trust.TrustEngine;
 
@@ -33,6 +33,6 @@
      * 
      * @return the currently configured resolver instance
      */
-    @Nullable public PKIXValidationInformationResolver getPKIXResolver();
+    @Nonnull public PKIXValidationInformationResolver getPKIXResolver();
     
 }

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEvaluator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEvaluator.java?rev=3113&r1=3112&r2=3113&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEvaluator.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/PKIXTrustEvaluator.java Fri Dec 28 16:42:06 2012
@@ -17,6 +17,8 @@
 
 package org.opensaml.security.x509;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.security.SecurityException;
 
 /**
@@ -33,16 +35,14 @@
      * @return true if the credential can be successfully evaluated, false otherwise
      * @throws SecurityException thrown if there is an error evaluating the credential
      */
-    public boolean validate(PKIXValidationInformation validationInfo, X509Credential untrustedCredential)
-            throws SecurityException;
+    public boolean validate(@Nonnull final PKIXValidationInformation validationInfo,
+            @Nonnull final X509Credential untrustedCredential) throws SecurityException;
     
     /**
      * Get the {@link PKIXValidationOptions} instance that is in use.
      * 
      * @return the PKIXValidationOptions instance
      */
-    public PKIXValidationOptions getPKIXValidationOptions();
+    @Nonnull public PKIXValidationOptions getPKIXValidationOptions();
     
-}
-
-
+}