[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo: KeyInfoCredentialReso...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan  4 12:09:20 2013
New Revision: 3123

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

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/package-info.java   (with props)
Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCredentialResolver.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorFactory.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorManager.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCredentialResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCredentialResolver.java?rev=3123&r1=3122&r2=3123&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCredentialResolver.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCredentialResolver.java Fri Jan  4 12:09:20 2013
@@ -18,7 +18,6 @@
 package org.opensaml.xmlsec.keyinfo;
 
 import org.opensaml.security.credential.CredentialResolver;
-import org.opensaml.xmlsec.signature.KeyInfo;
 
 /**
  * Specialized {@link CredentialResolver} marker interface for resolvers which resolve
@@ -29,4 +28,4 @@
  */
 public interface KeyInfoCredentialResolver extends CredentialResolver {
 
-}
+}

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java?rev=3123&r1=3122&r2=3123&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java Fri Jan  4 12:09:20 2013
@@ -17,6 +17,8 @@
 
 package org.opensaml.xmlsec.keyinfo;
 
+import javax.annotation.Nullable;
+
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
 import org.opensaml.xmlsec.signature.KeyInfo;
@@ -35,7 +37,7 @@
      *
      * @param newKeyInfo the KeyInfo credential criteria to use
      */
-    public KeyInfoCriterion(KeyInfo newKeyInfo) {
+    public KeyInfoCriterion(@Nullable final KeyInfo newKeyInfo) {
        setKeyInfo(newKeyInfo);
     }
 
@@ -44,7 +46,7 @@
      * 
      * @return the KeyInfo credential criteria
      */
-    public KeyInfo getKeyInfo() {
+    @Nullable public KeyInfo getKeyInfo() {
         return keyInfo;
     }
     
@@ -54,10 +56,10 @@
      * @param newKeyInfo the KeyInfo to use as credential criteria
      * 
      */
-    public void setKeyInfo(KeyInfo newKeyInfo) {
+    public void setKeyInfo(@Nullable final KeyInfo newKeyInfo) {
         // Note: we allow KeyInfo to be null to handle case where application context,
         // other accompanying criteria, etc should be used to resolve credentials.
         keyInfo = newKeyInfo;
     }
 
-}
+}

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java?rev=3123&r1=3122&r2=3123&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java Fri Jan  4 12:09:20 2013
@@ -17,6 +17,8 @@
 
 package org.opensaml.xmlsec.keyinfo;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.security.SecurityException;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.signature.KeyInfo;
@@ -34,6 +36,6 @@
      * @return a new KeyInfo object
      * @throws SecurityException thrown if there is any error generating the new KeyInfo from the credential
      */
-    public KeyInfo generate(Credential credential) throws SecurityException;
+    @Nonnull public KeyInfo generate(@Nonnull final Credential credential) throws SecurityException;
 
-}
+}

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGeneratorFactory.java

[... 626 lines stripped ...]